From 401fd2032d7b17d3805379b7d8748b8fcc9e855f Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Tue, 11 Mar 1997 00:08:01 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'RELENG_2_1_7_RELEASE'. This commit was manufactured to restore the state of the 2.1.7-RELEASE image. Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs. --- Makefile | 2 +- TODO | 2 +- bin/Makefile | 2 +- bin/Makefile.inc | 2 +- bin/cat/Makefile | 2 +- bin/cat/cat.1 | 2 +- bin/cat/cat.c | 2 +- bin/chmod/Makefile | 2 +- bin/chmod/chmod.1 | 2 +- bin/chmod/chmod.c | 2 +- bin/cp/Makefile | 2 +- bin/cp/cp.1 | 2 +- bin/cp/cp.c | 2 +- bin/cp/extern.h | 2 +- bin/cp/utils.c | 2 +- bin/csh/Makefile | 2 +- bin/csh/USD.doc/Makefile | 2 +- bin/csh/USD.doc/csh.1 | 2 +- bin/csh/USD.doc/csh.2 | 2 +- bin/csh/USD.doc/csh.3 | 2 +- bin/csh/USD.doc/csh.4 | 2 +- bin/csh/USD.doc/csh.a | 2 +- bin/csh/USD.doc/csh.g | 2 +- bin/csh/USD.doc/tabs | 2 +- bin/csh/alloc.c | 2 +- bin/csh/char.c | 2 +- bin/csh/char.h | 2 +- bin/csh/const.c | 2 +- bin/csh/csh.1 | 2 +- bin/csh/csh.c | 2 +- bin/csh/csh.h | 2 +- bin/csh/dir.c | 2 +- bin/csh/dir.h | 2 +- bin/csh/dol.c | 2 +- bin/csh/err.c | 2 +- bin/csh/exec.c | 2 +- bin/csh/exp.c | 2 +- bin/csh/extern.h | 2 +- bin/csh/file.c | 2 +- bin/csh/func.c | 2 +- bin/csh/glob.c | 2 +- bin/csh/hist.c | 2 +- bin/csh/init.c | 2 +- bin/csh/lex.c | 2 +- bin/csh/misc.c | 2 +- bin/csh/parse.c | 2 +- bin/csh/pathnames.h | 2 +- bin/csh/proc.c | 2 +- bin/csh/proc.h | 2 +- bin/csh/sem.c | 2 +- bin/csh/set.c | 2 +- bin/csh/str.c | 2 +- bin/csh/time.c | 2 +- bin/date/Makefile | 2 +- bin/date/date.1 | 2 +- bin/date/date.c | 2 +- bin/date/extern.h | 2 +- bin/date/netdate.c | 2 +- bin/dd/Makefile | 2 +- bin/dd/args.c | 2 +- bin/dd/conv.c | 2 +- bin/dd/conv_tab.c | 2 +- bin/dd/dd.1 | 2 +- bin/dd/dd.c | 2 +- bin/dd/dd.h | 2 +- bin/dd/extern.h | 2 +- bin/dd/misc.c | 2 +- bin/dd/position.c | 2 +- bin/df/Makefile | 2 +- bin/df/df.1 | 2 +- bin/df/df.c | 2 +- bin/domainname/Makefile | 2 +- bin/domainname/domainname.1 | 2 +- bin/domainname/domainname.c | 2 +- bin/echo/Makefile | 2 +- bin/echo/echo.1 | 2 +- bin/echo/echo.c | 2 +- bin/ed/Makefile | 2 +- bin/ed/POSIX | 2 +- bin/ed/README | 2 +- bin/ed/buf.c | 2 +- bin/ed/cbc.c | 2 +- bin/ed/ed.1 | 2 +- bin/ed/ed.h | 2 +- bin/ed/glbl.c | 2 +- bin/ed/io.c | 2 +- bin/ed/main.c | 2 +- bin/ed/re.c | 2 +- bin/ed/sub.c | 2 +- bin/ed/test/Makefile | 2 +- bin/ed/undo.c | 2 +- bin/expr/Makefile | 2 +- bin/expr/expr.1 | 2 +- bin/expr/expr.y | 2 +- bin/hostname/Makefile | 2 +- bin/hostname/hostname.1 | 2 +- bin/hostname/hostname.c | 2 +- bin/kill/Makefile | 2 +- bin/kill/kill.1 | 2 +- bin/kill/kill.c | 2 +- bin/ln/Makefile | 2 +- bin/ln/ln.1 | 2 +- bin/ln/ln.c | 2 +- bin/ln/symlink.7 | 2 +- bin/ls/Makefile | 2 +- bin/ls/cmp.c | 2 +- bin/ls/extern.h | 2 +- bin/ls/ls.1 | 2 +- bin/ls/ls.c | 2 +- bin/ls/ls.h | 2 +- bin/ls/print.c | 2 +- bin/ls/stat_flags.c | 2 +- bin/ls/util.c | 2 +- bin/mkdir/Makefile | 2 +- bin/mkdir/mkdir.1 | 2 +- bin/mkdir/mkdir.c | 2 +- bin/mv/Makefile | 2 +- bin/mv/mv.1 | 2 +- bin/mv/mv.c | 2 +- bin/mv/pathnames.h | 2 +- bin/pax/Makefile | 2 +- bin/pax/ar_io.c | 2 +- bin/pax/ar_subs.c | 2 +- bin/pax/buf_subs.c | 2 +- bin/pax/cache.c | 2 +- bin/pax/cache.h | 2 +- bin/pax/cpio.c | 2 +- bin/pax/cpio.h | 2 +- bin/pax/extern.h | 2 +- bin/pax/file_subs.c | 2 +- bin/pax/ftree.c | 2 +- bin/pax/ftree.h | 2 +- bin/pax/gen_subs.c | 2 +- bin/pax/options.c | 2 +- bin/pax/options.h | 2 +- bin/pax/pat_rep.c | 2 +- bin/pax/pat_rep.h | 2 +- bin/pax/pax.1 | 2 +- bin/pax/pax.c | 2 +- bin/pax/pax.h | 2 +- bin/pax/sel_subs.c | 2 +- bin/pax/sel_subs.h | 2 +- bin/pax/tables.c | 2 +- bin/pax/tables.h | 2 +- bin/pax/tar.c | 2 +- bin/pax/tar.h | 2 +- bin/pax/tty_subs.c | 2 +- bin/ps/Makefile | 2 +- bin/ps/devname.c | 2 +- bin/ps/extern.h | 2 +- bin/ps/fmt.c | 2 +- bin/ps/keyword.c | 2 +- bin/ps/nlist.c | 2 +- bin/ps/print.c | 2 +- bin/ps/ps.1 | 2 +- bin/ps/ps.c | 2 +- bin/ps/ps.h | 2 +- bin/pwd/Makefile | 2 +- bin/pwd/pwd.1 | 2 +- bin/pwd/pwd.c | 2 +- bin/rcp/Makefile | 2 +- bin/rcp/extern.h | 2 +- bin/rcp/pathnames.h | 2 +- bin/rcp/rcp.1 | 2 +- bin/rcp/rcp.c | 2 +- bin/rcp/util.c | 2 +- bin/rm/Makefile | 2 +- bin/rm/rm.1 | 2 +- bin/rm/rm.c | 2 +- bin/rmail/Makefile | 2 +- bin/rmail/rmail.8 | 2 +- bin/rmail/rmail.c | 2 +- bin/rmdir/Makefile | 2 +- bin/rmdir/rmdir.1 | 2 +- bin/rmdir/rmdir.c | 2 +- bin/sh/Makefile | 2 +- bin/sh/TOUR | 2 +- bin/sh/alias.c | 2 +- bin/sh/alias.h | 2 +- bin/sh/arith.y | 2 +- bin/sh/arith_lex.l | 2 +- bin/sh/bltin/bltin.h | 2 +- bin/sh/bltin/echo.1 | 2 +- bin/sh/bltin/echo.c | 2 +- bin/sh/builtins | 2 +- bin/sh/cd.c | 2 +- bin/sh/errmsg.c | 2 +- bin/sh/errmsg.h | 2 +- bin/sh/error.c | 2 +- bin/sh/error.h | 2 +- bin/sh/eval.c | 2 +- bin/sh/eval.h | 2 +- bin/sh/exec.c | 2 +- bin/sh/exec.h | 2 +- bin/sh/expand.c | 2 +- bin/sh/expand.h | 2 +- bin/sh/funcs/cmv | 2 +- bin/sh/funcs/dirs | 2 +- bin/sh/funcs/kill | 2 +- bin/sh/funcs/login | 2 +- bin/sh/funcs/newgrp | 2 +- bin/sh/funcs/popd | 2 +- bin/sh/funcs/pushd | 2 +- bin/sh/funcs/suspend | 2 +- bin/sh/histedit.c | 2 +- bin/sh/init.h | 2 +- bin/sh/input.c | 2 +- bin/sh/input.h | 2 +- bin/sh/jobs.c | 2 +- bin/sh/jobs.h | 2 +- bin/sh/machdep.h | 2 +- bin/sh/mail.c | 2 +- bin/sh/mail.h | 2 +- bin/sh/main.c | 2 +- bin/sh/main.h | 2 +- bin/sh/memalloc.c | 2 +- bin/sh/memalloc.h | 2 +- bin/sh/miscbltin.c | 2 +- bin/sh/mkbuiltins | 2 +- bin/sh/mkinit.c | 2 +- bin/sh/mknodes.c | 2 +- bin/sh/mksignames.c | 2 +- bin/sh/mksyntax.c | 2 +- bin/sh/mktokens | 2 +- bin/sh/myhistedit.h | 2 +- bin/sh/mystring.c | 2 +- bin/sh/mystring.h | 2 +- bin/sh/nodes.c.pat | 2 +- bin/sh/nodetypes | 2 +- bin/sh/options.c | 2 +- bin/sh/options.h | 2 +- bin/sh/output.c | 2 +- bin/sh/output.h | 2 +- bin/sh/parser.c | 2 +- bin/sh/parser.h | 2 +- bin/sh/redir.c | 2 +- bin/sh/redir.h | 2 +- bin/sh/sh.1 | 2 +- bin/sh/shell.h | 2 +- bin/sh/show.c | 2 +- bin/sh/trap.c | 2 +- bin/sh/trap.h | 2 +- bin/sh/var.c | 2 +- bin/sh/var.h | 2 +- bin/sleep/Makefile | 2 +- bin/sleep/sleep.1 | 2 +- bin/sleep/sleep.c | 2 +- bin/stty/Makefile | 2 +- bin/stty/cchar.c | 2 +- bin/stty/extern.h | 2 +- bin/stty/gfmt.c | 2 +- bin/stty/key.c | 2 +- bin/stty/modes.c | 2 +- bin/stty/print.c | 2 +- bin/stty/stty.1 | 2 +- bin/stty/stty.c | 2 +- bin/stty/stty.h | 2 +- bin/stty/util.c | 2 +- bin/sync/Makefile | 2 +- bin/sync/sync.8 | 2 +- bin/sync/sync.c | 2 +- bin/test/Makefile | 2 +- bin/test/TEST.csh | 2 +- bin/test/operators.c | 2 +- bin/test/operators.h | 2 +- bin/test/test.1 | 2 +- bin/test/test.c | 2 +- eBones/Copyright.MIT | 24 - eBones/Copyright.SIPB | 23 - eBones/Makefile | 48 - eBones/Makefile.inc | 63 - eBones/README.PATCH | 52 - eBones/include/ChangeLog | 25 - eBones/include/Makefile | 17 - eBones/include/addr_comp.h | 35 - eBones/include/admin_server.h | 42 - eBones/include/conf-bsd386i.h | 16 - eBones/include/conf-bsdapollo.h | 21 - eBones/include/conf-bsdibm032.h | 18 - eBones/include/conf-bsdm68k.h | 16 - eBones/include/conf-bsdsparc.h | 17 - eBones/include/conf-bsdtahoe.h | 16 - eBones/include/conf-bsdvax.h | 22 - eBones/include/conf-ibm370.h | 15 - eBones/include/conf-pc.h | 16 - eBones/include/conf-pyr.h | 15 - eBones/include/conf-ultmips2.h | 17 - eBones/include/conf.h | 73 - eBones/include/highc.h | 32 - eBones/include/kdc.h | 36 - eBones/include/klog.h | 39 - eBones/include/kparse.h | 91 - eBones/include/krb.h | 517 ---- eBones/include/krb_conf.h | 29 - eBones/include/krb_db.h | 110 - eBones/include/lsb_addr_comp.h | 40 - eBones/include/osconf.h | 51 - eBones/include/passwd_server.h | 28 - eBones/include/principal.h | 18 - eBones/include/prot.h | 92 - eBones/include/rkinit.h | 42 - eBones/include/rkinit_private.h | 106 - eBones/lib/Makefile | 6 - eBones/lib/Makefile.inc | 4 - eBones/lib/libacl/Makefile | 12 - eBones/lib/libacl/acl_check.3 | 183 -- eBones/lib/libacl/acl_files.c | 555 ---- eBones/lib/libacl/acl_files.doc | 107 - eBones/lib/libkadm/EXPORTABLE | 4 - eBones/lib/libkadm/Makefile | 23 - eBones/lib/libkadm/kadm.h | 164 -- eBones/lib/libkadm/kadm_cli_wrap.c | 514 ---- eBones/lib/libkadm/kadm_err.et | 53 - eBones/lib/libkadm/kadm_stream.c | 286 -- eBones/lib/libkadm/kadm_supp.c | 118 - eBones/lib/libkdb/Makefile | 8 - eBones/lib/libkdb/krb_cache.c | 181 -- eBones/lib/libkdb/krb_dbl.c | 1 - eBones/lib/libkdb/krb_dbm.c | 789 ------ eBones/lib/libkdb/krb_kdb_utils.c | 148 - eBones/lib/libkdb/krb_lib.c | 242 -- eBones/lib/libkdb/print_princ.c | 51 - eBones/lib/libkrb/Makefile | 55 - eBones/lib/libkrb/add_ticket.c | 91 - eBones/lib/libkrb/create_auth_reply.c | 118 - eBones/lib/libkrb/create_ciph.c | 112 - eBones/lib/libkrb/create_death_packet.c | 65 - eBones/lib/libkrb/create_ticket.c | 132 - eBones/lib/libkrb/debug_decl.c | 20 - eBones/lib/libkrb/decomp_ticket.c | 126 - eBones/lib/libkrb/des_rw.c | 263 -- eBones/lib/libkrb/dest_tkt.c | 92 - eBones/lib/libkrb/extract_ticket.c | 61 - eBones/lib/libkrb/fgetst.c | 42 - eBones/lib/libkrb/get_ad_tkt.c | 237 -- eBones/lib/libkrb/get_admhst.c | 82 - eBones/lib/libkrb/get_cred.c | 63 - eBones/lib/libkrb/get_in_tkt.c | 286 -- eBones/lib/libkrb/get_krbhst.c | 87 - eBones/lib/libkrb/get_krbrlm.c | 62 - eBones/lib/libkrb/get_phost.c | 55 - eBones/lib/libkrb/get_pw_tkt.c | 75 - eBones/lib/libkrb/get_request.c | 55 - eBones/lib/libkrb/get_svc_in_tkt.c | 77 - eBones/lib/libkrb/get_tf_fullname.c | 69 - eBones/lib/libkrb/get_tf_realm.c | 37 - eBones/lib/libkrb/getrealm.c | 106 - eBones/lib/libkrb/getst.c | 41 - eBones/lib/libkrb/in_tkt.c | 146 - eBones/lib/libkrb/k_gethostname.c | 71 - eBones/lib/libkrb/klog.c | 110 - eBones/lib/libkrb/kname_parse.c | 239 -- eBones/lib/libkrb/kntoln.c | 63 - eBones/lib/libkrb/kparse.c | 776 ----- eBones/lib/libkrb/krb.3 | 508 ---- eBones/lib/libkrb/krb_err.et | 269 -- eBones/lib/libkrb/krb_err_txt.c | 280 -- eBones/lib/libkrb/krb_get_in_tkt.c | 301 -- eBones/lib/libkrb/krb_realmofhost.3 | 161 -- eBones/lib/libkrb/krb_sendauth.3 | 356 --- eBones/lib/libkrb/krb_set_tkt_string.3 | 43 - eBones/lib/libkrb/krbglue.c | 258 -- eBones/lib/libkrb/kuserok.3 | 63 - eBones/lib/libkrb/kuserok.c | 199 -- eBones/lib/libkrb/log.c | 125 - eBones/lib/libkrb/mk_err.c | 65 - eBones/lib/libkrb/mk_priv.c | 207 -- eBones/lib/libkrb/mk_req.c | 198 -- eBones/lib/libkrb/mk_safe.c | 171 -- eBones/lib/libkrb/month_sname.c | 33 - eBones/lib/libkrb/netread.c | 50 - eBones/lib/libkrb/netwrite.c | 46 - eBones/lib/libkrb/one.c | 22 - eBones/lib/libkrb/pkt_cipher.c | 40 - eBones/lib/libkrb/pkt_clen.c | 58 - eBones/lib/libkrb/rd_err.c | 82 - eBones/lib/libkrb/rd_priv.c | 207 -- eBones/lib/libkrb/rd_req.c | 331 --- eBones/lib/libkrb/rd_safe.c | 183 -- eBones/lib/libkrb/read_service_key.c | 124 - eBones/lib/libkrb/recvauth.c | 290 -- eBones/lib/libkrb/save_credentials.c | 56 - eBones/lib/libkrb/send_to_kdc.c | 529 ---- eBones/lib/libkrb/sendauth.c | 259 -- eBones/lib/libkrb/stime.c | 43 - eBones/lib/libkrb/tf_shm.c | 176 -- eBones/lib/libkrb/tf_util.3 | 151 - eBones/lib/libkrb/tf_util.c | 581 ---- eBones/lib/libkrb/tkt_string.c | 80 - eBones/lib/libkrb/util.c | 75 - eBones/lib/librkinit/Makefile | 19 - eBones/lib/librkinit/rk_krb.c | 316 --- eBones/lib/librkinit/rk_lib.c | 100 - eBones/lib/librkinit/rk_rpc.c | 392 --- eBones/lib/librkinit/rk_util.c | 214 -- eBones/lib/librkinit/rkinit.3 | 167 -- eBones/lib/librkinit/rkinit_err.et | 32 - eBones/libexec/Makefile | 6 - eBones/libexec/Makefile.inc | 5 - eBones/libexec/kpropd/Makefile | 10 - eBones/libexec/kpropd/kpropd.c | 453 --- eBones/libexec/registerd/Makefile | 18 - eBones/libexec/registerd/registerd.8 | 71 - eBones/libexec/registerd/registerd.c | 355 --- eBones/libexec/rkinitd/Makefile | 12 - eBones/libexec/rkinitd/krb.c | 388 --- eBones/libexec/rkinitd/rkinitd.8 | 42 - eBones/libexec/rkinitd/rkinitd.c | 137 - eBones/libexec/rkinitd/rkinitd.h | 34 - eBones/libexec/rkinitd/rpc.c | 222 -- eBones/libexec/rkinitd/util.c | 49 - eBones/man/Makefile | 7 - eBones/man/kerberos.1 | 259 -- eBones/man/krb.conf.5 | 32 - eBones/man/krb.realms.5 | 39 - eBones/patchlevel.h | 6 - eBones/usr.bin/Makefile | 6 - eBones/usr.bin/Makefile.inc | 5 - eBones/usr.bin/kadmin/Makefile | 16 - eBones/usr.bin/kadmin/kadmin.8 | 158 -- eBones/usr.bin/kadmin/kadmin.c | 636 ----- eBones/usr.bin/kadmin/kadmin_cmds.ct | 41 - eBones/usr.bin/kdestroy/Makefile | 10 - eBones/usr.bin/kdestroy/kdestroy.1 | 81 - eBones/usr.bin/kdestroy/kdestroy.c | 83 - eBones/usr.bin/kinit/Makefile | 10 - eBones/usr.bin/kinit/kinit.1 | 133 - eBones/usr.bin/kinit/kinit.c | 224 -- eBones/usr.bin/klist/Makefile | 10 - eBones/usr.bin/klist/klist.1 | 84 - eBones/usr.bin/klist/klist.c | 288 -- eBones/usr.bin/ksrvtgt/Makefile | 10 - eBones/usr.bin/ksrvtgt/ksrvtgt.1 | 51 - eBones/usr.bin/ksrvtgt/ksrvtgt.c | 62 - eBones/usr.bin/passwd/kpasswd.c | 223 -- eBones/usr.bin/register/Makefile | 11 - eBones/usr.bin/register/pathnames.h | 39 - eBones/usr.bin/register/register.1 | 63 - eBones/usr.bin/register/register.c | 316 --- eBones/usr.bin/register/register_proto.h | 43 - eBones/usr.bin/rkinit/Makefile | 11 - eBones/usr.bin/rkinit/rkinit.1 | 206 -- eBones/usr.bin/rkinit/rkinit.c | 216 -- eBones/usr.sbin/Makefile | 7 - eBones/usr.sbin/Makefile.inc | 5 - eBones/usr.sbin/ext_srvtab/Makefile | 10 - eBones/usr.sbin/ext_srvtab/ext_srvtab.8 | 62 - eBones/usr.sbin/ext_srvtab/ext_srvtab.c | 176 -- eBones/usr.sbin/fix_kdb_keys/Makefile | 10 - eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 | 59 - eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.c | 191 -- eBones/usr.sbin/kadmind/Makefile | 11 - eBones/usr.sbin/kadmind/admin_server.c | 474 ---- eBones/usr.sbin/kadmind/kadm_funcs.c | 381 --- eBones/usr.sbin/kadmind/kadm_ser_wrap.c | 213 -- eBones/usr.sbin/kadmind/kadm_server.c | 167 -- eBones/usr.sbin/kadmind/kadm_server.h | 70 - eBones/usr.sbin/kadmind/kadmind.8 | 117 - eBones/usr.sbin/kdb_destroy/Makefile | 8 - eBones/usr.sbin/kdb_destroy/kdb_destroy.8 | 36 - eBones/usr.sbin/kdb_destroy/kdb_destroy.c | 66 - eBones/usr.sbin/kdb_edit/Makefile | 11 - eBones/usr.sbin/kdb_edit/kdb_edit.8 | 58 - eBones/usr.sbin/kdb_edit/kdb_edit.c | 479 ---- eBones/usr.sbin/kdb_edit/maketime.c | 85 - eBones/usr.sbin/kdb_edit/time.h | 45 - eBones/usr.sbin/kdb_init/Makefile | 10 - eBones/usr.sbin/kdb_init/kdb_init.8 | 45 - eBones/usr.sbin/kdb_init/kdb_init.c | 181 -- eBones/usr.sbin/kdb_util/Makefile | 12 - eBones/usr.sbin/kdb_util/kdb_util.8 | 64 - eBones/usr.sbin/kdb_util/kdb_util.c | 523 ---- eBones/usr.sbin/kerberos/Makefile | 11 - eBones/usr.sbin/kerberos/cr_err_reply.c | 97 - eBones/usr.sbin/kerberos/kerberos.c | 816 ------ eBones/usr.sbin/kprop/Makefile | 9 - eBones/usr.sbin/kprop/kprop.c | 573 ---- eBones/usr.sbin/kprop/kprop.h | 18 - eBones/usr.sbin/ksrvutil/Makefile | 11 - eBones/usr.sbin/ksrvutil/ksrvutil.8 | 93 - eBones/usr.sbin/ksrvutil/ksrvutil.c | 586 ---- eBones/usr.sbin/kstash/Makefile | 10 - eBones/usr.sbin/kstash/kstash.8 | 44 - eBones/usr.sbin/kstash/kstash.c | 94 - eBones/usr.sbin/make_keypair/Makefile | 10 - eBones/usr.sbin/make_keypair/make_keypair.8 | 87 - eBones/usr.sbin/make_keypair/make_keypair.c | 134 - etc/Makefile | 2 +- etc/crontab | 2 +- etc/etc.i386/MAKEDEV | 2 +- etc/etc.i386/rc.i386 | 2 +- etc/host.conf | 2 +- etc/hosts | 2 +- etc/make.conf | 2 +- etc/mtree/BSD.include.dist | 2 +- etc/mtree/BSD.local.dist | 2 +- etc/mtree/BSD.release.dist | 2 +- etc/mtree/BSD.root.dist | 2 +- etc/mtree/BSD.usr.dist | 2 +- etc/mtree/BSD.var.dist | 2 +- etc/namedb/PROTO.localhost.rev | 2 +- etc/namedb/named.boot | 2 +- etc/netstart | 2 +- etc/pccard.conf.sample | 2 +- etc/phones | 2 +- etc/ppp/ppp.conf.filter.sample | 2 +- etc/ppp/ppp.conf.iij | 2 +- etc/ppp/ppp.conf.sample | 2 +- etc/ppp/ppp.linkup.sample | 2 +- etc/ppp/ppp.secret.sample | 2 +- etc/protocols | 2 +- etc/rc | 2 +- etc/rc.firewall | 2 +- etc/rc.local | 2 +- etc/rc.serial | 2 +- etc/root/dot.cshrc | 2 +- etc/root/dot.klogin | 2 +- etc/root/dot.login | 2 +- etc/root/dot.profile | 2 +- etc/security | 2 +- etc/services | 2 +- etc/sysconfig | 2 +- games/Makefile | 2 +- games/boggle/Makefile | 26 + games/boggle/README | 65 + games/boggle/boggle/Makefile | 15 + games/boggle/boggle/bog.c | 672 +++++ games/boggle/boggle/bog.h | 85 + games/boggle/boggle/boggle.6 | 114 + games/boggle/boggle/extern.h | 71 + games/boggle/boggle/help.c | 101 + games/boggle/boggle/helpfile | 92 + games/boggle/boggle/mach.c | 676 +++++ games/boggle/boggle/prtable.c | 127 + games/boggle/boggle/timer.c | 119 + games/boggle/boggle/word.c | 216 ++ games/boggle/mkdict/Makefile | 9 + games/boggle/mkdict/mkdict.c | 124 + games/boggle/mkindex/Makefile | 9 + games/boggle/mkindex/mkindex.c | 120 + games/bs/Makefile | 2 +- games/grdc/Makefile | 2 +- games/hack/hack.version.c | 2 +- games/piano/piano.c | 2 +- games/tetris/Makefile | 10 + games/tetris/input.c | 180 ++ games/tetris/input.h | 42 + games/tetris/pathnames.h | 39 + games/tetris/scores.c | 472 ++++ games/tetris/scores.h | 54 + games/tetris/screen.c | 454 +++ games/tetris/screen.h | 56 + games/tetris/shapes.c | 111 + games/tetris/tetris.6 | 154 + games/tetris/tetris.c | 312 ++ games/tetris/tetris.h | 169 ++ gnu/gnu2bmake/gcc-2.6.1.tcl | 4 +- gnu/gnu2bmake/gnu2bmake.tcl | 2 +- gnu/include/Makefile | 2 +- gnu/lib/Makefile | 2 +- gnu/lib/Makefile.inc | 2 +- gnu/lib/libdialog/Makefile | 2 +- gnu/lib/libdialog/TESTS/Makefile | 2 +- gnu/lib/libdialog/TESTS/check1.c | 2 +- gnu/lib/libdialog/TESTS/check2.c | 2 +- gnu/lib/libdialog/TESTS/check3.c | 2 +- gnu/lib/libdialog/TESTS/dselect.c | 2 +- gnu/lib/libdialog/TESTS/fselect.c | 2 +- gnu/lib/libdialog/TESTS/gauge.c | 2 +- gnu/lib/libdialog/TESTS/input1.c | 2 +- gnu/lib/libdialog/TESTS/menu1.c | 2 +- gnu/lib/libdialog/TESTS/menu2.c | 2 +- gnu/lib/libdialog/TESTS/menu3.c | 2 +- gnu/lib/libdialog/TESTS/msg.c | 2 +- gnu/lib/libdialog/TESTS/prgbox.c | 2 +- gnu/lib/libdialog/TESTS/radio1.c | 2 +- gnu/lib/libdialog/TESTS/radio2.c | 2 +- gnu/lib/libdialog/TESTS/radio3.c | 2 +- gnu/lib/libdialog/TESTS/text.c | 2 +- gnu/lib/libdialog/TESTS/yesno.c | 2 +- gnu/lib/libdialog/dialog.3 | 2 +- gnu/lib/libg++/Makefile | 2 +- gnu/lib/libgmp/Makefile | 2 +- gnu/lib/libgmp/cre-conv-tab.c | 2 +- gnu/lib/libgmp/cre-mparam.c | 2 +- gnu/lib/libgmp/doc/Makefile | 2 +- gnu/lib/libmalloc/Makefile | 2 +- gnu/lib/libmp/Makefile | 2 +- gnu/lib/libreadline/Makefile | 2 +- gnu/lib/libregex/Makefile | 2 +- gnu/libexec/Makefile | 2 +- gnu/libexec/Makefile.inc | 2 +- gnu/libexec/uucp/Makefile | 2 +- gnu/libexec/uucp/common_sources/chat.c | 2 +- gnu/libexec/uucp/common_sources/conn.c | 2 +- gnu/libexec/uucp/common_sources/copy.c | 2 +- gnu/libexec/uucp/common_sources/log.c | 2 +- gnu/libexec/uucp/common_sources/prot.c | 2 +- gnu/libexec/uucp/common_sources/util.c | 2 +- gnu/libexec/uucp/contrib/Makefile.uurt | 2 +- gnu/libexec/uucp/contrib/uupoll.shar | 18 +- gnu/libexec/uucp/contrib/uurate.c | 6 +- gnu/libexec/uucp/contrib/uurate.man | 2 +- gnu/libexec/uucp/contrib/uusnap.c | 2 +- gnu/libexec/uucp/cu/Makefile | 2 +- gnu/libexec/uucp/cu/cu.1 | 2 +- gnu/libexec/uucp/cu/cu.c | 2 +- gnu/libexec/uucp/doc/uucp.texi | 4 +- gnu/libexec/uucp/libunix/Makefile | 2 +- gnu/libexec/uucp/libunix/cusub.c | 2 +- gnu/libexec/uucp/libunix/lock.c | 2 +- gnu/libexec/uucp/libunix/picksb.c | 2 +- gnu/libexec/uucp/libunix/pipe.c | 2 +- gnu/libexec/uucp/libunix/serial.c | 2 +- gnu/libexec/uucp/libunix/spool.c | 2 +- gnu/libexec/uucp/libunix/statsb.c | 2 +- gnu/libexec/uucp/libunix/tcp.c | 2 +- gnu/libexec/uucp/libunix/tli.c | 2 +- gnu/libexec/uucp/libunix/work.c | 2 +- gnu/libexec/uucp/libunix/xqtfil.c | 2 +- gnu/libexec/uucp/libunix/xqtsub.c | 2 +- gnu/libexec/uucp/libuuconf/Makefile | 2 +- gnu/libexec/uucp/libuuconf/addblk.c | 2 +- gnu/libexec/uucp/libuuconf/addstr.c | 2 +- gnu/libexec/uucp/libuuconf/allblk.c | 2 +- gnu/libexec/uucp/libuuconf/alloc.c | 2 +- gnu/libexec/uucp/libuuconf/base.c | 2 +- gnu/libexec/uucp/libuuconf/bool.c | 2 +- gnu/libexec/uucp/libuuconf/callin.c | 2 +- gnu/libexec/uucp/libuuconf/calout.c | 2 +- gnu/libexec/uucp/libuuconf/chatc.c | 2 +- gnu/libexec/uucp/libuuconf/cmdarg.c | 2 +- gnu/libexec/uucp/libuuconf/cmdfil.c | 2 +- gnu/libexec/uucp/libuuconf/cmdlin.c | 2 +- gnu/libexec/uucp/libuuconf/debfil.c | 2 +- gnu/libexec/uucp/libuuconf/deblev.c | 2 +- gnu/libexec/uucp/libuuconf/diacod.c | 2 +- gnu/libexec/uucp/libuuconf/dial.c | 2 +- gnu/libexec/uucp/libuuconf/diasub.c | 2 +- gnu/libexec/uucp/libuuconf/dnams.c | 2 +- gnu/libexec/uucp/libuuconf/errno.c | 2 +- gnu/libexec/uucp/libuuconf/errstr.c | 2 +- gnu/libexec/uucp/libuuconf/filnam.c | 2 +- gnu/libexec/uucp/libuuconf/freblk.c | 2 +- gnu/libexec/uucp/libuuconf/fredia.c | 2 +- gnu/libexec/uucp/libuuconf/free.c | 2 +- gnu/libexec/uucp/libuuconf/freprt.c | 2 +- gnu/libexec/uucp/libuuconf/fresys.c | 2 +- gnu/libexec/uucp/libuuconf/grdcmp.c | 2 +- gnu/libexec/uucp/libuuconf/hdial.c | 2 +- gnu/libexec/uucp/libuuconf/hdnams.c | 2 +- gnu/libexec/uucp/libuuconf/hinit.c | 2 +- gnu/libexec/uucp/libuuconf/hlocnm.c | 2 +- gnu/libexec/uucp/libuuconf/hport.c | 2 +- gnu/libexec/uucp/libuuconf/hrmunk.c | 2 +- gnu/libexec/uucp/libuuconf/hsinfo.c | 2 +- gnu/libexec/uucp/libuuconf/hsnams.c | 2 +- gnu/libexec/uucp/libuuconf/hsys.c | 2 +- gnu/libexec/uucp/libuuconf/hunk.c | 2 +- gnu/libexec/uucp/libuuconf/iniglb.c | 2 +- gnu/libexec/uucp/libuuconf/init.c | 2 +- gnu/libexec/uucp/libuuconf/int.c | 2 +- gnu/libexec/uucp/libuuconf/lckdir.c | 2 +- gnu/libexec/uucp/libuuconf/lineno.c | 2 +- gnu/libexec/uucp/libuuconf/llocnm.c | 2 +- gnu/libexec/uucp/libuuconf/local.c | 2 +- gnu/libexec/uucp/libuuconf/locnm.c | 2 +- gnu/libexec/uucp/libuuconf/logfil.c | 2 +- gnu/libexec/uucp/libuuconf/maxuxq.c | 2 +- gnu/libexec/uucp/libuuconf/mrgblk.c | 2 +- gnu/libexec/uucp/libuuconf/paramc.c | 2 +- gnu/libexec/uucp/libuuconf/port.c | 2 +- gnu/libexec/uucp/libuuconf/prtsub.c | 2 +- gnu/libexec/uucp/libuuconf/pubdir.c | 2 +- gnu/libexec/uucp/libuuconf/rdlocs.c | 2 +- gnu/libexec/uucp/libuuconf/rdperm.c | 2 +- gnu/libexec/uucp/libuuconf/reliab.c | 2 +- gnu/libexec/uucp/libuuconf/remunk.c | 2 +- gnu/libexec/uucp/libuuconf/runuxq.c | 2 +- gnu/libexec/uucp/libuuconf/sinfo.c | 2 +- gnu/libexec/uucp/libuuconf/snams.c | 2 +- gnu/libexec/uucp/libuuconf/split.c | 2 +- gnu/libexec/uucp/libuuconf/spool.c | 2 +- gnu/libexec/uucp/libuuconf/stafil.c | 2 +- gnu/libexec/uucp/libuuconf/strip.c | 2 +- gnu/libexec/uucp/libuuconf/syssub.c | 2 +- gnu/libexec/uucp/libuuconf/tcalou.c | 2 +- gnu/libexec/uucp/libuuconf/tdial.c | 2 +- gnu/libexec/uucp/libuuconf/tdialc.c | 2 +- gnu/libexec/uucp/libuuconf/tdnams.c | 2 +- gnu/libexec/uucp/libuuconf/tgcmp.c | 2 +- gnu/libexec/uucp/libuuconf/thread.c | 2 +- gnu/libexec/uucp/libuuconf/time.c | 2 +- gnu/libexec/uucp/libuuconf/tinit.c | 2 +- gnu/libexec/uucp/libuuconf/tlocnm.c | 2 +- gnu/libexec/uucp/libuuconf/tport.c | 2 +- gnu/libexec/uucp/libuuconf/tportc.c | 2 +- gnu/libexec/uucp/libuuconf/tsinfo.c | 2 +- gnu/libexec/uucp/libuuconf/tsnams.c | 2 +- gnu/libexec/uucp/libuuconf/tsys.c | 2 +- gnu/libexec/uucp/libuuconf/tval.c | 2 +- gnu/libexec/uucp/libuuconf/ugtlin.c | 2 +- gnu/libexec/uucp/libuuconf/unk.c | 2 +- gnu/libexec/uucp/libuuconf/val.c | 2 +- gnu/libexec/uucp/libuuconf/vinit.c | 2 +- gnu/libexec/uucp/libuuconf/vport.c | 2 +- gnu/libexec/uucp/libuuconf/vsinfo.c | 2 +- gnu/libexec/uucp/libuuconf/vsnams.c | 2 +- gnu/libexec/uucp/libuuconf/vsys.c | 2 +- gnu/libexec/uucp/libuucp/Makefile | 2 +- gnu/libexec/uucp/libuucp/parse.c | 2 +- gnu/libexec/uucp/sample/Makefile | 2 +- gnu/libexec/uucp/tstuu.c | 2 +- gnu/libexec/uucp/uuchk/Makefile | 2 +- gnu/libexec/uucp/uuchk/uuchk.c | 2 +- gnu/libexec/uucp/uucico/Makefile | 2 +- gnu/libexec/uucp/uucico/prote.c | 2 +- gnu/libexec/uucp/uucico/protf.c | 2 +- gnu/libexec/uucp/uucico/protg.c | 2 +- gnu/libexec/uucp/uucico/proti.c | 2 +- gnu/libexec/uucp/uucico/protj.c | 2 +- gnu/libexec/uucp/uucico/prott.c | 2 +- gnu/libexec/uucp/uucico/proty.c | 2 +- gnu/libexec/uucp/uucico/protz.c | 2 +- gnu/libexec/uucp/uucico/rec.c | 2 +- gnu/libexec/uucp/uucico/send.c | 2 +- gnu/libexec/uucp/uucico/time.c | 2 +- gnu/libexec/uucp/uucico/trans.c | 2 +- gnu/libexec/uucp/uucico/uucico.8 | 2 +- gnu/libexec/uucp/uucico/uucico.c | 2 +- gnu/libexec/uucp/uucico/xcmd.c | 2 +- gnu/libexec/uucp/uuconv/Makefile | 2 +- gnu/libexec/uucp/uuconv/uuconv.c | 2 +- gnu/libexec/uucp/uucp/Makefile | 2 +- gnu/libexec/uucp/uucp/uucp.1 | 2 +- gnu/libexec/uucp/uucp/uucp.c | 2 +- gnu/libexec/uucp/uulog/Makefile | 2 +- gnu/libexec/uucp/uulog/uulog.c | 2 +- gnu/libexec/uucp/uuname/Makefile | 2 +- gnu/libexec/uucp/uuname/uuname.c | 2 +- gnu/libexec/uucp/uupick/Makefile | 2 +- gnu/libexec/uucp/uupick/uupick.c | 2 +- gnu/libexec/uucp/uusched/Makefile | 2 +- gnu/libexec/uucp/uustat/Makefile | 2 +- gnu/libexec/uucp/uustat/uustat.1 | 2 +- gnu/libexec/uucp/uustat/uustat.c | 2 +- gnu/libexec/uucp/uuto/Makefile | 2 +- gnu/libexec/uucp/uux/Makefile | 2 +- gnu/libexec/uucp/uux/uux.1 | 2 +- gnu/libexec/uucp/uux/uux.c | 2 +- gnu/libexec/uucp/uuxqt/Makefile | 2 +- gnu/libexec/uucp/uuxqt/uuxqt.8 | 2 +- gnu/libexec/uucp/uuxqt/uuxqt.c | 2 +- gnu/libexec/ypxfr/Makefile | 2 +- gnu/libexec/ypxfr/log.c | 2 +- gnu/libexec/ypxfr/ypclnt.c | 2 +- gnu/libexec/ypxfr/ypxfr.8 | 2 +- gnu/libexec/ypxfr/ypxfr.c | 2 +- gnu/usr.bin/Makefile | 2 +- gnu/usr.bin/Makefile.inc | 2 +- gnu/usr.bin/as/Makefile | 2 +- gnu/usr.bin/as/app.c | 2 +- gnu/usr.bin/as/as.c | 2 +- gnu/usr.bin/as/as.h | 2 +- gnu/usr.bin/as/atof-generic.c | 2 +- gnu/usr.bin/as/bignum-copy.c | 2 +- gnu/usr.bin/as/bignum.h | 2 +- gnu/usr.bin/as/bit_fix.h | 2 +- gnu/usr.bin/as/cond.c | 2 +- gnu/usr.bin/as/config/Makefile.hp300 | 2 +- gnu/usr.bin/as/config/Makefile.i386 | 2 +- gnu/usr.bin/as/config/Makefile.pc532 | 2 +- gnu/usr.bin/as/config/Makefile.sparc | 2 +- gnu/usr.bin/as/config/Makefile.vax | 2 +- gnu/usr.bin/as/config/atof-ieee.c | 2 +- gnu/usr.bin/as/config/ho-i386.h | 2 +- gnu/usr.bin/as/config/obj-aout.h | 2 +- gnu/usr.bin/as/config/tc-i386.c | 2 +- gnu/usr.bin/as/config/tc-i386.h | 2 +- gnu/usr.bin/as/config/tc-sparc.c | 2 +- gnu/usr.bin/as/config/tc-sparc.h | 2 +- gnu/usr.bin/as/config/te-generic.h | 2 +- gnu/usr.bin/as/debug.c | 2 +- gnu/usr.bin/as/expr.c | 2 +- gnu/usr.bin/as/expr.h | 2 +- gnu/usr.bin/as/flo-const.c | 2 +- gnu/usr.bin/as/flo-copy.c | 2 +- gnu/usr.bin/as/flonum-mult.c | 2 +- gnu/usr.bin/as/flonum.h | 2 +- gnu/usr.bin/as/frags.c | 2 +- gnu/usr.bin/as/frags.h | 2 +- gnu/usr.bin/as/hash.c | 2 +- gnu/usr.bin/as/hash.h | 2 +- gnu/usr.bin/as/hex-value.c | 2 +- gnu/usr.bin/as/input-file.c | 2 +- gnu/usr.bin/as/input-file.h | 2 +- gnu/usr.bin/as/input-scrub.c | 2 +- gnu/usr.bin/as/listing.c | 2 +- gnu/usr.bin/as/listing.h | 2 +- gnu/usr.bin/as/makefile.dos | 2 +- gnu/usr.bin/as/messages.c | 2 +- gnu/usr.bin/as/obj.h | 2 +- gnu/usr.bin/as/obstack.c | 2 +- gnu/usr.bin/as/obstack.h | 2 +- gnu/usr.bin/as/opcode/a29k.h | 3 + gnu/usr.bin/as/opcode/i386.h | 2 +- gnu/usr.bin/as/opcode/i960.h | 2 +- gnu/usr.bin/as/opcode/sparc.h | 2 +- gnu/usr.bin/as/output-file.c | 2 +- gnu/usr.bin/as/output-file.h | 2 +- gnu/usr.bin/as/read.c | 2 +- gnu/usr.bin/as/read.h | 2 +- gnu/usr.bin/as/struc-symbol.h | 2 +- gnu/usr.bin/as/subsegs.c | 2 +- gnu/usr.bin/as/subsegs.h | 2 +- gnu/usr.bin/as/symbols.c | 2 +- gnu/usr.bin/as/symbols.h | 2 +- gnu/usr.bin/as/tc.h | 2 +- gnu/usr.bin/as/testscripts/doboth | 2 +- gnu/usr.bin/as/testscripts/doobjcmp | 2 +- gnu/usr.bin/as/testscripts/dostriptest | 2 +- gnu/usr.bin/as/testscripts/dotest | 2 +- gnu/usr.bin/as/testscripts/dounsortreloc | 2 +- gnu/usr.bin/as/testscripts/dounsortsymbols | 2 +- gnu/usr.bin/as/version.c | 4 +- gnu/usr.bin/as/write.c | 2 +- gnu/usr.bin/as/xmalloc.c | 2 +- gnu/usr.bin/as/xrealloc.c | 2 +- gnu/usr.bin/bc/scan.c | 2 +- gnu/usr.bin/cc/Makefile | 2 +- gnu/usr.bin/cc/Makefile.inc | 2 +- gnu/usr.bin/cc/README | 2 +- gnu/usr.bin/cc/c++/Makefile | 2 +- gnu/usr.bin/cc/cc/Makefile | 2 +- gnu/usr.bin/cc/cc/cc.1 | 2 +- gnu/usr.bin/cc/cc1/Makefile | 2 +- gnu/usr.bin/cc/cc1plus/Makefile | 2 +- gnu/usr.bin/cc/cc_int/Makefile | 2 +- gnu/usr.bin/cc/cpp/Makefile | 2 +- gnu/usr.bin/cc/f77/Makefile | 2 +- gnu/usr.bin/cc/libgcc/Makefile | 2 +- gnu/usr.bin/cvs/FAQ | 4 +- gnu/usr.bin/cvs/Makefile | 2 +- gnu/usr.bin/cvs/contrib/Makefile | 2 +- gnu/usr.bin/cvs/contrib/cln_hist.pl | 2 +- gnu/usr.bin/cvs/contrib/commit_prep.pl | 2 +- gnu/usr.bin/cvs/contrib/cvs_acls.pl | 2 +- gnu/usr.bin/cvs/contrib/cvscheck.man | 2 +- gnu/usr.bin/cvs/contrib/cvscheck.sh | 2 +- gnu/usr.bin/cvs/contrib/cvshelp.man | 2 +- gnu/usr.bin/cvs/contrib/descend.man | 2 +- gnu/usr.bin/cvs/contrib/descend.sh | 2 +- gnu/usr.bin/cvs/contrib/easy-import.pl | 4 +- gnu/usr.bin/cvs/contrib/mfpipe.pl | 2 +- gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile | 2 +- gnu/usr.bin/cvs/contrib/rcs-to-cvs.sh | 2 +- gnu/usr.bin/cvs/contrib/rcs2log.sh | 2 +- gnu/usr.bin/cvs/contrib/rcs2sccs.sh | 2 +- gnu/usr.bin/cvs/contrib/sccs2rcs.csh | 2 +- gnu/usr.bin/cvs/cvs/Makefile | 2 +- gnu/usr.bin/cvs/cvs/cvs.1 | 2 +- gnu/usr.bin/cvs/cvsbug/Makefile | 2 +- gnu/usr.bin/cvs/cvsbug/cvsbug.sh | 2 +- gnu/usr.bin/cvs/cvsinit/Makefile | 2 +- gnu/usr.bin/cvs/cvsinit/cvsinit.8 | 2 +- gnu/usr.bin/cvs/cvsinit/cvsinit.sh | 2 +- gnu/usr.bin/cvs/doc/Makefile | 2 +- gnu/usr.bin/cvs/examples/Makefile | 2 +- gnu/usr.bin/cvs/examples/checkoutlist | 2 +- gnu/usr.bin/cvs/examples/commitinfo | 2 +- gnu/usr.bin/cvs/examples/cvswrappers | 2 +- gnu/usr.bin/cvs/examples/editinfo | 2 +- gnu/usr.bin/cvs/examples/modules | 2 +- gnu/usr.bin/cvs/examples/rcsinfo | 2 +- gnu/usr.bin/cvs/examples/taginfo | 2 +- gnu/usr.bin/cvs/examples/unwrap | 2 +- gnu/usr.bin/cvs/examples/wrap | 2 +- gnu/usr.bin/cvs/lib/Makefile | 2 +- gnu/usr.bin/cvs/mkmodules/Makefile | 2 +- gnu/usr.bin/dialog/Makefile | 2 +- gnu/usr.bin/diff/Makefile | 2 +- gnu/usr.bin/diff/doc/Makefile | 2 +- gnu/usr.bin/gdb/doc/gdbint.texinfo | 4 +- gnu/usr.bin/gdb/doc/stabs.texinfo | 2 +- gnu/usr.bin/gdb/gdb/freebsd-nat.c | 2 +- gnu/usr.bin/gdb/gdb/gdb.1 | 2 +- gnu/usr.bin/gdb/gdb/kcorelow.c | 2 +- gnu/usr.bin/gdb/mmalloc/mmalloc.texi | 2 +- gnu/usr.bin/gzip/bits.c | 2 +- gnu/usr.bin/gzip/crypt.c | 2 +- gnu/usr.bin/gzip/deflate.c | 2 +- gnu/usr.bin/gzip/gzip.c | 2 +- gnu/usr.bin/gzip/inflate.c | 2 +- gnu/usr.bin/gzip/lzw.c | 2 +- gnu/usr.bin/gzip/match.S | 2 +- gnu/usr.bin/gzip/revision.h | 2 +- gnu/usr.bin/gzip/tailor.h | 2 +- gnu/usr.bin/gzip/trees.c | 2 +- gnu/usr.bin/gzip/unlzh.c | 2 +- gnu/usr.bin/gzip/unlzw.c | 2 +- gnu/usr.bin/gzip/unpack.c | 2 +- gnu/usr.bin/gzip/unzip.c | 2 +- gnu/usr.bin/gzip/util.c | 2 +- gnu/usr.bin/gzip/zgrep.getopt | 2 +- gnu/usr.bin/gzip/zip.c | 2 +- gnu/usr.bin/ld/Makefile | 2 +- gnu/usr.bin/ld/PORTING | 2 +- gnu/usr.bin/ld/cplus-dem.c | 2 +- gnu/usr.bin/ld/etc.c | 2 +- gnu/usr.bin/ld/i386/md-static-funcs.c | 2 +- gnu/usr.bin/ld/i386/md.c | 2 +- gnu/usr.bin/ld/i386/md.h | 2 +- gnu/usr.bin/ld/i386/mdprologue.S | 2 +- gnu/usr.bin/ld/ld.1 | 2 +- gnu/usr.bin/ld/ld.c | 2 +- gnu/usr.bin/ld/ld.h | 2 +- gnu/usr.bin/ld/ldconfig/Makefile | 2 +- gnu/usr.bin/ld/ldconfig/ldconfig.8 | 2 +- gnu/usr.bin/ld/ldconfig/ldconfig.c | 2 +- gnu/usr.bin/ld/ldd/Makefile | 2 +- gnu/usr.bin/ld/ldd/ldd.c | 2 +- gnu/usr.bin/ld/lib.c | 2 +- gnu/usr.bin/ld/rrs.c | 2 +- gnu/usr.bin/ld/rtld/Makefile | 2 +- gnu/usr.bin/ld/rtld/malloc.c | 2 +- gnu/usr.bin/ld/rtld/rtld.1 | 2 +- gnu/usr.bin/ld/rtld/rtld.c | 2 +- gnu/usr.bin/ld/rtld/sbrk.c | 2 +- gnu/usr.bin/ld/shlib.c | 2 +- gnu/usr.bin/ld/sparc/md-static-funcs.c | 2 +- gnu/usr.bin/ld/sparc/md.c | 2 +- gnu/usr.bin/ld/sparc/md.h | 2 +- gnu/usr.bin/ld/sparc/mdprologue.S | 2 +- gnu/usr.bin/ld/symbol.c | 2 +- gnu/usr.bin/ld/symseg.h | 2 +- gnu/usr.bin/ld/warnings.c | 2 +- gnu/usr.bin/ld/xbits.c | 2 +- gnu/usr.bin/man/Makefile.shprog | 2 +- gnu/usr.bin/man/apropos/Makefile | 2 +- gnu/usr.bin/man/catman/catman.1 | 2 +- gnu/usr.bin/man/catman/catman.perl | 2 +- gnu/usr.bin/man/makewhatis/makewhatis.1 | 2 +- gnu/usr.bin/man/makewhatis/makewhatis.local.8 | 2 +- gnu/usr.bin/man/makewhatis/makewhatis.local.sh | 2 +- gnu/usr.bin/man/makewhatis/makewhatis.perl | 2 +- gnu/usr.bin/patch/EXTERN.h | 6 +- gnu/usr.bin/patch/INTERN.h | 6 +- gnu/usr.bin/patch/common.h | 6 +- gnu/usr.bin/patch/inp.c | 6 +- gnu/usr.bin/patch/inp.h | 6 +- gnu/usr.bin/patch/patch.1 | 6 +- gnu/usr.bin/patch/patch.c | 6 +- gnu/usr.bin/patch/pch.c | 6 +- gnu/usr.bin/patch/pch.h | 6 +- gnu/usr.bin/patch/util.h | 6 +- gnu/usr.bin/patch/version.c | 6 +- gnu/usr.bin/patch/version.h | 6 +- gnu/usr.bin/perl/eg/ADB | 2 +- gnu/usr.bin/perl/eg/changes | 2 +- gnu/usr.bin/perl/eg/dus | 2 +- gnu/usr.bin/perl/eg/findcp | 2 +- gnu/usr.bin/perl/eg/findtar | 2 +- gnu/usr.bin/perl/eg/g/gcp | 2 +- gnu/usr.bin/perl/eg/g/gcp.man | 2 +- gnu/usr.bin/perl/eg/g/ged | 2 +- gnu/usr.bin/perl/eg/g/gsh | 2 +- gnu/usr.bin/perl/eg/g/gsh.man | 2 +- gnu/usr.bin/perl/eg/muck.man | 2 +- gnu/usr.bin/perl/eg/myrup | 2 +- gnu/usr.bin/perl/eg/nih | 2 +- gnu/usr.bin/perl/eg/relink | 6 +- gnu/usr.bin/perl/eg/rename | 6 +- gnu/usr.bin/perl/eg/rmfrom | 2 +- gnu/usr.bin/perl/eg/scan/scan_df | 2 +- gnu/usr.bin/perl/eg/scan/scan_last | 2 +- gnu/usr.bin/perl/eg/scan/scan_messages | 2 +- gnu/usr.bin/perl/eg/scan/scan_passwd | 2 +- gnu/usr.bin/perl/eg/scan/scan_ps | 2 +- gnu/usr.bin/perl/eg/scan/scan_sudo | 2 +- gnu/usr.bin/perl/eg/scan/scan_suid | 2 +- gnu/usr.bin/perl/eg/scan/scanner | 2 +- gnu/usr.bin/perl/eg/shmkill | 2 +- gnu/usr.bin/perl/eg/van/empty | 2 +- gnu/usr.bin/perl/eg/van/unvanish | 2 +- gnu/usr.bin/perl/eg/van/vanexp | 2 +- gnu/usr.bin/perl/eg/van/vanish | 2 +- gnu/usr.bin/perl/emacs/perldb.pl | 6 +- gnu/usr.bin/perl/lib/ctime.pl | 2 +- gnu/usr.bin/perl/lib/gethostname.pl | 2 +- gnu/usr.bin/perl/lib/getopt.pl | 2 +- gnu/usr.bin/perl/lib/importenv.pl | 2 +- gnu/usr.bin/perl/lib/perldb.pl | 5 +- gnu/usr.bin/perl/lib/pwd.pl | 5 +- gnu/usr.bin/perl/lib/stat.pl | 2 +- gnu/usr.bin/perl/lib/syslog.pl | 3 + gnu/usr.bin/perl/lib/termcap.pl | 2 +- gnu/usr.bin/perl/lib/validate.pl | 2 +- gnu/usr.bin/perl/misc/c2ph | 2 +- gnu/usr.bin/perl/misc/pstruct | 2 +- gnu/usr.bin/perl/perl/EXTERN.h | 5 +- gnu/usr.bin/perl/perl/INTERN.h | 5 +- gnu/usr.bin/perl/perl/arg.h | 5 +- gnu/usr.bin/perl/perl/array.c | 5 +- gnu/usr.bin/perl/perl/array.h | 5 +- gnu/usr.bin/perl/perl/cmd.c | 5 +- gnu/usr.bin/perl/perl/cmd.h | 5 +- gnu/usr.bin/perl/perl/cons.c | 5 +- gnu/usr.bin/perl/perl/consarg.c | 5 +- gnu/usr.bin/perl/perl/crypt.c | 2 +- gnu/usr.bin/perl/perl/doarg.c | 5 +- gnu/usr.bin/perl/perl/doio.c | 5 +- gnu/usr.bin/perl/perl/dolist.c | 5 +- gnu/usr.bin/perl/perl/dump.c | 5 +- gnu/usr.bin/perl/perl/eval.c | 5 +- gnu/usr.bin/perl/perl/form.c | 5 +- gnu/usr.bin/perl/perl/form.h | 5 +- gnu/usr.bin/perl/perl/handy.h | 5 +- gnu/usr.bin/perl/perl/hash.c | 5 +- gnu/usr.bin/perl/perl/hash.h | 5 +- gnu/usr.bin/perl/perl/malloc.c | 5 +- gnu/usr.bin/perl/perl/perl.1 | 8 +- gnu/usr.bin/perl/perl/perl.c | 6 +- gnu/usr.bin/perl/perl/perl.h | 5 +- gnu/usr.bin/perl/perl/regcomp.c | 5 +- gnu/usr.bin/perl/perl/regcomp.h | 5 +- gnu/usr.bin/perl/perl/regexec.c | 5 +- gnu/usr.bin/perl/perl/regexp.h | 5 +- gnu/usr.bin/perl/perl/spat.h | 5 +- gnu/usr.bin/perl/perl/stab.c | 5 +- gnu/usr.bin/perl/perl/stab.h | 5 +- gnu/usr.bin/perl/perl/str.c | 5 +- gnu/usr.bin/perl/perl/str.h | 5 +- gnu/usr.bin/perl/perl/t/TEST | 2 +- gnu/usr.bin/perl/perl/t/base/cond.t | 2 +- gnu/usr.bin/perl/perl/t/base/if.t | 2 +- gnu/usr.bin/perl/perl/t/base/lex.t | 2 +- gnu/usr.bin/perl/perl/t/base/pat.t | 2 +- gnu/usr.bin/perl/perl/t/base/term.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/elsif.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/for.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/mod.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/subval.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/switch.t | 2 +- gnu/usr.bin/perl/perl/t/cmd/while.t | 2 +- gnu/usr.bin/perl/perl/t/comp/cmdopt.t | 2 +- gnu/usr.bin/perl/perl/t/comp/cpp.t | 2 +- gnu/usr.bin/perl/perl/t/comp/decl.t | 2 +- gnu/usr.bin/perl/perl/t/comp/multiline.t | 2 +- gnu/usr.bin/perl/perl/t/comp/script.t | 2 +- gnu/usr.bin/perl/perl/t/comp/term.t | 2 +- gnu/usr.bin/perl/perl/t/io/argv.t | 2 +- gnu/usr.bin/perl/perl/t/io/dup.t | 2 +- gnu/usr.bin/perl/perl/t/io/fs.t | 2 +- gnu/usr.bin/perl/perl/t/io/inplace.t | 2 +- gnu/usr.bin/perl/perl/t/io/pipe.t | 2 +- gnu/usr.bin/perl/perl/t/io/print.t | 2 +- gnu/usr.bin/perl/perl/t/io/tell.t | 2 +- gnu/usr.bin/perl/perl/t/op/append.t | 2 +- gnu/usr.bin/perl/perl/t/op/array.t | 2 +- gnu/usr.bin/perl/perl/t/op/auto.t | 2 +- gnu/usr.bin/perl/perl/t/op/chop.t | 2 +- gnu/usr.bin/perl/perl/t/op/cond.t | 2 +- gnu/usr.bin/perl/perl/t/op/dbm.t | 2 +- gnu/usr.bin/perl/perl/t/op/delete.t | 2 +- gnu/usr.bin/perl/perl/t/op/do.t | 2 +- gnu/usr.bin/perl/perl/t/op/each.t | 2 +- gnu/usr.bin/perl/perl/t/op/eval.t | 2 +- gnu/usr.bin/perl/perl/t/op/exec.t | 2 +- gnu/usr.bin/perl/perl/t/op/exp.t | 2 +- gnu/usr.bin/perl/perl/t/op/flip.t | 2 +- gnu/usr.bin/perl/perl/t/op/fork.t | 2 +- gnu/usr.bin/perl/perl/t/op/glob.t | 2 +- gnu/usr.bin/perl/perl/t/op/goto.t | 2 +- gnu/usr.bin/perl/perl/t/op/index.t | 2 +- gnu/usr.bin/perl/perl/t/op/int.t | 2 +- gnu/usr.bin/perl/perl/t/op/join.t | 2 +- gnu/usr.bin/perl/perl/t/op/list.t | 2 +- gnu/usr.bin/perl/perl/t/op/local.t | 2 +- gnu/usr.bin/perl/perl/t/op/magic.t | 2 +- gnu/usr.bin/perl/perl/t/op/mkdir.t | 2 +- gnu/usr.bin/perl/perl/t/op/oct.t | 2 +- gnu/usr.bin/perl/perl/t/op/ord.t | 2 +- gnu/usr.bin/perl/perl/t/op/pack.t | 2 +- gnu/usr.bin/perl/perl/t/op/pat.t | 2 +- gnu/usr.bin/perl/perl/t/op/push.t | 2 +- gnu/usr.bin/perl/perl/t/op/range.t | 2 +- gnu/usr.bin/perl/perl/t/op/read.t | 2 +- gnu/usr.bin/perl/perl/t/op/regexp.t | 2 +- gnu/usr.bin/perl/perl/t/op/repeat.t | 2 +- gnu/usr.bin/perl/perl/t/op/s.t | 2 +- gnu/usr.bin/perl/perl/t/op/sleep.t | 2 +- gnu/usr.bin/perl/perl/t/op/sort.t | 2 +- gnu/usr.bin/perl/perl/t/op/split.t | 2 +- gnu/usr.bin/perl/perl/t/op/sprintf.t | 2 +- gnu/usr.bin/perl/perl/t/op/stat.t | 2 +- gnu/usr.bin/perl/perl/t/op/study.t | 2 +- gnu/usr.bin/perl/perl/t/op/substr.t | 2 +- gnu/usr.bin/perl/perl/t/op/time.t | 2 +- gnu/usr.bin/perl/perl/t/op/undef.t | 2 +- gnu/usr.bin/perl/perl/t/op/unshift.t | 2 +- gnu/usr.bin/perl/perl/t/op/vec.t | 2 +- gnu/usr.bin/perl/perl/t/op/write.t | 2 +- gnu/usr.bin/perl/perl/tdoio.c | 5 +- gnu/usr.bin/perl/perl/toke.c | 5 +- gnu/usr.bin/perl/perl/usersub.c | 5 +- gnu/usr.bin/perl/perl/util.c | 5 +- gnu/usr.bin/perl/perl/util.h | 5 +- gnu/usr.bin/perl/usub/curses.mus | 5 +- gnu/usr.bin/perl/usub/usersub.c | 5 +- gnu/usr.bin/perl/x2p/EXTERN.h | 5 +- gnu/usr.bin/perl/x2p/INTERN.h | 5 +- gnu/usr.bin/perl/x2p/a2p.1 | 6 +- gnu/usr.bin/perl/x2p/a2p.h | 5 +- gnu/usr.bin/perl/x2p/a2p.y | 5 +- gnu/usr.bin/perl/x2p/a2py.c | 5 +- gnu/usr.bin/perl/x2p/handy.h | 5 +- gnu/usr.bin/perl/x2p/hash.c | 5 +- gnu/usr.bin/perl/x2p/hash.h | 5 +- gnu/usr.bin/perl/x2p/malloc.c | 5 +- gnu/usr.bin/perl/x2p/s2p | 13 +- gnu/usr.bin/perl/x2p/s2p.1 | 7 +- gnu/usr.bin/perl/x2p/str.c | 5 +- gnu/usr.bin/perl/x2p/str.h | 5 +- gnu/usr.bin/perl/x2p/util.c | 5 +- gnu/usr.bin/perl/x2p/util.h | 5 +- gnu/usr.bin/perl/x2p/walk.c | 5 +- gnu/usr.bin/rcs/CREDITS | 2 +- gnu/usr.bin/rcs/NEWS | 2 +- gnu/usr.bin/rcs/REFS | 2 +- gnu/usr.bin/rcs/ci/ci.1 | 2 +- gnu/usr.bin/rcs/ci/ci.c | 2 +- gnu/usr.bin/rcs/co/co.1 | 2 +- gnu/usr.bin/rcs/co/co.c | 2 +- gnu/usr.bin/rcs/doc/rcs.ms | 2 +- gnu/usr.bin/rcs/ident/ident.1 | 2 +- gnu/usr.bin/rcs/ident/ident.c | 2 +- gnu/usr.bin/rcs/lib/conf.h | 2 +- gnu/usr.bin/rcs/lib/maketime.c | 2 +- gnu/usr.bin/rcs/lib/merger.c | 2 +- gnu/usr.bin/rcs/lib/partime.c | 2 +- gnu/usr.bin/rcs/lib/rcsbase.h | 2 +- gnu/usr.bin/rcs/lib/rcsedit.c | 2 +- gnu/usr.bin/rcs/lib/rcsfcmp.c | 2 +- gnu/usr.bin/rcs/lib/rcsfnms.c | 2 +- gnu/usr.bin/rcs/lib/rcsgen.c | 2 +- gnu/usr.bin/rcs/lib/rcskeep.c | 2 +- gnu/usr.bin/rcs/lib/rcskeys.c | 2 +- gnu/usr.bin/rcs/lib/rcslex.c | 2 +- gnu/usr.bin/rcs/lib/rcsmap.c | 2 +- gnu/usr.bin/rcs/lib/rcsrev.c | 2 +- gnu/usr.bin/rcs/lib/rcssyn.c | 2 +- gnu/usr.bin/rcs/lib/rcstime.c | 2 +- gnu/usr.bin/rcs/lib/rcsutil.c | 2 +- gnu/usr.bin/rcs/merge/merge.1 | 2 +- gnu/usr.bin/rcs/merge/merge.c | 2 +- gnu/usr.bin/rcs/rcs/rcs.1 | 2 +- gnu/usr.bin/rcs/rcs/rcs.c | 2 +- gnu/usr.bin/rcs/rcs/rcsfile.5 | 2 +- gnu/usr.bin/rcs/rcs/rcsintro.1 | 2 +- gnu/usr.bin/rcs/rcsclean/rcsclean.1 | 2 +- gnu/usr.bin/rcs/rcsclean/rcsclean.c | 2 +- gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 | 2 +- gnu/usr.bin/rcs/rcsdiff/rcsdiff.c | 2 +- gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 | 2 +- gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh | 2 +- gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 | 2 +- gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 2 +- gnu/usr.bin/rcs/rcstest | 2 +- gnu/usr.bin/rcs/rlog/rlog.1 | 2 +- gnu/usr.bin/rcs/rlog/rlog.c | 2 +- gnu/usr.bin/tar/getdate.y | 4 +- gnu/usr.bin/tar/tar.1 | 2 +- gnu/usr.bin/texinfo/Makefile | 2 +- gnu/usr.bin/texinfo/Makefile.inc | 2 +- gnu/usr.bin/texinfo/makedoc/Makefile | 2 +- gnu/usr.bin/texinfo/makeinfo/Makefile | 2 +- gnu/usr.bin/texinfo/texindex/Makefile | 2 +- gnu/usr.bin/yppush/Makefile | 2 +- gnu/usr.bin/yppush/yppush.8 | 2 +- gnu/usr.bin/yppush/yppush.c | 2 +- gnu/usr.sbin/Makefile | 2 +- gnu/usr.sbin/Makefile.inc | 2 +- gnu/usr.sbin/isdn/dbg/dbg.c | 8 +- gnu/usr.sbin/isdn/dbg/dbg_3008.c | 8 +- gnu/usr.sbin/isdn/dbg/dbg_3009.c | 8 +- gnu/usr.sbin/isdn/dbg/dbg_5000.c | 8 +- gnu/usr.sbin/isdn/iid/Changes | 8 +- gnu/usr.sbin/isdn/iid/iid.c | 8 +- gnu/usr.sbin/isdn/ispy/ispy.c | 8 +- gnu/usr.sbin/isdn/itel/iteld.c | 8 +- gnu/usr.sbin/isdn/ittd/ittd.c | 8 +- gnu/usr.sbin/isdn/load/load.c | 8 +- gnu/usr.sbin/isdn/misc/stime.c | 8 +- gnu/usr.sbin/isdn/misc/tst.c | 8 +- gnu/usr.sbin/isdn/nsplit/nsplit.c | 8 +- gnu/usr.sbin/isdn/rst/rst.c | 8 +- gnu/usr.sbin/isdn/rstcode/rstcode.c | 8 +- gnu/usr.sbin/isdn/spy/spy.c | 8 +- gnu/usr.sbin/yp_mkdb/Makefile | 2 +- gnu/usr.sbin/yp_mkdb/yp_mkdb.c | 2 +- gnu/usr.sbin/yppasswdd/Makefile | 2 +- gnu/usr.sbin/ypserv/Makefile | 2 +- gnu/usr.sbin/ypserv/Makefile.yp | 2 +- gnu/usr.sbin/ypserv/dnslookup.c | 2 +- gnu/usr.sbin/ypserv/server.c | 2 +- gnu/usr.sbin/ypserv/svc_run.c | 2 +- gnu/usr.sbin/ypserv/system.h | 2 +- gnu/usr.sbin/ypserv/yp.h | 2 +- gnu/usr.sbin/ypserv/yp_svc.c | 2 +- gnu/usr.sbin/ypserv/yp_xdr.c | 2 +- gnu/usr.sbin/ypserv/ypserv.8 | 2 +- include/Makefile | 2 +- include/link.h | 2 +- include/netdb.h | 2 +- include/nl_types.h | 2 +- include/nlist.h | 2 +- include/resolv.h | 2 +- include/rpc/auth.h | 2 +- include/rpc/auth_unix.h | 2 +- include/rpc/clnt.h | 2 +- include/rpc/pmap_clnt.h | 2 +- include/rpc/pmap_prot.h | 2 +- include/rpc/pmap_rmt.h | 2 +- include/rpc/rpc.h | 2 +- include/rpc/rpc_msg.h | 2 +- include/rpc/svc.h | 2 +- include/rpc/svc_auth.h | 2 +- include/rpc/types.h | 2 +- include/rpc/xdr.h | 2 +- include/rpcsvc/Makefile | 2 +- include/rpcsvc/klm_prot.x | 2 +- include/rpcsvc/mount.x | 2 +- include/rpcsvc/nfs_prot.x | 2 +- include/rpcsvc/nlm_prot.x | 2 +- include/rpcsvc/rex.x | 2 +- include/rpcsvc/rnusers.x | 2 +- include/rpcsvc/rquota.x | 2 +- include/rpcsvc/rstat.x | 2 +- include/rpcsvc/rwall.x | 2 +- include/rpcsvc/sm_inter.x | 2 +- include/rpcsvc/spray.x | 2 +- include/rpcsvc/yp.x | 2 +- include/rpcsvc/yp_prot.h | 2 +- include/rpcsvc/ypclnt.h | 2 +- include/rpcsvc/yppasswd.x | 2 +- include/strhash.h | 2 +- lib/csu/i386/Makefile | 2 +- lib/csu/i386/c++rt0.c | 2 +- lib/csu/i386/crt0.c | 2 +- lib/libc/db/doc/hash.usenix.ps | 2 +- lib/libc/db/doc/libtp.usenix.ps | 2 +- lib/libc/gen/Makefile.inc | 2 +- lib/libc/gen/config.c | 4 +- lib/libc/gen/config_open.3 | 2 +- lib/libc/gen/crypt.c | 2 +- lib/libc/gen/err.3 | 2 +- lib/libc/gen/getbootfile.3 | 2 +- lib/libc/gen/getbootfile.c | 2 +- lib/libc/gen/getdomainname.3 | 2 +- lib/libc/gen/getdomainname.c | 2 +- lib/libc/gen/getgrent.3 | 2 +- lib/libc/gen/getosreldate.c | 2 +- lib/libc/gen/getvfsent.3 | 2 +- lib/libc/gen/ntp_gettime.c | 2 +- lib/libc/gen/setdomainname.c | 2 +- lib/libc/gen/shmat.c | 2 +- lib/libc/gen/shmctl.c | 2 +- lib/libc/gen/shmdt.c | 2 +- lib/libc/gen/shmget.c | 2 +- lib/libc/gen/ualarm.3 | 2 +- lib/libc/gen/uname.c | 2 +- lib/libc/i386/DEFS.h | 2 +- lib/libc/i386/SYS.h | 2 +- lib/libc/i386/gen/Makefile.inc | 2 +- lib/libc/i386/gen/_setjmp.S | 4 +- lib/libc/i386/gen/alloca.S | 4 +- lib/libc/i386/gen/divsi3.S | 4 +- lib/libc/i386/gen/fabs.S | 4 +- lib/libc/i386/gen/fixdfsi.S | 2 +- lib/libc/i386/gen/fixunsdfsi.S | 4 +- lib/libc/i386/gen/frexp.c | 4 +- lib/libc/i386/gen/infinity.c | 2 +- lib/libc/i386/gen/isinf.c | 4 +- lib/libc/i386/gen/ldexp.c | 4 +- lib/libc/i386/gen/modf.S | 4 +- lib/libc/i386/gen/setjmp.S | 4 +- lib/libc/i386/gen/sigsetjmp.S | 4 +- lib/libc/i386/gen/udivsi3.S | 4 +- lib/libc/i386/net/Makefile.inc | 2 +- lib/libc/i386/net/htonl.S | 4 +- lib/libc/i386/net/htons.S | 4 +- lib/libc/i386/net/ntohl.S | 4 +- lib/libc/i386/net/ntohs.S | 4 +- lib/libc/i386/stdlib/Makefile.inc | 2 +- lib/libc/i386/stdlib/abs.S | 4 +- lib/libc/i386/stdlib/div.S | 4 +- lib/libc/i386/stdlib/labs.S | 4 +- lib/libc/i386/stdlib/ldiv.S | 4 +- lib/libc/i386/string/Makefile.inc | 2 +- lib/libc/i386/string/bcmp.S | 4 +- lib/libc/i386/string/bcopy.S | 4 +- lib/libc/i386/string/bzero.S | 4 +- lib/libc/i386/string/ffs.S | 4 +- lib/libc/i386/string/index.S | 4 +- lib/libc/i386/string/memchr.S | 4 +- lib/libc/i386/string/memcmp.S | 4 +- lib/libc/i386/string/memmove.S | 4 +- lib/libc/i386/string/memset.S | 4 +- lib/libc/i386/string/rindex.S | 4 +- lib/libc/i386/string/strcat.S | 4 +- lib/libc/i386/string/strchr.S | 4 +- lib/libc/i386/string/strcmp.S | 4 +- lib/libc/i386/string/strcpy.S | 4 +- lib/libc/i386/string/strlen.S | 4 +- lib/libc/i386/string/strncmp.S | 4 +- lib/libc/i386/string/strrchr.S | 4 +- lib/libc/i386/string/swab.S | 4 +- lib/libc/i386/sys/Makefile.inc | 2 +- lib/libc/i386/sys/Ovfork.S | 4 +- lib/libc/i386/sys/brk.S | 4 +- lib/libc/i386/sys/cerror.S | 4 +- lib/libc/i386/sys/exect.S | 4 +- lib/libc/i386/sys/fork.S | 4 +- lib/libc/i386/sys/i386_get_ldt.2 | 2 +- lib/libc/i386/sys/i386_get_ldt.c | 4 +- lib/libc/i386/sys/i386_set_ldt.c | 4 +- lib/libc/i386/sys/mount.S | 4 +- lib/libc/i386/sys/pipe.S | 4 +- lib/libc/i386/sys/ptrace.S | 4 +- lib/libc/i386/sys/reboot.S | 4 +- lib/libc/i386/sys/sbrk.S | 4 +- lib/libc/i386/sys/setlogin.S | 4 +- lib/libc/i386/sys/sigpending.S | 4 +- lib/libc/i386/sys/sigprocmask.S | 4 +- lib/libc/i386/sys/sigreturn.S | 4 +- lib/libc/i386/sys/sigsuspend.S | 4 +- lib/libc/i386/sys/syscall.S | 4 +- lib/libc/locale/collate.c | 2 +- lib/libc/locale/collate.h | 2 +- lib/libc/net/ether_addr.c | 2 +- lib/libc/net/ethers.3 | 2 +- lib/libc/net/gethostbydns.c | 2 +- lib/libc/net/gethostbyht.c | 2 +- lib/libc/net/gethostbynis.c | 4 +- lib/libc/net/gethostnamadr.c | 4 +- lib/libc/net/getnetbydns.c | 2 +- lib/libc/net/getnetbynis.c | 4 +- lib/libc/net/getnetnamadr.c | 4 +- lib/libc/net/herror.c | 2 +- lib/libc/net/res_comp.c | 2 +- lib/libc/net/res_debug.c | 2 +- lib/libc/net/res_init.c | 2 +- lib/libc/net/res_mkquery.c | 2 +- lib/libc/net/res_query.c | 2 +- lib/libc/net/res_send.c | 2 +- lib/libc/nls/catclose.3 | 2 +- lib/libc/nls/catclose.c | 2 +- lib/libc/nls/catgets.3 | 2 +- lib/libc/nls/catgets.c | 2 +- lib/libc/nls/catopen.3 | 2 +- lib/libc/nls/catopen.c | 2 +- lib/libc/nls/msgcat.c | 2 +- lib/libc/nls/msgcat.h | 2 +- lib/libc/rpc/auth_none.c | 2 +- lib/libc/rpc/auth_unix.c | 2 +- lib/libc/rpc/authunix_prot.c | 2 +- lib/libc/rpc/bindresvport.c | 2 +- lib/libc/rpc/clnt_generic.c | 2 +- lib/libc/rpc/clnt_perror.c | 2 +- lib/libc/rpc/clnt_raw.c | 2 +- lib/libc/rpc/clnt_simple.c | 2 +- lib/libc/rpc/clnt_tcp.c | 2 +- lib/libc/rpc/clnt_udp.c | 2 +- lib/libc/rpc/get_myaddress.c | 2 +- lib/libc/rpc/getrpcent.c | 2 +- lib/libc/rpc/getrpcport.c | 2 +- lib/libc/rpc/pmap_clnt.c | 2 +- lib/libc/rpc/pmap_getmaps.c | 2 +- lib/libc/rpc/pmap_getport.c | 2 +- lib/libc/rpc/pmap_prot.c | 2 +- lib/libc/rpc/pmap_prot2.c | 2 +- lib/libc/rpc/pmap_rmt.c | 2 +- lib/libc/rpc/rpc_callmsg.c | 2 +- lib/libc/rpc/rpc_commondata.c | 2 +- lib/libc/rpc/rpc_prot.c | 2 +- lib/libc/rpc/svc.c | 2 +- lib/libc/rpc/svc_auth.c | 2 +- lib/libc/rpc/svc_auth_unix.c | 2 +- lib/libc/rpc/svc_raw.c | 2 +- lib/libc/rpc/svc_run.c | 2 +- lib/libc/rpc/svc_simple.c | 2 +- lib/libc/rpc/svc_tcp.c | 2 +- lib/libc/rpc/svc_udp.c | 2 +- lib/libc/stdio/Makefile.inc | 2 +- lib/libc/stdio/asprintf.c | 2 +- lib/libc/stdio/vasprintf.c | 2 +- lib/libc/stdlib/strhash.c | 6 +- lib/libc/stdtime/Makefile.inc | 2 +- lib/libc/stdtime/strftime.c | 2 +- lib/libc/string/strcoll.c | 2 +- lib/libc/string/strxfrm.c | 2 +- lib/libc/sys/ptrace.2 | 2 +- lib/libc/sys/rtprio.2 | 2 +- lib/libc/sys/semctl.2 | 2 +- lib/libc/sys/semget.2 | 2 +- lib/libc/sys/semop.2 | 2 +- lib/libc/sys/send.2 | 2 +- lib/libc/sys/shmat.2 | 2 +- lib/libc/sys/shmctl.2 | 2 +- lib/libc/sys/shmget.2 | 2 +- lib/libc/sys/socket.2 | 2 +- lib/libc/xdr/xdr.c | 2 +- lib/libc/xdr/xdr_array.c | 2 +- lib/libc/xdr/xdr_float.c | 2 +- lib/libc/xdr/xdr_mem.c | 2 +- lib/libc/xdr/xdr_rec.c | 2 +- lib/libc/xdr/xdr_reference.c | 2 +- lib/libc/xdr/xdr_stdio.c | 2 +- lib/libc/yp/Makefile.inc | 2 +- lib/libc/yp/xdryp.c | 2 +- lib/libc/yp/yplib.c | 2 +- lib/libcom_err/Makefile | 2 +- lib/libcom_err/com_err.3 | 2 +- lib/libcom_err/com_err.c | 2 +- lib/libcom_err/doc/Makefile | 2 +- lib/libcom_err/doc/com_err.texinfo | 4 +- lib/libcom_err/error_message.c | 6 +- lib/libcom_err/et_name.c | 2 +- lib/libcom_err/init_et.c | 6 +- lib/libcompat/4.1/ascftime.c | 2 +- lib/libcompat/4.1/cftime.3 | 2 +- lib/libcompat/4.1/cftime.c | 2 +- lib/libcompat/4.1/ftime.c | 2 +- lib/libcompat/4.1/getpw.c | 2 +- lib/libcompat/4.1/gtty.c | 2 +- lib/libcompat/4.1/stty.c | 2 +- lib/libcompat/4.3/cfree.3 | 2 +- lib/libcompat/4.4/cuserid.3 | 2 +- lib/libcompat/SysV/ftok.3 | 2 +- lib/libcompat/SysV/ftok.c | 2 +- lib/libcrypt/Makefile | 2 +- lib/libcrypt/crypt.c | 4 +- lib/libcurses/Makefile | 2 +- lib/libdisk/Makefile | 2 +- lib/libdisk/blocks.c | 2 +- lib/libdisk/change.c | 2 +- lib/libdisk/chunk.c | 2 +- lib/libdisk/create_chunk.c | 2 +- lib/libdisk/disk.c | 2 +- lib/libdisk/disklabel.c | 2 +- lib/libdisk/libdisk.3 | 2 +- lib/libdisk/libdisk.h | 2 +- lib/libdisk/rules.c | 2 +- lib/libdisk/tst01.c | 2 +- lib/libdisk/write_disk.c | 2 +- lib/libftpio/ftpio.3 | 2 +- lib/libftpio/ftpio.c | 2 +- lib/libkvm/kvm_getprocs.3 | 2 +- lib/libm/Makefile | 2 +- lib/libmd/mdXhl.c | 2 +- lib/libmytinfo/Makefile | 2 +- lib/libmytinfo/TESTS/Makefile | 2 +- lib/libncurses/Makefile | 2 +- lib/libncurses/TESTS/newdemo.c | 2 +- lib/libpcap/Makefile | 2 +- lib/libpcap/bpf_filter.c | 4 +- lib/libpcap/bpf_image.c | 2 +- lib/libpcap/etherent.c | 2 +- lib/libpcap/ethertype.h | 2 +- lib/libpcap/gencode.c | 2 +- lib/libpcap/gencode.h | 2 +- lib/libpcap/grammar.y | 2 +- lib/libpcap/inet.c | 2 +- lib/libpcap/nametoaddr.c | 2 +- lib/libpcap/optimize.c | 2 +- lib/libpcap/pcap-bpf.c | 2 +- lib/libpcap/pcap-dlpi.c | 2 +- lib/libpcap/pcap-int.h | 2 +- lib/libpcap/pcap-namedb.h | 2 +- lib/libpcap/pcap-nit.c | 2 +- lib/libpcap/pcap-nit.h | 2 +- lib/libpcap/pcap-pf.c | 2 +- lib/libpcap/pcap-pf.h | 2 +- lib/libpcap/pcap-snit.c | 2 +- lib/libpcap/pcap-snoop.c | 2 +- lib/libpcap/pcap.c | 2 +- lib/libpcap/pcap.h | 2 +- lib/libpcap/savefile.c | 2 +- lib/libpcap/scanner.l | 2 +- lib/librpcsvc/Makefile | 2 +- lib/libscsi/scsi.c | 2 +- lib/libskey/pathnames.h | 2 +- lib/libss/Makefile | 2 +- lib/libtelnet/Makefile | 2 +- lib/libtermcap/termcap.h | 2 +- lib/libutil/libutil.h | 2 +- lib/libutil/setproctitle.3 | 2 +- lib/libutil/setproctitle.c | 2 +- lib/libz/Makefile | 2 +- lib/msun/Makefile | 2 +- lib/msun/i387/e_acos.S | 2 +- lib/msun/i387/e_asin.S | 2 +- lib/msun/i387/e_atan2.S | 2 +- lib/msun/i387/e_exp.S | 2 +- lib/msun/i387/e_fmod.S | 2 +- lib/msun/i387/e_log.S | 2 +- lib/msun/i387/e_log10.S | 2 +- lib/msun/i387/e_remainder.S | 2 +- lib/msun/i387/e_scalb.S | 2 +- lib/msun/i387/e_sqrt.S | 2 +- lib/msun/i387/s_atan.S | 2 +- lib/msun/i387/s_ceil.S | 2 +- lib/msun/i387/s_copysign.S | 2 +- lib/msun/i387/s_cos.S | 2 +- lib/msun/i387/s_finite.S | 2 +- lib/msun/i387/s_floor.S | 2 +- lib/msun/i387/s_ilogb.S | 2 +- lib/msun/i387/s_log1p.S | 2 +- lib/msun/i387/s_logb.S | 2 +- lib/msun/i387/s_rint.S | 2 +- lib/msun/i387/s_scalbn.S | 2 +- lib/msun/i387/s_significand.S | 2 +- lib/msun/i387/s_sin.S | 2 +- lib/msun/i387/s_tan.S | 2 +- lib/msun/man/acos.3 | 2 +- lib/msun/man/acosh.3 | 2 +- lib/msun/man/asin.3 | 2 +- lib/msun/man/asinh.3 | 2 +- lib/msun/man/atan.3 | 2 +- lib/msun/man/atan2.3 | 2 +- lib/msun/man/atanh.3 | 2 +- lib/msun/man/ceil.3 | 2 +- lib/msun/man/cos.3 | 2 +- lib/msun/man/cosh.3 | 2 +- lib/msun/man/erf.3 | 2 +- lib/msun/man/exp.3 | 2 +- lib/msun/man/fabs.3 | 2 +- lib/msun/man/floor.3 | 2 +- lib/msun/man/fmod.3 | 2 +- lib/msun/man/hypot.3 | 2 +- lib/msun/man/ieee.3 | 2 +- lib/msun/man/ieee_test.3 | 2 +- lib/msun/man/j0.3 | 2 +- lib/msun/man/lgamma.3 | 2 +- lib/msun/man/math.3 | 2 +- lib/msun/man/rint.3 | 2 +- lib/msun/man/sin.3 | 2 +- lib/msun/man/sinh.3 | 2 +- lib/msun/man/sqrt.3 | 2 +- lib/msun/man/tan.3 | 2 +- lib/msun/man/tanh.3 | 2 +- lib/msun/src/e_acos.c | 2 +- lib/msun/src/e_acosf.c | 2 +- lib/msun/src/e_acosh.c | 2 +- lib/msun/src/e_acoshf.c | 2 +- lib/msun/src/e_asin.c | 2 +- lib/msun/src/e_asinf.c | 2 +- lib/msun/src/e_atan2.c | 2 +- lib/msun/src/e_atan2f.c | 2 +- lib/msun/src/e_atanh.c | 2 +- lib/msun/src/e_atanhf.c | 2 +- lib/msun/src/e_cosh.c | 2 +- lib/msun/src/e_coshf.c | 2 +- lib/msun/src/e_exp.c | 2 +- lib/msun/src/e_expf.c | 2 +- lib/msun/src/e_fmod.c | 2 +- lib/msun/src/e_fmodf.c | 2 +- lib/msun/src/e_gamma.c | 2 +- lib/msun/src/e_gamma_r.c | 2 +- lib/msun/src/e_gammaf.c | 2 +- lib/msun/src/e_gammaf_r.c | 2 +- lib/msun/src/e_hypot.c | 2 +- lib/msun/src/e_hypotf.c | 2 +- lib/msun/src/e_j0.c | 2 +- lib/msun/src/e_j0f.c | 2 +- lib/msun/src/e_j1.c | 2 +- lib/msun/src/e_j1f.c | 2 +- lib/msun/src/e_jn.c | 2 +- lib/msun/src/e_jnf.c | 2 +- lib/msun/src/e_lgamma.c | 2 +- lib/msun/src/e_lgamma_r.c | 2 +- lib/msun/src/e_lgammaf.c | 2 +- lib/msun/src/e_lgammaf_r.c | 2 +- lib/msun/src/e_log.c | 2 +- lib/msun/src/e_log10.c | 2 +- lib/msun/src/e_log10f.c | 2 +- lib/msun/src/e_logf.c | 2 +- lib/msun/src/e_pow.c | 2 +- lib/msun/src/e_powf.c | 2 +- lib/msun/src/e_rem_pio2.c | 2 +- lib/msun/src/e_rem_pio2f.c | 2 +- lib/msun/src/e_remainder.c | 2 +- lib/msun/src/e_remainderf.c | 2 +- lib/msun/src/e_scalb.c | 2 +- lib/msun/src/e_scalbf.c | 2 +- lib/msun/src/e_sinh.c | 2 +- lib/msun/src/e_sinhf.c | 2 +- lib/msun/src/e_sqrt.c | 2 +- lib/msun/src/e_sqrtf.c | 2 +- lib/msun/src/k_cos.c | 2 +- lib/msun/src/k_cosf.c | 2 +- lib/msun/src/k_rem_pio2.c | 2 +- lib/msun/src/k_rem_pio2f.c | 2 +- lib/msun/src/k_sin.c | 2 +- lib/msun/src/k_sinf.c | 2 +- lib/msun/src/k_standard.c | 2 +- lib/msun/src/k_tan.c | 2 +- lib/msun/src/k_tanf.c | 2 +- lib/msun/src/math.h | 2 +- lib/msun/src/math_private.h | 2 +- lib/msun/src/s_asinh.c | 2 +- lib/msun/src/s_asinhf.c | 2 +- lib/msun/src/s_atan.c | 2 +- lib/msun/src/s_atanf.c | 2 +- lib/msun/src/s_cbrt.c | 2 +- lib/msun/src/s_cbrtf.c | 2 +- lib/msun/src/s_ceil.c | 2 +- lib/msun/src/s_ceilf.c | 2 +- lib/msun/src/s_copysign.c | 2 +- lib/msun/src/s_copysignf.c | 2 +- lib/msun/src/s_cos.c | 2 +- lib/msun/src/s_cosf.c | 2 +- lib/msun/src/s_erf.c | 2 +- lib/msun/src/s_erff.c | 2 +- lib/msun/src/s_expm1.c | 2 +- lib/msun/src/s_expm1f.c | 2 +- lib/msun/src/s_fabs.c | 2 +- lib/msun/src/s_fabsf.c | 2 +- lib/msun/src/s_finite.c | 2 +- lib/msun/src/s_finitef.c | 2 +- lib/msun/src/s_floor.c | 2 +- lib/msun/src/s_floorf.c | 2 +- lib/msun/src/s_frexp.c | 2 +- lib/msun/src/s_frexpf.c | 2 +- lib/msun/src/s_ilogb.c | 2 +- lib/msun/src/s_ilogbf.c | 2 +- lib/msun/src/s_isnan.c | 2 +- lib/msun/src/s_isnanf.c | 2 +- lib/msun/src/s_ldexp.c | 2 +- lib/msun/src/s_ldexpf.c | 2 +- lib/msun/src/s_lib_version.c | 2 +- lib/msun/src/s_log1p.c | 2 +- lib/msun/src/s_log1pf.c | 2 +- lib/msun/src/s_logb.c | 2 +- lib/msun/src/s_logbf.c | 2 +- lib/msun/src/s_matherr.c | 2 +- lib/msun/src/s_modf.c | 2 +- lib/msun/src/s_modff.c | 2 +- lib/msun/src/s_nextafter.c | 2 +- lib/msun/src/s_nextafterf.c | 2 +- lib/msun/src/s_rint.c | 2 +- lib/msun/src/s_rintf.c | 2 +- lib/msun/src/s_scalbn.c | 2 +- lib/msun/src/s_scalbnf.c | 2 +- lib/msun/src/s_significand.c | 2 +- lib/msun/src/s_significandf.c | 2 +- lib/msun/src/s_sin.c | 2 +- lib/msun/src/s_sinf.c | 2 +- lib/msun/src/s_tan.c | 2 +- lib/msun/src/s_tanf.c | 2 +- lib/msun/src/s_tanh.c | 2 +- lib/msun/src/s_tanhf.c | 2 +- lib/msun/src/w_acos.c | 2 +- lib/msun/src/w_acosf.c | 2 +- lib/msun/src/w_acosh.c | 2 +- lib/msun/src/w_acoshf.c | 2 +- lib/msun/src/w_asin.c | 2 +- lib/msun/src/w_asinf.c | 2 +- lib/msun/src/w_atan2.c | 2 +- lib/msun/src/w_atan2f.c | 2 +- lib/msun/src/w_atanh.c | 2 +- lib/msun/src/w_atanhf.c | 2 +- lib/msun/src/w_cosh.c | 2 +- lib/msun/src/w_coshf.c | 2 +- lib/msun/src/w_exp.c | 2 +- lib/msun/src/w_expf.c | 2 +- lib/msun/src/w_fmod.c | 2 +- lib/msun/src/w_fmodf.c | 2 +- lib/msun/src/w_gamma.c | 2 +- lib/msun/src/w_gamma_r.c | 2 +- lib/msun/src/w_gammaf.c | 2 +- lib/msun/src/w_gammaf_r.c | 2 +- lib/msun/src/w_hypot.c | 2 +- lib/msun/src/w_hypotf.c | 2 +- lib/msun/src/w_j0.c | 2 +- lib/msun/src/w_j0f.c | 2 +- lib/msun/src/w_j1.c | 2 +- lib/msun/src/w_j1f.c | 2 +- lib/msun/src/w_jn.c | 2 +- lib/msun/src/w_jnf.c | 2 +- lib/msun/src/w_lgamma.c | 2 +- lib/msun/src/w_lgamma_r.c | 2 +- lib/msun/src/w_lgammaf.c | 2 +- lib/msun/src/w_lgammaf_r.c | 2 +- lib/msun/src/w_log.c | 2 +- lib/msun/src/w_log10.c | 2 +- lib/msun/src/w_log10f.c | 2 +- lib/msun/src/w_logf.c | 2 +- lib/msun/src/w_powf.c | 2 +- lib/msun/src/w_remainder.c | 2 +- lib/msun/src/w_remainderf.c | 2 +- lib/msun/src/w_scalb.c | 2 +- lib/msun/src/w_scalbf.c | 2 +- lib/msun/src/w_sinh.c | 2 +- lib/msun/src/w_sinhf.c | 2 +- lib/msun/src/w_sqrt.c | 2 +- lib/msun/src/w_sqrtf.c | 2 +- libexec/atrun/Makefile | 2 +- libexec/atrun/atrun.c | 2 +- libexec/atrun/atrun.man | 2 +- libexec/bootpd/Makefile | 2 +- libexec/bootpd/bootp.h | 2 +- libexec/bootpd/bootpd.8 | 2 +- libexec/bootpd/bootpd.c | 2 +- libexec/bootpd/bootptab.5 | 2 +- libexec/bootpd/hash.c | 2 +- libexec/bootpd/readfile.c | 2 +- libexec/bootpd/rtmsg.c | 2 +- libexec/bootpd/tools/Makefile | 2 +- libexec/bootpd/tools/Makefile.inc | 2 +- libexec/bootpd/tools/bootpef/Makefile | 2 +- libexec/bootpd/tools/bootpef/bootpef.c | 2 +- libexec/bootpd/tools/bootptest/Makefile | 2 +- libexec/bootpd/tools/bootptest/print-bootp.c | 2 +- libexec/bootpgw/Makefile | 2 +- libexec/bootpgw/bootpgw.c | 2 +- libexec/ftpd/ftpd.c | 2 +- libexec/ftpd/popen.c | 2 +- libexec/rexecd/Makefile | 2 +- libexec/rexecd/rexecd.8 | 2 +- libexec/rexecd/rexecd.c | 2 +- libexec/rpc.rstatd/Makefile | 2 +- libexec/rpc.rstatd/rpc.rstatd.8 | 2 +- libexec/rpc.rstatd/rstat_proc.c | 2 +- libexec/rpc.rstatd/rstatd.c | 2 +- libexec/rpc.rusersd/Makefile | 2 +- libexec/rpc.rusersd/rpc.rusersd.8 | 2 +- libexec/rpc.rusersd/rusers_proc.c | 2 +- libexec/rpc.rusersd/rusersd.c | 2 +- libexec/rpc.rwalld/Makefile | 2 +- libexec/rpc.rwalld/rpc.rwalld.8 | 2 +- libexec/rpc.rwalld/rwalld.c | 2 +- libexec/rshd/Makefile | 2 +- libexec/xtend/Makefile | 2 +- lkm/Makefile | 2 +- lkm/Makefile.inc | 2 +- lkm/cd9660/Makefile | 2 +- lkm/coff/Makefile | 2 +- lkm/coff/coff.c | 2 +- lkm/fdesc/Makefile | 2 +- lkm/ibcs2/Makefile | 2 +- lkm/ibcs2/ibcs2 | 2 +- lkm/ibcs2/ibcs2.c | 2 +- lkm/if_disc/Makefile | 2 +- lkm/if_ppp/Makefile | 2 +- lkm/if_sl/Makefile | 2 +- lkm/if_tun/Makefile | 2 +- lkm/ip_mroute_mod/Makefile | 2 +- lkm/ipfw/Makefile | 2 +- lkm/kernfs/Makefile | 2 +- lkm/linux/Makefile | 2 +- lkm/linux/linux | 2 +- lkm/linux/linux.c | 2 +- lkm/mfs/Makefile | 2 +- lkm/msdos/Makefile | 2 +- lkm/nfs/Makefile | 2 +- lkm/nullfs/Makefile | 2 +- lkm/portal/Makefile | 2 +- lkm/procfs/Makefile | 2 +- lkm/socksys/Makefile | 2 +- lkm/socksys/socksys.c | 2 +- lkm/syscons/Makefile | 2 +- lkm/syscons/blank/Makefile | 2 +- lkm/syscons/blank/blank_saver.c | 2 +- lkm/syscons/fade/Makefile | 2 +- lkm/syscons/fade/fade_saver.c | 2 +- lkm/syscons/green/Makefile | 2 +- lkm/syscons/green/green_saver.c | 2 +- lkm/syscons/snake/Makefile | 2 +- lkm/syscons/snake/snake_saver.c | 2 +- lkm/syscons/star/Makefile | 2 +- lkm/syscons/star/star_saver.c | 2 +- lkm/umapfs/Makefile | 2 +- lkm/union/Makefile | 2 +- release/Makefile | 4 +- release/boot_crunch.conf | 2 +- release/fixit.profile | 2 +- release/fixit.services | 2 +- release/fixit_crunch.conf | 2 +- release/floppies/Makefile | 2 +- release/floppies/boot/Makefile | 2 +- release/floppies/boot/crunch/crunch.conf | 2 +- release/floppies/boot/floppy/Makefile | 2 +- release/floppies/boot/mfs/Makefile | 2 +- release/floppies/crunch_fs.mk | 2 +- release/floppies/fixit/Makefile | 2 +- release/floppies/fixit/crunch/crunch.conf | 2 +- release/floppies/fixit/image/Makefile | 2 +- release/floppies/fixit/verbatim/.profile | 2 +- release/floppies/write_mfs_in_kernel.c | 2 +- release/sysinstall/anonFTP.c | 2 +- release/sysinstall/apache.c | 2 +- release/sysinstall/attr.c | 2 +- release/sysinstall/cdrom.c | 2 +- release/sysinstall/command.c | 2 +- release/sysinstall/config.c | 2 +- release/sysinstall/dev2c.sh | 2 +- release/sysinstall/devices.c | 2 +- release/sysinstall/disks.c | 2 +- release/sysinstall/dispatch.c | 2 +- release/sysinstall/dist.c | 2 +- release/sysinstall/dmenu.c | 2 +- release/sysinstall/doc.c | 2 +- release/sysinstall/dos.c | 2 +- release/sysinstall/floppy.c | 2 +- release/sysinstall/ftp.c | 2 +- release/sysinstall/ftp_strat.c | 2 +- release/sysinstall/globals.c | 2 +- release/sysinstall/help/hardware.hlp | 2 +- release/sysinstall/help/relnotes.hlp | 2 +- release/sysinstall/index.c | 2 +- release/sysinstall/install.c | 2 +- release/sysinstall/installUpgrade.c | 2 +- release/sysinstall/keymap.c | 2 +- release/sysinstall/label.c | 2 +- release/sysinstall/lang.c | 2 +- release/sysinstall/main.c | 2 +- release/sysinstall/media.c | 2 +- release/sysinstall/menus.c | 2 +- release/sysinstall/misc.c | 2 +- release/sysinstall/msg.c | 2 +- release/sysinstall/network.c | 2 +- release/sysinstall/nfs.c | 2 +- release/sysinstall/options.c | 2 +- release/sysinstall/package.c | 2 +- release/sysinstall/samba.c | 2 +- release/sysinstall/sysinstall.h | 2 +- release/sysinstall/system.c | 2 +- release/sysinstall/tape.c | 2 +- release/sysinstall/tcpip.c | 2 +- release/sysinstall/uc_eisa.c | 2 +- release/sysinstall/uc_isa.c | 2 +- release/sysinstall/uc_kmem.c | 2 +- release/sysinstall/uc_list.c | 2 +- release/sysinstall/uc_main.c | 2 +- release/sysinstall/uc_main.h | 2 +- release/sysinstall/uc_pci.c | 2 +- release/sysinstall/uc_scsi.c | 2 +- release/sysinstall/ufs.c | 2 +- release/sysinstall/user.c | 2 +- release/sysinstall/variable.c | 2 +- release/sysinstall/version.h | 2 +- release/sysinstall/wizard.c | 2 +- release/write_mfs_in_kernel.c | 2 +- sbin/ccdconfig/ccdconfig.c | 2 +- sbin/dset/dset.8 | 2 +- sbin/dumpon/Makefile | 2 +- sbin/dumpon/dumpon.8 | 2 +- sbin/dumpon/dumpon.c | 2 +- sbin/i386/Makefile | 2 +- sbin/i386/Makefile.inc | 2 +- sbin/i386/ft/Makefile | 2 +- sbin/i386/mount_msdos/Makefile | 2 +- sbin/i386/mount_msdos/mount_msdos.8 | 2 +- sbin/i386/mount_msdos/mount_msdos.c | 2 +- sbin/init/Makefile | 2 +- sbin/init/init.c | 4 +- sbin/ipfw/ipfw.c | 2 +- sbin/md5/md5.c | 2 +- sbin/modload/Makefile | 2 +- sbin/modload/modload.8 | 2 +- sbin/modload/modload.c | 2 +- sbin/modload/pathnames.h | 2 +- sbin/modunload/Makefile | 2 +- sbin/modunload/modunload.8 | 2 +- sbin/modunload/modunload.c | 2 +- sbin/mount_portal/Makefile | 2 +- sbin/mount_portal/activate.c | 2 +- sbin/mount_portal/conf.c | 2 +- sbin/mount_portal/pathnames.h | 2 +- sbin/mount_portal/portal.conf | 2 +- sbin/mount_portal/portald.h | 2 +- sbin/mount_portal/pt_conf.c | 2 +- sbin/mount_portal/pt_exec.c | 2 +- sbin/mount_portal/pt_file.c | 2 +- sbin/mount_portal/pt_tcp.c | 2 +- sbin/mountd/Makefile | 2 +- sbin/mountd/mountd.8 | 2 +- sbin/mountd/mountd.c | 2 +- sbin/nfsiod/nfsiod.8 | 2 +- sbin/reboot/boot_i386.8 | 2 +- sbin/route/route.c | 2 +- sbin/savecore/savecore.8 | 2 +- sbin/scsi/scsi.8 | 2 +- sbin/scsi/scsi.c | 2 +- sbin/scsiformat/scsiformat.sh | 2 +- sbin/slattach/Makefile | 2 +- sbin/slattach/slattach.8 | 2 +- sbin/startslip/startslip.c | 2 +- secure/Makefile | 35 - secure/Makefile.inc | 15 - secure/lib/Makefile | 6 - secure/lib/Makefile.inc | 6 - secure/lib/libcipher/Makefile | 16 - secure/lib/libcipher/README | 98 - secure/lib/libcipher/README.FreeBSD | 6 - secure/lib/libcipher/cipher.3 | 150 - secure/lib/libcipher/crypt.c | 623 ---- secure/lib/libcipher/test/Makefile | 56 - secure/lib/libcipher/test/README | 10 - secure/lib/libcipher/test/cert.c | 344 --- secure/lib/libcipher/test/cert.input | 179 -- secure/lib/libcipher/test/speedcrypt.c | 76 - secure/lib/libcipher/test/speeddes.c | 61 - secure/lib/libcrypt/Makefile | 45 - secure/lib/libcrypt/README | 98 - secure/lib/libcrypt/README.FreeBSD | 21 - secure/lib/libcrypt/crypt-md5.c | 157 - secure/lib/libcrypt/crypt.3 | 159 -- secure/lib/libcrypt/crypt.c | 697 ----- secure/lib/libcrypt/test/Makefile | 48 - secure/lib/libcrypt/test/README | 10 - secure/lib/libcrypt/test/cert.c | 208 -- secure/lib/libcrypt/test/cert.input | 179 -- secure/lib/libcrypt/test/speedcrypt.c | 76 - secure/lib/libdes/COPYRIGHT | 50 - secure/lib/libdes/DES.pm | 19 - secure/lib/libdes/DES.pod | 16 - secure/lib/libdes/DES.xs | 268 -- secure/lib/libdes/FILES | 96 - secure/lib/libdes/GNUmakefile | 35 - secure/lib/libdes/INSTALL | 57 - secure/lib/libdes/Imakefile | 35 - secure/lib/libdes/KERBEROS | 41 - secure/lib/libdes/MODES.DES | 84 - secure/lib/libdes/Makefile | 43 - secure/lib/libdes/Makefile.PL | 14 - secure/lib/libdes/Makefile.ssl | 89 - secure/lib/libdes/Makefile.uni | 149 - secure/lib/libdes/PC1 | 28 - secure/lib/libdes/PC2 | 57 - secure/lib/libdes/README | 48 - secure/lib/libdes/VERSION | 318 --- secure/lib/libdes/cbc3_enc.c | 88 - secure/lib/libdes/cbc_cksm.c | 92 - secure/lib/libdes/cbc_enc.c | 114 - secure/lib/libdes/cfb64ede.c | 152 - secure/lib/libdes/cfb64enc.c | 116 - secure/lib/libdes/cfb_enc.c | 160 -- secure/lib/libdes/des.c | 949 ------- secure/lib/libdes/des.doc | 480 ---- secure/lib/libdes/des.h | 240 -- secure/lib/libdes/des.man | 186 -- secure/lib/libdes/des.pl | 536 ---- secure/lib/libdes/des_crypt.man | 508 ---- secure/lib/libdes/des_locl.h | 276 -- secure/lib/libdes/des_locl.org | 276 -- secure/lib/libdes/destest.c | 794 ------ secure/lib/libdes/doIP | 46 - secure/lib/libdes/doPC1 | 110 - secure/lib/libdes/doPC2 | 94 - secure/lib/libdes/ecb3_enc.c | 77 - secure/lib/libdes/ecb_enc.c | 203 -- secure/lib/libdes/ede_enc.c | 163 -- secure/lib/libdes/enc_read.c | 189 -- secure/lib/libdes/enc_writ.c | 142 - secure/lib/libdes/fcrypt.c | 666 ----- secure/lib/libdes/makefile.bc | 50 - secure/lib/libdes/ncbc_enc.c | 120 - secure/lib/libdes/new_rkey.c | 227 -- secure/lib/libdes/ofb64ede.c | 126 - secure/lib/libdes/ofb64enc.c | 103 - secure/lib/libdes/ofb_enc.c | 111 - secure/lib/libdes/pcbc_enc.c | 115 - secure/lib/libdes/podd.h | 64 - secure/lib/libdes/qud_cksm.c | 133 - secure/lib/libdes/rand_key.c | 107 - secure/lib/libdes/read_pwd.c | 380 --- secure/lib/libdes/rpc_des.h | 115 - secure/lib/libdes/rpc_enc.c | 96 - secure/lib/libdes/rpw.c | 90 - secure/lib/libdes/set_key.c | 234 -- secure/lib/libdes/shifts.pl | 160 -- secure/lib/libdes/sk.h | 193 -- secure/lib/libdes/speed.c | 310 -- secure/lib/libdes/spr.h | 193 -- secure/lib/libdes/str2key.c | 160 -- secure/lib/libdes/supp.c | 98 - secure/lib/libdes/t/perl | 0 secure/lib/libdes/t/test | 27 - secure/lib/libdes/testdes.pl | 167 -- secure/lib/libdes/times | 173 -- secure/lib/libdes/typemap | 34 - secure/lib/libdes/version.h | 48 - secure/lib/libdes/vms.com | 90 - secure/lib/libtelnet/Makefile | 25 - secure/lib/libtelnet/auth-proto.h | 96 - secure/lib/libtelnet/auth.c | 671 ----- secure/lib/libtelnet/auth.h | 87 - secure/lib/libtelnet/enc-proto.h | 120 - secure/lib/libtelnet/enc_des.c | 724 ----- secure/lib/libtelnet/encrypt.c | 1000 ------- secure/lib/libtelnet/encrypt.h | 108 - secure/lib/libtelnet/genget.c | 105 - secure/lib/libtelnet/getent.c | 68 - secure/lib/libtelnet/kerberos.c | 555 ---- secure/lib/libtelnet/kerberos5.c | 764 ----- secure/lib/libtelnet/key-proto.h | 71 - secure/lib/libtelnet/krb4encpwd.c | 446 --- secure/lib/libtelnet/misc-proto.h | 79 - secure/lib/libtelnet/misc.c | 94 - secure/lib/libtelnet/misc.h | 42 - secure/lib/libtelnet/read_password.c | 145 - secure/lib/libtelnet/rsaencpwd.c | 492 ---- secure/lib/libtelnet/spx.c | 588 ---- secure/libexec/Makefile.inc | 6 - secure/libexec/telnetd/Makefile | 30 - secure/libexec/telnetd/authenc.c | 91 - secure/libexec/telnetd/defs.h | 296 -- secure/libexec/telnetd/ext.h | 242 -- secure/libexec/telnetd/global.c | 48 - secure/libexec/telnetd/pathnames.h | 55 - secure/libexec/telnetd/slc.c | 491 ---- secure/libexec/telnetd/state.c | 1612 ----------- secure/libexec/telnetd/sys_term.c | 2316 --------------- secure/libexec/telnetd/telnetd.8 | 607 ---- secure/libexec/telnetd/telnetd.c | 1597 ----------- secure/libexec/telnetd/telnetd.h | 49 - secure/libexec/telnetd/termstat.c | 669 ----- secure/libexec/telnetd/utility.c | 1203 -------- secure/usr.bin/Makefile | 6 - secure/usr.bin/Makefile.inc | 4 - secure/usr.bin/bdes/Makefile | 16 - secure/usr.bin/bdes/bdes.1 | 304 -- secure/usr.bin/bdes/bdes.c | 1046 ------- secure/usr.bin/bdes/bdes.ps | 2945 ------------------- secure/usr.bin/telnet/Makefile | 58 - secure/usr.bin/telnet/README | 566 ---- secure/usr.bin/telnet/authenc.c | 111 - secure/usr.bin/telnet/commands.c | 2987 -------------------- secure/usr.bin/telnet/defines.h | 61 - secure/usr.bin/telnet/externs.h | 483 ---- secure/usr.bin/telnet/fdset.h | 49 - secure/usr.bin/telnet/general.h | 45 - secure/usr.bin/telnet/main.c | 322 --- secure/usr.bin/telnet/network.c | 177 -- secure/usr.bin/telnet/ring.c | 362 --- secure/usr.bin/telnet/ring.h | 105 - secure/usr.bin/telnet/sys_bsd.c | 1220 -------- secure/usr.bin/telnet/telnet.1 | 1366 --------- secure/usr.bin/telnet/telnet.c | 2651 ----------------- secure/usr.bin/telnet/terminal.c | 240 -- secure/usr.bin/telnet/tn3270.c | 411 --- secure/usr.bin/telnet/types.h | 52 - secure/usr.bin/telnet/utilities.c | 939 ------ secure/usr.sbin/xntpd/lib/authdes.c | 869 ------ share/doc/FAQ/Makefile | 2 +- share/doc/FAQ/freebsd-faq.sgml | 2 +- share/doc/Makefile | 2 +- share/doc/handbook/Makefile | 2 +- share/doc/handbook/authors.sgml | 2 +- share/doc/handbook/basics.sgml | 2 +- share/doc/handbook/bibliography.sgml | 2 +- share/doc/handbook/boothelp.sgml | 2 +- share/doc/handbook/booting.sgml | 2 +- share/doc/handbook/contrib.sgml | 2 +- share/doc/handbook/crypt.sgml | 2 +- share/doc/handbook/ctm.sgml | 2 +- share/doc/handbook/current.sgml | 4 +- share/doc/handbook/cyclades.sgml | 2 +- share/doc/handbook/dialup.sgml | 2 +- share/doc/handbook/diskless.sgml | 2 +- share/doc/handbook/dma.sgml | 2 +- share/doc/handbook/eresources.sgml | 2 +- share/doc/handbook/esdi.sgml | 2 +- share/doc/handbook/firewalls.sgml | 2 +- share/doc/handbook/glossary.sgml | 2 +- share/doc/handbook/goals.sgml | 2 +- share/doc/handbook/handbook.sgml | 2 +- share/doc/handbook/history.sgml | 2 +- share/doc/handbook/hw.sgml | 2 +- share/doc/handbook/install.sgml | 2 +- share/doc/handbook/isdn.sgml | 2 +- share/doc/handbook/kerberos.sgml | 2 +- share/doc/handbook/kernelconfig.sgml | 2 +- share/doc/handbook/kerneldebug.sgml | 2 +- share/doc/handbook/linuxemu.sgml | 2 +- share/doc/handbook/lists.sgml | 2 +- share/doc/handbook/memoryuse.sgml | 2 +- share/doc/handbook/mirrors.sgml | 2 +- share/doc/handbook/nfs.sgml | 2 +- share/doc/handbook/nutshell.sgml | 2 +- share/doc/handbook/pgpkeys.sgml | 2 +- share/doc/handbook/policies.sgml | 2 +- share/doc/handbook/porting.sgml | 6 +- share/doc/handbook/ports.sgml | 2 +- share/doc/handbook/ppp.sgml | 2 +- share/doc/handbook/printing.sgml | 2 +- share/doc/handbook/quotas.sgml | 2 +- share/doc/handbook/relnotes.sgml | 2 +- share/doc/handbook/routing.sgml | 2 +- share/doc/handbook/scsi.sgml | 2 +- share/doc/handbook/sections.sgml | 2 +- share/doc/handbook/sio.sgml | 2 +- share/doc/handbook/skey.sgml | 2 +- share/doc/handbook/slipc.sgml | 2 +- share/doc/handbook/stable.sgml | 4 +- share/doc/handbook/submitters.sgml | 4 +- share/doc/handbook/sup.sgml | 2 +- share/doc/handbook/synching.sgml | 4 +- share/doc/handbook/troubleshooting.sgml | 2 +- share/doc/handbook/uart.sgml | 2 +- share/doc/handbook/userppp.sgml | 2 +- share/doc/iso/ucb/program.nr | 4 +- share/doc/iso/wisc/appendix_a.nr | 2 +- share/doc/iso/wisc/appendix_b.nr | 2 +- share/doc/iso/wisc/debug.nr | 4 +- share/doc/iso/wisc/errors.nr | 4 +- share/doc/iso/wisc/figs/Makefile | 2 +- share/doc/iso/wisc/parts.nr | 4 +- share/doc/iso/wisc/program.nr | 4 +- share/doc/iso/wiscman/cons.4 | 4 +- share/doc/iso/wiscman/if.4n | 4 +- share/doc/iso/wiscman/rvd.4p | 4 +- share/doc/papers/Makefile | 2 +- share/doc/papers/beyond4.3/Makefile | 2 +- share/doc/papers/contents/Makefile | 2 +- share/doc/papers/contents/contents.ms | 2 +- share/doc/papers/diskperf/Makefile | 2 +- share/doc/papers/fsinterface/Makefile | 2 +- share/doc/papers/kernmalloc/Makefile | 2 +- share/doc/papers/kerntune/Makefile | 2 +- share/doc/papers/memfs/Makefile | 2 +- share/doc/papers/newvm/Makefile | 2 +- share/doc/papers/nqnfs/Makefile | 2 +- share/doc/papers/px/Makefile | 2 +- share/doc/papers/relengr/Makefile | 2 +- share/doc/papers/sysperf/Makefile | 2 +- share/doc/psd/05.sysman/Makefile | 2 +- share/doc/psd/12.make/Makefile | 2 +- share/doc/psd/18.gprof/Makefile | 2 +- share/doc/psd/19.curses/Makefile | 2 +- share/doc/psd/20.ipctut/Makefile | 2 +- share/doc/psd/21.ipc/Makefile | 2 +- share/doc/psd/22.rpcgen/Makefile | 2 +- share/doc/psd/23.rpc/Makefile | 2 +- share/doc/psd/24.xdr/Makefile | 2 +- share/doc/psd/25.xdrrfc/Makefile | 2 +- share/doc/psd/26.rpcrfc/Makefile | 2 +- share/doc/psd/27.nfsrpc/Makefile | 2 +- share/doc/psd/Makefile | 2 +- share/doc/psd/contents/Makefile | 2 +- share/doc/psd/title/Makefile | 2 +- share/doc/smm/01.setup/Makefile | 2 +- share/doc/smm/02.config/Makefile | 2 +- share/doc/smm/03.fsck/Makefile | 2 +- share/doc/smm/04.quotas/Makefile | 2 +- share/doc/smm/05.fastfs/Makefile | 2 +- share/doc/smm/06.nfs/Makefile | 2 +- share/doc/smm/07.lpd/Makefile | 2 +- share/doc/smm/08.sendmailop/Makefile | 2 +- share/doc/smm/09.sendmail/Makefile | 2 +- share/doc/smm/11.timedop/Makefile | 2 +- share/doc/smm/12.timed/Makefile | 2 +- share/doc/smm/18.net/Makefile | 2 +- share/doc/smm/Makefile | 2 +- share/doc/smm/contents/Makefile | 2 +- share/doc/smm/title/Makefile | 2 +- share/doc/usd/04.csh/Makefile | 2 +- share/doc/usd/07.mail/Makefile | 2 +- share/doc/usd/10.exref/Makefile | 2 +- share/doc/usd/11.vitut/Makefile | 2 +- share/doc/usd/12.vi/Makefile | 2 +- share/doc/usd/13.viref/Makefile | 2 +- share/doc/usd/18.msdiffs/Makefile | 2 +- share/doc/usd/19.memacros/Makefile | 2 +- share/doc/usd/20.meref/Makefile | 2 +- share/doc/usd/30.rogue/Makefile | 2 +- share/doc/usd/31.trek/Makefile | 2 +- share/doc/usd/Makefile | 2 +- share/doc/usd/contents/Makefile | 2 +- share/doc/usd/title/Makefile | 2 +- share/examples/FreeBSD_version/Makefile | 2 +- share/examples/Makefile | 2 +- share/examples/etc/README.examples | 2 +- share/examples/find_interface/Makefile | 2 +- share/examples/find_interface/find_interface.c | 2 +- share/examples/lkm/misc/module/Makefile | 2 +- share/examples/lkm/misc/test/Makefile | 2 +- share/man/man0/Makefile | 2 +- share/man/man3/sysexits.3 | 2 +- share/man/man4/inet.4 | 2 +- share/man/man4/intro.4 | 2 +- share/man/man4/lkm.4 | 2 +- share/man/man4/man4.i386/Makefile | 2 +- share/man/man4/man4.i386/cy.4 | 2 +- share/man/man4/man4.i386/dgb.4 | 2 +- share/man/man4/man4.i386/ed.4 | 2 +- share/man/man4/man4.i386/ep.4 | 2 +- share/man/man4/man4.i386/fe.4 | 2 +- share/man/man4/man4.i386/io.4 | 2 +- share/man/man4/man4.i386/npx.4 | 2 +- share/man/man4/man4.i386/si.4 | 2 +- share/man/man4/man4.i386/sio.4 | 2 +- share/man/man4/snp.4 | 4 +- share/man/man4/tcp.4 | 2 +- share/man/man4/ttcp.4 | 2 +- share/man/man4/worm.4 | 2 +- share/man/man4/yp.4 | 2 +- share/man/man5/a.out.5 | 2 +- share/man/man5/ethers.5 | 2 +- share/man/man5/group.5 | 2 +- share/man/man5/link.5 | 2 +- share/man/man5/procfs.5 | 2 +- share/man/man7/clocks.7 | 2 +- share/mk/Makefile | 2 +- share/mk/bsd.dep.mk | 2 +- share/mk/bsd.doc.mk | 2 +- share/mk/bsd.info.mk | 2 +- share/mk/bsd.kern.mk | 2 +- share/mk/bsd.kmod.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.man.mk | 2 +- share/mk/bsd.obj.mk | 2 +- share/mk/bsd.own.mk | 2 +- share/mk/bsd.port.mk | 2 +- share/mk/bsd.port.subdir.mk | 2 +- share/mk/bsd.prog.mk | 2 +- share/mk/bsd.sgml.mk | 2 +- share/mk/bsd.subdir.mk | 2 +- share/mk/sys.mk | 2 +- share/sgml/FreeBSD/Makefile | 2 +- share/sgml/FreeBSD/Makefile.inc | 2 +- share/sgml/FreeBSD/dtd/Makefile | 2 +- share/sgml/FreeBSD/lib/Makefile | 2 +- share/sgml/FreeBSD/rep/Makefile | 2 +- share/sgml/Makefile | 2 +- share/sgml/Makefile.inc | 2 +- share/skel/dot.profile | 2 +- share/syscons/Makefile | 2 +- share/syscons/fonts/INDEX.fonts | 2 +- share/syscons/fonts/Makefile | 2 +- share/syscons/keymaps/INDEX.keymaps | 2 +- share/syscons/keymaps/Makefile | 2 +- share/zoneinfo/Makefile | 2 +- sys/Makefile | 2 +- sys/conf/newvers.sh | 4 +- sys/conf/nfsswapkernel.c | 2 +- sys/conf/param.c | 2 +- sys/conf/systags.sh | 2 +- sys/ddb/db_access.c | 2 +- sys/ddb/db_access.h | 2 +- sys/ddb/db_aout.c | 2 +- sys/ddb/db_break.c | 2 +- sys/ddb/db_break.h | 2 +- sys/ddb/db_command.c | 2 +- sys/ddb/db_command.h | 2 +- sys/ddb/db_examine.c | 2 +- sys/ddb/db_expr.c | 2 +- sys/ddb/db_input.c | 2 +- sys/ddb/db_lex.c | 2 +- sys/ddb/db_lex.h | 2 +- sys/ddb/db_output.c | 2 +- sys/ddb/db_output.h | 2 +- sys/ddb/db_print.c | 2 +- sys/ddb/db_ps.c | 2 +- sys/ddb/db_run.c | 2 +- sys/ddb/db_sym.c | 2 +- sys/ddb/db_sym.h | 2 +- sys/ddb/db_trap.c | 2 +- sys/ddb/db_variables.c | 2 +- sys/ddb/db_variables.h | 2 +- sys/ddb/db_watch.c | 2 +- sys/ddb/db_watch.h | 2 +- sys/ddb/db_write_cmd.c | 2 +- sys/ddb/ddb.h | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- sys/dev/aic7xxx/aic7xxx_asm.c | 2 +- sys/dev/aic7xxx/aic7xxx_reg.h | 2 +- sys/dev/ccd/ccd.c | 2 +- sys/gnu/i386/fpemul/control_w.h | 2 +- sys/gnu/i386/fpemul/div_small.s | 2 +- sys/gnu/i386/fpemul/errors.c | 2 +- sys/gnu/i386/fpemul/exception.h | 2 +- sys/gnu/i386/fpemul/fpu_arith.c | 2 +- sys/gnu/i386/fpemul/fpu_asm.h | 2 +- sys/gnu/i386/fpemul/fpu_aux.c | 2 +- sys/gnu/i386/fpemul/fpu_emu.h | 2 +- sys/gnu/i386/fpemul/fpu_entry.c | 2 +- sys/gnu/i386/fpemul/fpu_etc.c | 2 +- sys/gnu/i386/fpemul/fpu_proto.h | 2 +- sys/gnu/i386/fpemul/fpu_system.h | 2 +- sys/gnu/i386/fpemul/fpu_trig.c | 2 +- sys/gnu/i386/fpemul/get_address.c | 2 +- sys/gnu/i386/fpemul/load_store.c | 2 +- sys/gnu/i386/fpemul/math_emu.h | 2 +- sys/gnu/i386/fpemul/poly_2xm1.c | 2 +- sys/gnu/i386/fpemul/poly_atan.c | 2 +- sys/gnu/i386/fpemul/poly_div.s | 2 +- sys/gnu/i386/fpemul/poly_l2.c | 2 +- sys/gnu/i386/fpemul/poly_mul64.s | 2 +- sys/gnu/i386/fpemul/poly_sin.c | 2 +- sys/gnu/i386/fpemul/poly_tan.c | 2 +- sys/gnu/i386/fpemul/polynomial.s | 2 +- sys/gnu/i386/fpemul/reg_add_sub.c | 2 +- sys/gnu/i386/fpemul/reg_compare.c | 2 +- sys/gnu/i386/fpemul/reg_constant.h | 2 +- sys/gnu/i386/fpemul/reg_div.s | 2 +- sys/gnu/i386/fpemul/reg_ld_str.c | 2 +- sys/gnu/i386/fpemul/reg_mul.c | 2 +- sys/gnu/i386/fpemul/reg_norm.s | 2 +- sys/gnu/i386/fpemul/reg_round.s | 2 +- sys/gnu/i386/fpemul/reg_u_add.s | 2 +- sys/gnu/i386/fpemul/reg_u_div.s | 2 +- sys/gnu/i386/fpemul/reg_u_mul.s | 2 +- sys/gnu/i386/fpemul/reg_u_sub.s | 2 +- sys/gnu/i386/fpemul/status_w.h | 2 +- sys/gnu/i386/fpemul/version.h | 2 +- sys/gnu/i386/fpemul/wm_shrx.s | 2 +- sys/gnu/i386/fpemul/wm_sqrt.s | 2 +- sys/gnu/i386/isa/dgb.c | 2 +- sys/gnu/i386/isa/dgreg.h | 2 +- sys/gnu/i386/isa/nic3008.c | 11 +- sys/gnu/i386/isa/nic3008.h | 11 +- sys/gnu/i386/isa/nic3009.c | 11 +- sys/gnu/i386/isa/nic3009.h | 11 +- sys/gnu/i386/isa/niccyreg.h | 11 +- sys/gnu/isdn/if_ii.c | 7 +- sys/gnu/isdn/iispy.c | 11 +- sys/gnu/isdn/iitel.c | 11 +- sys/gnu/isdn/iitty.c | 11 +- sys/gnu/isdn/isdn.c | 11 +- sys/gnu/isdn/isdn_ioctl.h | 9 +- sys/i386/Makefile | 2 +- sys/i386/apm/apm.c | 2 +- sys/i386/apm/apm_init/Makefile | 2 +- sys/i386/apm/apm_init/apm_init.S | 2 +- sys/i386/apm/apm_init/bin2asm.c | 2 +- sys/i386/apm/apm_init/real_prot.S | 2 +- sys/i386/apm/apm_init/real_prot.h | 2 +- sys/i386/apm/apm_init/rmaouthdr | 2 +- sys/i386/apm/apm_init/table.c | 2 +- sys/i386/apm/apm_setup.h | 2 +- sys/i386/apm/apm_setup.s | 2 +- sys/i386/boot/Makefile | 2 +- sys/i386/boot/biosboot/Makefile | 2 +- sys/i386/boot/biosboot/README.386BSD | 2 +- sys/i386/boot/biosboot/README.MACH | 2 +- sys/i386/boot/biosboot/README.serial | 2 +- sys/i386/boot/biosboot/asm.S | 2 +- sys/i386/boot/biosboot/asm.h | 2 +- sys/i386/boot/biosboot/bios.S | 2 +- sys/i386/boot/biosboot/boot.c | 2 +- sys/i386/boot/biosboot/boot.h | 2 +- sys/i386/boot/biosboot/boot2.S | 2 +- sys/i386/boot/biosboot/disk.c | 2 +- sys/i386/boot/biosboot/io.c | 2 +- sys/i386/boot/biosboot/probe_keyboard.c | 2 +- sys/i386/boot/biosboot/serial.S | 2 +- sys/i386/boot/biosboot/start.S | 2 +- sys/i386/boot/biosboot/sys.c | 2 +- sys/i386/boot/biosboot/table.c | 2 +- sys/i386/boot/dosboot/Makefile | 2 +- sys/i386/boot/dosboot/ansi.h | 2 +- sys/i386/boot/dosboot/boot.c | 2 +- sys/i386/boot/dosboot/boot.h | 2 +- sys/i386/boot/dosboot/bootinfo.h | 2 +- sys/i386/boot/dosboot/cdefs.h | 2 +- sys/i386/boot/dosboot/dinode.h | 2 +- sys/i386/boot/dosboot/dir.h | 2 +- sys/i386/boot/dosboot/disk.c | 2 +- sys/i386/boot/dosboot/disklabe.h | 2 +- sys/i386/boot/dosboot/dkbad.h | 2 +- sys/i386/boot/dosboot/endian.h | 2 +- sys/i386/boot/dosboot/exec.h | 2 +- sys/i386/boot/dosboot/fs.h | 2 +- sys/i386/boot/dosboot/imgact.h | 2 +- sys/i386/boot/dosboot/inode.h | 2 +- sys/i386/boot/dosboot/mexec.h | 2 +- sys/i386/boot/dosboot/param.h | 2 +- sys/i386/boot/dosboot/quota.h | 2 +- sys/i386/boot/dosboot/reboot.h | 2 +- sys/i386/boot/dosboot/sys.c | 2 +- sys/i386/boot/dosboot/syslimit.h | 2 +- sys/i386/boot/dosboot/sysparam.h | 2 +- sys/i386/boot/dosboot/types.h | 2 +- sys/i386/boot/kzipboot/Makefile | 2 +- sys/i386/boot/netboot/3c509.c | 2 +- sys/i386/boot/rawboot/Makefile | 2 +- sys/i386/conf/GENERIC | 2 +- sys/i386/conf/LINT | 2 +- sys/i386/conf/Makefile.i386 | 2 +- sys/i386/conf/devices.i386 | 2 +- sys/i386/conf/files.i386 | 2 +- sys/i386/conf/majors.i386 | 2 +- sys/i386/eisa/3c5x9.c | 2 +- sys/i386/eisa/aha1742.c | 2 +- sys/i386/eisa/aic7770.c | 2 +- sys/i386/eisa/bt74x.c | 2 +- sys/i386/eisa/eisaconf.c | 2 +- sys/i386/eisa/eisaconf.h | 2 +- sys/i386/i386/autoconf.c | 2 +- sys/i386/i386/conf.c | 2 +- sys/i386/i386/cons.c | 2 +- sys/i386/i386/cons.h | 2 +- sys/i386/i386/db_disasm.c | 2 +- sys/i386/i386/db_interface.c | 2 +- sys/i386/i386/db_trace.c | 2 +- sys/i386/i386/dkbad.c | 2 +- sys/i386/i386/exception.s | 2 +- sys/i386/i386/genassym.c | 2 +- sys/i386/i386/in_cksum.c | 2 +- sys/i386/i386/locore.s | 2 +- sys/i386/i386/machdep.c | 2 +- sys/i386/i386/math_emu.h | 2 +- sys/i386/i386/math_emulate.c | 2 +- sys/i386/i386/mem.c | 2 +- sys/i386/i386/microtime.s | 2 +- sys/i386/i386/ns_cksum.c | 2 +- sys/i386/i386/pmap.c | 2 +- sys/i386/i386/procfs_machdep.c | 2 +- sys/i386/i386/support.s | 2 +- sys/i386/i386/swapgeneric.c | 2 +- sys/i386/i386/swtch.s | 2 +- sys/i386/i386/symbols.raw | 2 +- sys/i386/i386/sys_machdep.c | 2 +- sys/i386/i386/trap.c | 2 +- sys/i386/i386/userconfig.c | 4 +- sys/i386/i386/vm_machdep.c | 2 +- sys/i386/ibcs2/coff.h | 2 +- sys/i386/ibcs2/ibcs2.h | 2 +- sys/i386/ibcs2/ibcs2_dummy.c | 2 +- sys/i386/ibcs2/ibcs2_file.c | 2 +- sys/i386/ibcs2/ibcs2_ioctl.c | 2 +- sys/i386/ibcs2/ibcs2_ipc.c | 2 +- sys/i386/ibcs2/ibcs2_isc.c | 2 +- sys/i386/ibcs2/ibcs2_misc.c | 2 +- sys/i386/ibcs2/ibcs2_signal.c | 2 +- sys/i386/ibcs2/ibcs2_socksys.c | 2 +- sys/i386/ibcs2/ibcs2_socksys.h | 2 +- sys/i386/ibcs2/ibcs2_stats.c | 2 +- sys/i386/ibcs2/ibcs2_sysent.c | 2 +- sys/i386/ibcs2/ibcs2_sysi86.c | 2 +- sys/i386/ibcs2/ibcs2_xenix.c | 2 +- sys/i386/ibcs2/imgact_coff.c | 2 +- sys/i386/include/ansi.h | 2 +- sys/i386/include/apm_bios.h | 2 +- sys/i386/include/apm_segments.h | 2 +- sys/i386/include/asmacros.h | 2 +- sys/i386/include/bootinfo.h | 2 +- sys/i386/include/cdk.h | 2 +- sys/i386/include/comstats.h | 2 +- sys/i386/include/cons.h | 2 +- sys/i386/include/console.h | 2 +- sys/i386/include/cpu.h | 2 +- sys/i386/include/cpufunc.h | 2 +- sys/i386/include/cputypes.h | 2 +- sys/i386/include/db_machdep.h | 2 +- sys/i386/include/devconf.h | 2 +- sys/i386/include/endian.h | 2 +- sys/i386/include/exec.h | 2 +- sys/i386/include/float.h | 2 +- sys/i386/include/floatingpoint.h | 2 +- sys/i386/include/frame.h | 2 +- sys/i386/include/ieeefp.h | 2 +- sys/i386/include/ioctl_ctx.h | 2 +- sys/i386/include/ioctl_fd.h | 2 +- sys/i386/include/ipl.h | 2 +- sys/i386/include/limits.h | 2 +- sys/i386/include/lpt.h | 2 +- sys/i386/include/md_var.h | 2 +- sys/i386/include/mouse.h | 2 +- sys/i386/include/mtpr.h | 2 +- sys/i386/include/npx.h | 2 +- sys/i386/include/param.h | 2 +- sys/i386/include/pc/display.h | 2 +- sys/i386/include/pc/msdos.h | 2 +- sys/i386/include/pcaudioio.h | 2 +- sys/i386/include/pcb.h | 2 +- sys/i386/include/pmap.h | 2 +- sys/i386/include/proc.h | 2 +- sys/i386/include/profile.h | 2 +- sys/i386/include/psl.h | 2 +- sys/i386/include/pte.h | 2 +- sys/i386/include/ptrace.h | 2 +- sys/i386/include/random.h | 2 +- sys/i386/include/reg.h | 2 +- sys/i386/include/reloc.h | 2 +- sys/i386/include/segments.h | 2 +- sys/i386/include/si.h | 2 +- sys/i386/include/signal.h | 2 +- sys/i386/include/speaker.h | 2 +- sys/i386/include/specialreg.h | 2 +- sys/i386/include/spl.h | 2 +- sys/i386/include/stdarg.h | 2 +- sys/i386/include/sysarch.h | 2 +- sys/i386/include/trap.h | 2 +- sys/i386/include/tss.h | 2 +- sys/i386/include/types.h | 2 +- sys/i386/include/ultrasound.h | 2 +- sys/i386/include/varargs.h | 2 +- sys/i386/include/vmparam.h | 2 +- sys/i386/isa/README.le | 2 +- sys/i386/isa/aha1542.c | 2 +- sys/i386/isa/aic6360.c | 2 +- sys/i386/isa/asc.c | 2 +- sys/i386/isa/ascreg.h | 2 +- sys/i386/isa/bt5xx-445.c | 2 +- sys/i386/isa/clock.c | 2 +- sys/i386/isa/ctx.c | 2 +- sys/i386/isa/ctxreg.h | 2 +- sys/i386/isa/cy.c | 2 +- sys/i386/isa/cyreg.h | 2 +- sys/i386/isa/diskslice_machdep.c | 2 +- sys/i386/isa/elink.c | 2 +- sys/i386/isa/elink.h | 2 +- sys/i386/isa/fd.c | 2 +- sys/i386/isa/fdc.h | 2 +- sys/i386/isa/fdreg.h | 2 +- sys/i386/isa/ft.c | 2 +- sys/i386/isa/ic/cd1400.h | 2 +- sys/i386/isa/ic/i8042.h | 2 +- sys/i386/isa/ic/i8237.h | 2 +- sys/i386/isa/ic/i82586.h | 2 +- sys/i386/isa/ic/lemac.h | 2 +- sys/i386/isa/ic/nec765.h | 2 +- sys/i386/isa/ic/ns16450.h | 2 +- sys/i386/isa/ic/ns16550.h | 2 +- sys/i386/isa/ic/scd1400.h | 2 +- sys/i386/isa/icu.h | 2 +- sys/i386/isa/icu.s | 2 +- sys/i386/isa/if_ed.c | 2 +- sys/i386/isa/if_edreg.h | 2 +- sys/i386/isa/if_eg.c | 2 +- sys/i386/isa/if_egreg.h | 2 +- sys/i386/isa/if_el.c | 2 +- sys/i386/isa/if_elreg.h | 2 +- sys/i386/isa/if_ep.c | 2 +- sys/i386/isa/if_epreg.h | 2 +- sys/i386/isa/if_ie.c | 2 +- sys/i386/isa/if_ie507.h | 2 +- sys/i386/isa/if_iereg.h | 2 +- sys/i386/isa/if_ix.c | 2 +- sys/i386/isa/if_ixreg.h | 2 +- sys/i386/isa/if_le.c | 2 +- sys/i386/isa/if_ze.c | 2 +- sys/i386/isa/if_zp.c | 2 +- sys/i386/isa/if_zpreg.h | 2 +- sys/i386/isa/isa.c | 2 +- sys/i386/isa/isa.h | 2 +- sys/i386/isa/isa_device.h | 2 +- sys/i386/isa/iso8859.font | 2 +- sys/i386/isa/istallion.c | 2 +- sys/i386/isa/kbd.h | 2 +- sys/i386/isa/kbdtables.h | 2 +- sys/i386/isa/lpt.c | 2 +- sys/i386/isa/lptreg.h | 2 +- sys/i386/isa/mcd.c | 2 +- sys/i386/isa/mcdreg.h | 2 +- sys/i386/isa/mse.c | 2 +- sys/i386/isa/npx.c | 2 +- sys/i386/isa/pcaudio.c | 2 +- sys/i386/isa/pcibus.c | 2 +- sys/i386/isa/random_machdep.c | 2 +- sys/i386/isa/readMBR.c | 2 +- sys/i386/isa/rtc.h | 2 +- sys/i386/isa/scd.c | 2 +- sys/i386/isa/scdreg.h | 2 +- sys/i386/isa/seagate.c | 2 +- sys/i386/isa/si.c | 2 +- sys/i386/isa/si_code.c | 2 +- sys/i386/isa/sio.c | 2 +- sys/i386/isa/sioreg.h | 2 +- sys/i386/isa/sireg.h | 2 +- sys/i386/isa/sound/sound.doc | 2 +- sys/i386/isa/sound/soundcard.c | 2 +- sys/i386/isa/spkr.c | 2 +- sys/i386/isa/stallion.c | 2 +- sys/i386/isa/syscons.c | 2 +- sys/i386/isa/syscons.h | 2 +- sys/i386/isa/timerreg.h | 2 +- sys/i386/isa/ultra14f.c | 2 +- sys/i386/isa/vector.s | 2 +- sys/i386/isa/wd.c | 2 +- sys/i386/isa/wdreg.h | 2 +- sys/i386/isa/wt.c | 2 +- sys/i386/isa/wtreg.h | 2 +- sys/i386/linux/imgact_linux.c | 2 +- sys/i386/linux/linux.h | 2 +- sys/i386/linux/linux_dummy.c | 2 +- sys/i386/linux/linux_file.c | 2 +- sys/i386/linux/linux_generic.c | 2 +- sys/i386/linux/linux_ioctl.c | 2 +- sys/i386/linux/linux_ipc.c | 2 +- sys/i386/linux/linux_misc.c | 2 +- sys/i386/linux/linux_signal.c | 2 +- sys/i386/linux/linux_socket.c | 2 +- sys/i386/linux/linux_stats.c | 2 +- sys/i386/linux/linux_sysent.c | 2 +- sys/i386/scsi/93cx6.c | 2 +- sys/i386/scsi/93cx6.h | 2 +- sys/i386/scsi/aic7xxx.c | 2 +- sys/i386/scsi/aic7xxx.h | 2 +- sys/i386/scsi/bt.c | 2 +- sys/i386/scsi/btreg.h | 2 +- sys/isofs/cd9660/TODO | 2 +- sys/isofs/cd9660/cd9660_bmap.c | 2 +- sys/isofs/cd9660/cd9660_lookup.c | 2 +- sys/isofs/cd9660/cd9660_node.c | 2 +- sys/isofs/cd9660/cd9660_node.h | 2 +- sys/isofs/cd9660/cd9660_rrip.c | 2 +- sys/isofs/cd9660/cd9660_rrip.h | 2 +- sys/isofs/cd9660/cd9660_util.c | 2 +- sys/isofs/cd9660/cd9660_vfsops.c | 2 +- sys/isofs/cd9660/cd9660_vnops.c | 2 +- sys/isofs/cd9660/iso.h | 2 +- sys/isofs/cd9660/iso_rrip.h | 2 +- sys/kern/Make.tags.inc | 2 +- sys/kern/imgact_aout.c | 2 +- sys/kern/imgact_gzip.c | 2 +- sys/kern/imgact_shell.c | 2 +- sys/kern/inflate.c | 2 +- sys/kern/init_main.c | 2 +- sys/kern/init_sysent.c | 2 +- sys/kern/kern_acct.c | 2 +- sys/kern/kern_clock.c | 2 +- sys/kern/kern_descrip.c | 2 +- sys/kern/kern_devconf.c | 2 +- sys/kern/kern_exec.c | 4 +- sys/kern/kern_exit.c | 2 +- sys/kern/kern_fork.c | 2 +- sys/kern/kern_ktrace.c | 2 +- sys/kern/kern_lkm.c | 2 +- sys/kern/kern_lockf.c | 2 +- sys/kern/kern_malloc.c | 2 +- sys/kern/kern_physio.c | 2 +- sys/kern/kern_proc.c | 2 +- sys/kern/kern_prot.c | 2 +- sys/kern/kern_resource.c | 2 +- sys/kern/kern_sig.c | 2 +- sys/kern/kern_subr.c | 2 +- sys/kern/kern_synch.c | 2 +- sys/kern/kern_sysctl.c | 2 +- sys/kern/kern_time.c | 2 +- sys/kern/kern_xxx.c | 2 +- sys/kern/makesyscalls.sh | 2 +- sys/kern/subr_autoconf.c | 2 +- sys/kern/subr_diskslice.c | 2 +- sys/kern/subr_log.c | 2 +- sys/kern/subr_prf.c | 2 +- sys/kern/subr_prof.c | 2 +- sys/kern/subr_rlist.c | 2 +- sys/kern/subr_xxx.c | 2 +- sys/kern/sys_generic.c | 2 +- sys/kern/sys_process.c | 2 +- sys/kern/sys_socket.c | 2 +- sys/kern/syscalls.c | 2 +- sys/kern/syscalls.master | 2 +- sys/kern/sysv_ipc.c | 2 +- sys/kern/sysv_msg.c | 2 +- sys/kern/sysv_sem.c | 2 +- sys/kern/sysv_shm.c | 2 +- sys/kern/tty.c | 2 +- sys/kern/tty_compat.c | 2 +- sys/kern/tty_conf.c | 2 +- sys/kern/tty_pty.c | 2 +- sys/kern/tty_subr.c | 2 +- sys/kern/tty_tb.c | 2 +- sys/kern/tty_tty.c | 2 +- sys/kern/uipc_domain.c | 2 +- sys/kern/uipc_mbuf.c | 2 +- sys/kern/uipc_proto.c | 2 +- sys/kern/uipc_socket.c | 2 +- sys/kern/uipc_socket2.c | 2 +- sys/kern/uipc_syscalls.c | 2 +- sys/kern/uipc_usrreq.c | 2 +- sys/kern/vfs_bio.c | 2 +- sys/kern/vfs_cache.c | 2 +- sys/kern/vfs_cluster.c | 2 +- sys/kern/vfs_conf.c | 2 +- sys/kern/vfs_init.c | 2 +- sys/kern/vfs_lookup.c | 2 +- sys/kern/vfs_subr.c | 2 +- sys/kern/vfs_syscalls.c | 2 +- sys/kern/vfs_vnops.c | 2 +- sys/kern/vnode_if.sh | 2 +- sys/kern/vnode_if.src | 2 +- sys/libkern/Makefile | 2 +- sys/libkern/adddi3.c | 2 +- sys/libkern/anddi3.c | 2 +- sys/libkern/ashldi3.c | 2 +- sys/libkern/ashrdi3.c | 2 +- sys/libkern/bcmp.c | 2 +- sys/libkern/cmpdi2.c | 2 +- sys/libkern/divdi3.c | 2 +- sys/libkern/ffs.c | 2 +- sys/libkern/iordi3.c | 2 +- sys/libkern/locc.c | 2 +- sys/libkern/lshldi3.c | 2 +- sys/libkern/lshrdi3.c | 2 +- sys/libkern/mcount.c | 2 +- sys/libkern/moddi3.c | 2 +- sys/libkern/muldi3.c | 2 +- sys/libkern/negdi2.c | 2 +- sys/libkern/notdi2.c | 2 +- sys/libkern/qdivrem.c | 2 +- sys/libkern/quad.h | 2 +- sys/libkern/random.c | 2 +- sys/libkern/rindex.c | 2 +- sys/libkern/scanc.c | 2 +- sys/libkern/skpc.c | 2 +- sys/libkern/strcat.c | 2 +- sys/libkern/strcmp.c | 2 +- sys/libkern/strcpy.c | 2 +- sys/libkern/strlen.c | 2 +- sys/libkern/strncpy.c | 2 +- sys/libkern/subdi3.c | 2 +- sys/libkern/ucmpdi2.c | 2 +- sys/libkern/udivdi3.c | 2 +- sys/libkern/umoddi3.c | 2 +- sys/libkern/xordi3.c | 2 +- sys/miscfs/deadfs/dead_vnops.c | 2 +- sys/miscfs/fdesc/fdesc.h | 2 +- sys/miscfs/fdesc/fdesc_vfsops.c | 2 +- sys/miscfs/fdesc/fdesc_vnops.c | 2 +- sys/miscfs/fifofs/fifo.h | 2 +- sys/miscfs/fifofs/fifo_vnops.c | 2 +- sys/miscfs/kernfs/kernfs.h | 2 +- sys/miscfs/kernfs/kernfs_vfsops.c | 2 +- sys/miscfs/kernfs/kernfs_vnops.c | 2 +- sys/miscfs/nullfs/null.h | 2 +- sys/miscfs/nullfs/null_subr.c | 2 +- sys/miscfs/nullfs/null_vfsops.c | 2 +- sys/miscfs/nullfs/null_vnops.c | 2 +- sys/miscfs/portal/portal.h | 2 +- sys/miscfs/portal/portal_vfsops.c | 2 +- sys/miscfs/portal/portal_vnops.c | 2 +- sys/miscfs/procfs/README | 2 +- sys/miscfs/procfs/procfs.h | 2 +- sys/miscfs/procfs/procfs_ctl.c | 2 +- sys/miscfs/procfs/procfs_fpregs.c | 2 +- sys/miscfs/procfs/procfs_mem.c | 2 +- sys/miscfs/procfs/procfs_note.c | 2 +- sys/miscfs/procfs/procfs_regs.c | 2 +- sys/miscfs/procfs/procfs_status.c | 2 +- sys/miscfs/procfs/procfs_subr.c | 2 +- sys/miscfs/procfs/procfs_vfsops.c | 2 +- sys/miscfs/procfs/procfs_vnops.c | 2 +- sys/miscfs/specfs/spec_vnops.c | 2 +- sys/miscfs/specfs/specdev.h | 2 +- sys/miscfs/umapfs/umap.h | 2 +- sys/miscfs/umapfs/umap_subr.c | 2 +- sys/miscfs/umapfs/umap_vfsops.c | 2 +- sys/miscfs/umapfs/umap_vnops.c | 2 +- sys/miscfs/union/libc.opendir.c | 2 +- sys/miscfs/union/union.h | 2 +- sys/miscfs/union/union_subr.c | 2 +- sys/miscfs/union/union_vfsops.c | 2 +- sys/miscfs/union/union_vnops.c | 2 +- sys/msdosfs/bootsect.h | 2 +- sys/msdosfs/bpb.h | 2 +- sys/msdosfs/denode.h | 2 +- sys/msdosfs/direntry.h | 2 +- sys/msdosfs/fat.h | 2 +- sys/msdosfs/msdosfs_conv.c | 2 +- sys/msdosfs/msdosfs_denode.c | 2 +- sys/msdosfs/msdosfs_fat.c | 2 +- sys/msdosfs/msdosfs_lookup.c | 2 +- sys/msdosfs/msdosfs_vfsops.c | 2 +- sys/msdosfs/msdosfs_vnops.c | 2 +- sys/msdosfs/msdosfsmount.h | 2 +- sys/net/bpf.c | 2 +- sys/net/bpf.h | 2 +- sys/net/bpf_compat.h | 2 +- sys/net/bpf_filter.c | 2 +- sys/net/bpfdesc.h | 2 +- sys/net/if.c | 2 +- sys/net/if.h | 2 +- sys/net/if_arp.h | 2 +- sys/net/if_disc.c | 2 +- sys/net/if_dl.h | 2 +- sys/net/if_ethersubr.c | 2 +- sys/net/if_fddisubr.c | 2 +- sys/net/if_llc.h | 2 +- sys/net/if_loop.c | 2 +- sys/net/if_ppp.c | 2 +- sys/net/if_ppp.h | 2 +- sys/net/if_sl.c | 2 +- sys/net/if_slvar.h | 2 +- sys/net/if_types.h | 2 +- sys/net/netisr.h | 2 +- sys/net/pppcompress.c | 2 +- sys/net/pppcompress.h | 2 +- sys/net/radix.c | 2 +- sys/net/radix.h | 2 +- sys/net/raw_cb.c | 2 +- sys/net/raw_cb.h | 2 +- sys/net/raw_usrreq.c | 2 +- sys/net/route.c | 2 +- sys/net/route.h | 2 +- sys/net/rtsock.c | 2 +- sys/net/slcompress.c | 2 +- sys/net/slcompress.h | 2 +- sys/net/slip.h | 2 +- sys/netccitt/ccitt_proto.c | 2 +- sys/netccitt/dll.h | 2 +- sys/netccitt/hd_debug.c | 2 +- sys/netccitt/hd_input.c | 2 +- sys/netccitt/hd_output.c | 2 +- sys/netccitt/hd_subr.c | 2 +- sys/netccitt/hd_timer.c | 2 +- sys/netccitt/hd_var.h | 2 +- sys/netccitt/hdlc.h | 2 +- sys/netccitt/if_x25subr.c | 2 +- sys/netccitt/llc_input.c | 2 +- sys/netccitt/llc_output.c | 2 +- sys/netccitt/llc_subr.c | 2 +- sys/netccitt/llc_timer.c | 2 +- sys/netccitt/llc_var.h | 2 +- sys/netccitt/pk.h | 2 +- sys/netccitt/pk_acct.c | 2 +- sys/netccitt/pk_debug.c | 2 +- sys/netccitt/pk_input.c | 2 +- sys/netccitt/pk_llcsubr.c | 2 +- sys/netccitt/pk_output.c | 2 +- sys/netccitt/pk_subr.c | 2 +- sys/netccitt/pk_timer.c | 2 +- sys/netccitt/pk_usrreq.c | 2 +- sys/netccitt/pk_var.h | 2 +- sys/netccitt/x25.h | 2 +- sys/netccitt/x25acct.h | 2 +- sys/netccitt/x25err.h | 2 +- sys/netinet/icmp_var.h | 2 +- sys/netinet/if_ether.c | 2 +- sys/netinet/if_ether.h | 2 +- sys/netinet/if_fddi.h | 2 +- sys/netinet/igmp.c | 2 +- sys/netinet/igmp.h | 2 +- sys/netinet/igmp_var.h | 2 +- sys/netinet/in.c | 2 +- sys/netinet/in.h | 2 +- sys/netinet/in_cksum.c | 2 +- sys/netinet/in_pcb.c | 2 +- sys/netinet/in_pcb.h | 2 +- sys/netinet/in_proto.c | 2 +- sys/netinet/in_rmx.c | 2 +- sys/netinet/in_systm.h | 2 +- sys/netinet/in_var.h | 2 +- sys/netinet/ip.h | 2 +- sys/netinet/ip_fw.c | 2 +- sys/netinet/ip_fw.h | 2 +- sys/netinet/ip_icmp.c | 2 +- sys/netinet/ip_icmp.h | 2 +- sys/netinet/ip_input.c | 2 +- sys/netinet/ip_mroute.c | 2 +- sys/netinet/ip_mroute.h | 2 +- sys/netinet/ip_output.c | 2 +- sys/netinet/ip_var.h | 2 +- sys/netinet/raw_ip.c | 2 +- sys/netinet/tcp.h | 2 +- sys/netinet/tcp_debug.c | 2 +- sys/netinet/tcp_debug.h | 2 +- sys/netinet/tcp_fsm.h | 2 +- sys/netinet/tcp_input.c | 2 +- sys/netinet/tcp_output.c | 2 +- sys/netinet/tcp_seq.h | 2 +- sys/netinet/tcp_subr.c | 2 +- sys/netinet/tcp_timer.c | 2 +- sys/netinet/tcp_timer.h | 2 +- sys/netinet/tcp_usrreq.c | 2 +- sys/netinet/tcp_var.h | 2 +- sys/netinet/tcpip.h | 2 +- sys/netinet/udp.h | 2 +- sys/netinet/udp_usrreq.c | 2 +- sys/netinet/udp_var.h | 2 +- sys/netiso/argo_debug.h | 6 +- sys/netiso/clnl.h | 2 +- sys/netiso/clnp.h | 6 +- sys/netiso/clnp_debug.c | 6 +- sys/netiso/clnp_er.c | 6 +- sys/netiso/clnp_frag.c | 6 +- sys/netiso/clnp_input.c | 6 +- sys/netiso/clnp_options.c | 6 +- sys/netiso/clnp_output.c | 6 +- sys/netiso/clnp_raw.c | 6 +- sys/netiso/clnp_stat.h | 6 +- sys/netiso/clnp_subr.c | 6 +- sys/netiso/clnp_timer.c | 6 +- sys/netiso/cltp_usrreq.c | 2 +- sys/netiso/cltp_var.h | 2 +- sys/netiso/cons.h | 6 +- sys/netiso/cons_pcb.h | 6 +- sys/netiso/eonvar.h | 2 +- sys/netiso/esis.c | 2 +- sys/netiso/esis.h | 6 +- sys/netiso/idrp_usrreq.c | 2 +- sys/netiso/if_cons.c | 6 +- sys/netiso/if_eon.c | 6 +- sys/netiso/iso.c | 6 +- sys/netiso/iso.h | 6 +- sys/netiso/iso_chksum.c | 6 +- sys/netiso/iso_errno.h | 2 +- sys/netiso/iso_pcb.c | 6 +- sys/netiso/iso_pcb.h | 6 +- sys/netiso/iso_proto.c | 6 +- sys/netiso/iso_snpac.c | 6 +- sys/netiso/iso_snpac.h | 2 +- sys/netiso/iso_var.h | 6 +- sys/netiso/tp.trans | 2 +- sys/netiso/tp_astring.c | 2 +- sys/netiso/tp_clnp.h | 6 +- sys/netiso/tp_cons.c | 6 +- sys/netiso/tp_driver.c | 2 +- sys/netiso/tp_emit.c | 6 +- sys/netiso/tp_events.h | 2 +- sys/netiso/tp_inet.c | 6 +- sys/netiso/tp_input.c | 6 +- sys/netiso/tp_ip.h | 6 +- sys/netiso/tp_iso.c | 6 +- sys/netiso/tp_meas.c | 6 +- sys/netiso/tp_meas.h | 2 +- sys/netiso/tp_output.c | 6 +- sys/netiso/tp_param.h | 6 +- sys/netiso/tp_pcb.c | 6 +- sys/netiso/tp_pcb.h | 6 +- sys/netiso/tp_seq.h | 6 +- sys/netiso/tp_stat.h | 6 +- sys/netiso/tp_states.h | 2 +- sys/netiso/tp_states.init | 4 +- sys/netiso/tp_subr.c | 6 +- sys/netiso/tp_subr2.c | 6 +- sys/netiso/tp_timer.c | 6 +- sys/netiso/tp_timer.h | 6 +- sys/netiso/tp_tpdu.h | 6 +- sys/netiso/tp_trace.c | 6 +- sys/netiso/tp_trace.h | 6 +- sys/netiso/tp_user.h | 6 +- sys/netiso/tp_usrreq.c | 6 +- sys/netiso/tuba_subr.c | 2 +- sys/netiso/tuba_table.c | 2 +- sys/netiso/tuba_table.h | 2 +- sys/netiso/tuba_usrreq.c | 2 +- sys/netiso/xebec/debug.h | 4 +- sys/netiso/xebec/llparse.c | 4 +- sys/netiso/xebec/llparse.h | 4 +- sys/netiso/xebec/llscan.c | 4 +- sys/netiso/xebec/main.c | 4 +- sys/netiso/xebec/main.h | 4 +- sys/netiso/xebec/malloc.c | 4 +- sys/netiso/xebec/malloc.h | 4 +- sys/netiso/xebec/procs.c | 4 +- sys/netiso/xebec/procs.h | 4 +- sys/netiso/xebec/putdriver.c | 4 +- sys/netiso/xebec/sets.c | 4 +- sys/netiso/xebec/sets.h | 4 +- sys/netiso/xebec/test.trans | 2 +- sys/netiso/xebec/xebec.c | 4 +- sys/netiso/xebec/xebec.h | 4 +- sys/netns/idp.h | 2 +- sys/netns/idp_usrreq.c | 2 +- sys/netns/idp_var.h | 2 +- sys/netns/ns.c | 2 +- sys/netns/ns.h | 2 +- sys/netns/ns_cksum.c | 2 +- sys/netns/ns_error.c | 2 +- sys/netns/ns_error.h | 2 +- sys/netns/ns_if.h | 2 +- sys/netns/ns_input.c | 2 +- sys/netns/ns_ip.c | 2 +- sys/netns/ns_output.c | 2 +- sys/netns/ns_pcb.c | 2 +- sys/netns/ns_pcb.h | 2 +- sys/netns/ns_proto.c | 2 +- sys/netns/sp.h | 2 +- sys/netns/spidp.h | 2 +- sys/netns/spp_debug.c | 2 +- sys/netns/spp_debug.h | 2 +- sys/netns/spp_timer.h | 2 +- sys/netns/spp_usrreq.c | 2 +- sys/netns/spp_var.h | 2 +- sys/nfs/nfs.h | 2 +- sys/nfs/nfs_bio.c | 2 +- sys/nfs/nfs_node.c | 2 +- sys/nfs/nfs_nqlease.c | 2 +- sys/nfs/nfs_serv.c | 2 +- sys/nfs/nfs_socket.c | 2 +- sys/nfs/nfs_srvcache.c | 2 +- sys/nfs/nfs_subs.c | 2 +- sys/nfs/nfs_syscalls.c | 2 +- sys/nfs/nfs_vfsops.c | 2 +- sys/nfs/nfs_vnops.c | 2 +- sys/nfs/nfsdiskless.h | 2 +- sys/nfs/nfsm_subs.h | 2 +- sys/nfs/nfsmount.h | 2 +- sys/nfs/nfsnode.h | 2 +- sys/nfs/nfsrtt.h | 2 +- sys/nfs/nfsrvcache.h | 2 +- sys/nfs/nfsv2.h | 2 +- sys/nfs/nqnfs.h | 2 +- sys/nfs/rpcv2.h | 2 +- sys/nfs/xdr_subs.h | 2 +- sys/pci/README.de | 2 +- sys/pci/README.de-le | 2 +- sys/pci/aic7870.c | 2 +- sys/pci/bt9xx.c | 2 +- sys/pci/dc21040.h | 2 +- sys/pci/if_de.c | 2 +- sys/pci/if_fxp.c | 2 +- sys/pci/if_fxpreg.h | 2 +- sys/pci/if_pdq.c | 2 +- sys/pci/ncr.c | 4 +- sys/pci/ncrreg.h | 2 +- sys/pci/pci.c | 2 +- sys/pci/pcibus.h | 2 +- sys/pci/pcireg.h | 2 +- sys/pci/pcisupport.c | 2 +- sys/pci/pcivar.h | 2 +- sys/pci/pdq.c | 5 +- sys/pci/pdq_os.h | 5 +- sys/pci/pdqreg.h | 5 +- sys/scsi/cd.c | 2 +- sys/scsi/ch.c | 2 +- sys/scsi/od.c | 2 +- sys/scsi/pt.c | 2 +- sys/scsi/scsi_all.h | 2 +- sys/scsi/scsi_base.c | 2 +- sys/scsi/scsi_cd.h | 2 +- sys/scsi/scsi_changer.h | 2 +- sys/scsi/scsi_debug.h | 2 +- sys/scsi/scsi_disk.h | 2 +- sys/scsi/scsi_driver.c | 2 +- sys/scsi/scsi_driver.h | 2 +- sys/scsi/scsi_generic.h | 2 +- sys/scsi/scsi_ioctl.c | 2 +- sys/scsi/scsi_tape.h | 2 +- sys/scsi/scsiconf.c | 2 +- sys/scsi/scsiconf.h | 2 +- sys/scsi/sctarg.c | 2 +- sys/scsi/sd.c | 2 +- sys/scsi/ssc.c | 2 +- sys/scsi/st.c | 2 +- sys/scsi/su.c | 2 +- sys/scsi/uk.c | 2 +- sys/scsi/worm.c | 2 +- sys/sys/acct.h | 2 +- sys/sys/buf.h | 2 +- sys/sys/callout.h | 2 +- sys/sys/ccdvar.h | 2 +- sys/sys/cdefs.h | 2 +- sys/sys/cdio.h | 2 +- sys/sys/chio.h | 2 +- sys/sys/clist.h | 2 +- sys/sys/conf.h | 2 +- sys/sys/devconf.h | 2 +- sys/sys/device.h | 2 +- sys/sys/dir.h | 2 +- sys/sys/dirent.h | 2 +- sys/sys/disk.h | 2 +- sys/sys/disklabel.h | 2 +- sys/sys/diskslice.h | 2 +- sys/sys/dkbad.h | 2 +- sys/sys/dkstat.h | 2 +- sys/sys/dmap.h | 2 +- sys/sys/domain.h | 2 +- sys/sys/errno.h | 2 +- sys/sys/exec.h | 2 +- sys/sys/fbio.h | 2 +- sys/sys/fcntl.h | 2 +- sys/sys/file.h | 2 +- sys/sys/filedesc.h | 2 +- sys/sys/filio.h | 2 +- sys/sys/gmon.h | 2 +- sys/sys/imgact.h | 2 +- sys/sys/imgact_aout.h | 2 +- sys/sys/inflate.h | 2 +- sys/sys/ioccom.h | 2 +- sys/sys/ioctl.h | 2 +- sys/sys/ioctl_compat.h | 2 +- sys/sys/ipc.h | 2 +- sys/sys/kernel.h | 2 +- sys/sys/ktrace.h | 2 +- sys/sys/libkern.h | 2 +- sys/sys/link_aout.h | 297 -- sys/sys/link_elf.h | 297 -- sys/sys/lkm.h | 2 +- sys/sys/lockf.h | 2 +- sys/sys/malloc.h | 2 +- sys/sys/mbuf.h | 2 +- sys/sys/mman.h | 2 +- sys/sys/mount.h | 2 +- sys/sys/msg.h | 2 +- sys/sys/msgbuf.h | 2 +- sys/sys/mtio.h | 2 +- sys/sys/namei.h | 2 +- sys/sys/nlist_aout.h | 90 - sys/sys/param.h | 2 +- sys/sys/proc.h | 2 +- sys/sys/protosw.h | 2 +- sys/sys/ptrace.h | 2 +- sys/sys/queue.h | 2 +- sys/sys/reboot.h | 2 +- sys/sys/resource.h | 2 +- sys/sys/resourcevar.h | 2 +- sys/sys/rlist.h | 2 +- sys/sys/rtprio.h | 2 +- sys/sys/scsiio.h | 2 +- sys/sys/select.h | 2 +- sys/sys/sem.h | 2 +- sys/sys/shm.h | 2 +- sys/sys/signal.h | 2 +- sys/sys/signalvar.h | 2 +- sys/sys/socket.h | 2 +- sys/sys/socketvar.h | 2 +- sys/sys/sockio.h | 2 +- sys/sys/stat.h | 2 +- sys/sys/syscall-hide.h | 2 +- sys/sys/syscall.h | 2 +- sys/sys/sysctl.h | 2 +- sys/sys/sysent.h | 2 +- sys/sys/syslimits.h | 2 +- sys/sys/syslog.h | 2 +- sys/sys/systm.h | 2 +- sys/sys/tablet.h | 2 +- sys/sys/termios.h | 2 +- sys/sys/time.h | 2 +- sys/sys/timeb.h | 2 +- sys/sys/times.h | 2 +- sys/sys/tprintf.h | 2 +- sys/sys/tty.h | 2 +- sys/sys/ttychars.h | 2 +- sys/sys/ttycom.h | 2 +- sys/sys/ttydefaults.h | 2 +- sys/sys/ttydev.h | 2 +- sys/sys/types.h | 2 +- sys/sys/ucred.h | 2 +- sys/sys/uio.h | 2 +- sys/sys/un.h | 2 +- sys/sys/unistd.h | 2 +- sys/sys/unpcb.h | 2 +- sys/sys/user.h | 2 +- sys/sys/utsname.h | 2 +- sys/sys/vadvise.h | 2 +- sys/sys/vcmd.h | 2 +- sys/sys/vlimit.h | 2 +- sys/sys/vmmeter.h | 2 +- sys/sys/vnode.h | 2 +- sys/sys/vsio.h | 2 +- sys/sys/wait.h | 2 +- sys/ufs/ffs/ffs_alloc.c | 2 +- sys/ufs/ffs/ffs_balloc.c | 2 +- sys/ufs/ffs/ffs_extern.h | 2 +- sys/ufs/ffs/ffs_inode.c | 2 +- sys/ufs/ffs/ffs_subr.c | 2 +- sys/ufs/ffs/ffs_tables.c | 2 +- sys/ufs/ffs/ffs_vfsops.c | 2 +- sys/ufs/ffs/ffs_vnops.c | 2 +- sys/ufs/ffs/fs.h | 2 +- sys/ufs/lfs/lfs.h | 2 +- sys/ufs/lfs/lfs_alloc.c | 2 +- sys/ufs/lfs/lfs_balloc.c | 2 +- sys/ufs/lfs/lfs_bio.c | 2 +- sys/ufs/lfs/lfs_cksum.c | 2 +- sys/ufs/lfs/lfs_debug.c | 2 +- sys/ufs/lfs/lfs_extern.h | 2 +- sys/ufs/lfs/lfs_inode.c | 2 +- sys/ufs/lfs/lfs_segment.c | 2 +- sys/ufs/lfs/lfs_subr.c | 2 +- sys/ufs/lfs/lfs_syscalls.c | 2 +- sys/ufs/lfs/lfs_vfsops.c | 2 +- sys/ufs/lfs/lfs_vnops.c | 2 +- sys/ufs/mfs/mfs_extern.h | 2 +- sys/ufs/mfs/mfs_vfsops.c | 2 +- sys/ufs/mfs/mfs_vnops.c | 2 +- sys/ufs/mfs/mfsiom.h | 2 +- sys/ufs/mfs/mfsnode.h | 2 +- sys/ufs/ufs/dinode.h | 2 +- sys/ufs/ufs/dir.h | 2 +- sys/ufs/ufs/inode.h | 2 +- sys/ufs/ufs/quota.h | 2 +- sys/ufs/ufs/ufs_bmap.c | 2 +- sys/ufs/ufs/ufs_disksubr.c | 2 +- sys/ufs/ufs/ufs_extern.h | 2 +- sys/ufs/ufs/ufs_ihash.c | 2 +- sys/ufs/ufs/ufs_inode.c | 2 +- sys/ufs/ufs/ufs_lookup.c | 2 +- sys/ufs/ufs/ufs_quota.c | 2 +- sys/ufs/ufs/ufs_readwrite.c | 2 +- sys/ufs/ufs/ufs_vfsops.c | 2 +- sys/ufs/ufs/ufs_vnops.c | 2 +- sys/ufs/ufs/ufsmount.h | 2 +- sys/vm/device_pager.c | 2 +- sys/vm/device_pager.h | 2 +- sys/vm/kern_lock.c | 2 +- sys/vm/lock.h | 2 +- sys/vm/pmap.h | 2 +- sys/vm/swap_pager.c | 2 +- sys/vm/swap_pager.h | 2 +- sys/vm/vm.h | 2 +- sys/vm/vm_extern.h | 2 +- sys/vm/vm_fault.c | 2 +- sys/vm/vm_glue.c | 2 +- sys/vm/vm_inherit.h | 2 +- sys/vm/vm_init.c | 2 +- sys/vm/vm_kern.c | 2 +- sys/vm/vm_kern.h | 2 +- sys/vm/vm_map.c | 2 +- sys/vm/vm_map.h | 2 +- sys/vm/vm_meter.c | 2 +- sys/vm/vm_mmap.c | 2 +- sys/vm/vm_object.c | 2 +- sys/vm/vm_object.h | 2 +- sys/vm/vm_page.c | 2 +- sys/vm/vm_page.h | 2 +- sys/vm/vm_pageout.c | 2 +- sys/vm/vm_pageout.h | 2 +- sys/vm/vm_pager.c | 2 +- sys/vm/vm_pager.h | 2 +- sys/vm/vm_param.h | 2 +- sys/vm/vm_prot.h | 2 +- sys/vm/vm_swap.c | 2 +- sys/vm/vm_unix.c | 2 +- sys/vm/vnode_pager.c | 2 +- sys/vm/vnode_pager.h | 2 +- usr.bin/Makefile | 2 +- usr.bin/at/Makefile | 2 +- usr.bin/at/at.c | 2 +- usr.bin/at/at.man | 2 +- usr.bin/at/panic.c | 2 +- usr.bin/at/parsetime.c | 2 +- usr.bin/at/perm.c | 2 +- usr.bin/calendar/calendars/calendar.all | 2 +- usr.bin/calendar/calendars/calendar.croatian | 2 +- usr.bin/calendar/calendars/calendar.german | 2 +- usr.bin/calendar/calendars/calendar.russian | 2 +- usr.bin/calendar/calendars/calendar.world | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.all | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.feiertag | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.geschichte | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.kirche | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.literatur | 2 +- .../calendars/de_DE.ISO_8859-1/calendar.musik | 2 +- .../de_DE.ISO_8859-1/calendar.wissenschaft | 2 +- .../calendars/hr_HR.ISO_8859-2/calendar.all | 2 +- .../calendars/hr_HR.ISO_8859-2/calendar.praznici | 2 +- .../calendar/calendars/ru_SU.KOI8-R/calendar.all | 2 +- .../calendars/ru_SU.KOI8-R/calendar.common | 2 +- .../calendar/calendars/ru_SU.KOI8-R/calendar.msk | 2 +- .../calendars/ru_SU.KOI8-R/calendar.orthodox | 2 +- .../calendar/calendars/ru_SU.KOI8-R/calendar.pagan | 2 +- usr.bin/calendar/ostern.c | 2 +- usr.bin/chat/Makefile | 2 +- usr.bin/chat/chat.8 | 2 +- usr.bin/chat/chat.c | 2 +- usr.bin/chpass/chpass.c | 2 +- usr.bin/chpass/pw_yp.c | 2 +- usr.bin/chpass/pw_yp.h | 2 +- usr.bin/colldef/Makefile | 2 +- usr.bin/colldef/data/Makefile | 2 +- usr.bin/colldef/parse.y | 2 +- usr.bin/colldef/scan.l | 2 +- usr.bin/compile_et/Makefile | 2 +- usr.bin/compile_et/compile_et.1 | 2 +- usr.bin/compile_et/compile_et.c | 2 +- usr.bin/compile_et/error_table.y | 2 +- usr.bin/compile_et/et_lex.lex.l | 2 +- usr.bin/compress/doc/revision.log | 8 +- usr.bin/cpp/cpp.sh | 2 +- usr.bin/devmenu/Makefile | 2 +- usr.bin/devmenu/devmenu.1 | 2 +- usr.bin/devmenu/devmenu.c | 2 +- usr.bin/devmenu/devmenu.h | 2 +- usr.bin/dig/dig.1 | 2 +- usr.bin/dig/dig.c | 2 +- usr.bin/ee/doc/new_curse.c | 4 +- usr.bin/ee/ee.1 | 2 +- usr.bin/ee/ee.c | 4 +- usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg | 2 +- usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg | 2 +- usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg | 2 +- usr.bin/fetch/fetch.1 | 2 +- usr.bin/fetch/main.c | 2 +- usr.bin/file/LEGAL.NOTICE | 2 +- usr.bin/file/MAINT | 2 +- usr.bin/file/Magdir/Localstuff | 2 +- usr.bin/file/Magdir/sgml | 2 +- usr.bin/file/Magdir/softquad | 2 +- usr.bin/file/Makefile | 2 +- usr.bin/file/PORTING | 2 +- usr.bin/file/README | 2 +- usr.bin/file/apprentice.c | 2 +- usr.bin/file/ascmagic.c | 2 +- usr.bin/file/compress.c | 2 +- usr.bin/file/cvsimport.sh | 2 +- usr.bin/file/file.1 | 2 +- usr.bin/file/file.c | 2 +- usr.bin/file/file.h | 2 +- usr.bin/file/fsmagic.c | 2 +- usr.bin/file/is_tar.c | 2 +- usr.bin/file/magic.5 | 2 +- usr.bin/file/names.h | 2 +- usr.bin/file/patchlevel.h | 5 +- usr.bin/file/print.c | 2 +- usr.bin/file/softmagic.c | 2 +- usr.bin/file/tar.h | 2 +- usr.bin/file2c/Makefile | 2 +- usr.bin/file2c/file2c.1 | 2 +- usr.bin/file2c/file2c.c | 2 +- usr.bin/gencat/Makefile | 2 +- usr.bin/getopt/Makefile | 2 +- usr.bin/host/host.1 | 2 +- usr.bin/host/host.c | 2 +- usr.bin/ipcrm/Makefile | 2 +- usr.bin/ipcrm/ipcrm.1 | 2 +- usr.bin/ipcrm/ipcrm.c | 2 +- usr.bin/ipcs/Makefile | 2 +- usr.bin/ipcs/ipcs.1 | 2 +- usr.bin/ipcs/ipcs.c | 2 +- usr.bin/keyinfo/keyinfo.pl | 2 +- usr.bin/killall/killall.1 | 2 +- usr.bin/killall/killall.pl | 2 +- usr.bin/ktrace/ktrace.c | 2 +- usr.bin/kzip/Makefile | 2 +- usr.bin/kzip/kzip.c | 2 +- usr.bin/lex/FlexLexer.h | 2 +- usr.bin/lex/Makefile | 2 +- usr.bin/lex/ccl.c | 2 +- usr.bin/lex/dfa.c | 2 +- usr.bin/lex/ecs.c | 2 +- usr.bin/lex/flex.skl | 2 +- usr.bin/lex/flexdef.h | 2 +- usr.bin/lex/gen.c | 2 +- usr.bin/lex/initscan.c | 4 +- usr.bin/lex/lib/Makefile | 2 +- usr.bin/lex/lib/libmain.c | 2 +- usr.bin/lex/lib/libyywrap.c | 2 +- usr.bin/lex/main.c | 2 +- usr.bin/lex/misc.c | 2 +- usr.bin/lex/nfa.c | 2 +- usr.bin/lex/parse.y | 2 +- usr.bin/lex/scan.l | 2 +- usr.bin/lex/skel.c | 2 +- usr.bin/lex/sym.c | 2 +- usr.bin/lex/tblcmp.c | 2 +- usr.bin/lex/yylex.c | 2 +- usr.bin/login/Makefile | 2 +- usr.bin/lsvfs/Makefile | 2 +- usr.bin/lsvfs/lsvfs.1 | 2 +- usr.bin/lsvfs/lsvfs.c | 2 +- usr.bin/m4/m4.1 | 2 +- usr.bin/make/Makefile | 2 +- usr.bin/make/PSD.doc/tutorial.ms | 2 +- usr.bin/make/pathnames.h | 2 +- usr.bin/make/str.c | 2 +- usr.bin/mk_cmds/Makefile | 2 +- usr.bin/mklocale/data/Makefile | 2 +- usr.bin/modstat/Makefile | 2 +- usr.bin/modstat/modstat.8 | 2 +- usr.bin/modstat/modstat.c | 2 +- usr.bin/more/Makefile | 2 +- usr.bin/msgs/Makefile | 2 +- usr.bin/netstat/iso.c | 4 +- usr.bin/netstat/route.c | 2 +- usr.bin/nfsstat/nfsstat.1 | 2 +- usr.bin/nfsstat/nfsstat.c | 2 +- usr.bin/passwd/Makefile | 2 +- usr.bin/passwd/extern.h | 2 +- usr.bin/passwd/local_passwd.c | 2 +- usr.bin/passwd/passwd.c | 2 +- usr.bin/rdist/docmd.c | 2 +- usr.bin/rpcgen/Makefile | 2 +- usr.bin/rpcgen/rpc_clntout.c | 2 +- usr.bin/rpcgen/rpc_cout.c | 2 +- usr.bin/rpcgen/rpc_hout.c | 2 +- usr.bin/rpcgen/rpc_main.c | 2 +- usr.bin/rpcgen/rpc_parse.c | 2 +- usr.bin/rpcgen/rpc_parse.h | 2 +- usr.bin/rpcgen/rpc_scan.c | 2 +- usr.bin/rpcgen/rpc_scan.h | 2 +- usr.bin/rpcgen/rpc_svcout.c | 2 +- usr.bin/rpcgen/rpc_util.c | 2 +- usr.bin/rpcgen/rpc_util.h | 2 +- usr.bin/rpcgen/rpcgen.1 | 2 +- usr.bin/rpcinfo/Makefile | 2 +- usr.bin/rpcinfo/rpcinfo.8 | 2 +- usr.bin/rpcinfo/rpcinfo.c | 2 +- usr.bin/rsh/rsh.c | 2 +- usr.bin/rup/Makefile | 2 +- usr.bin/rup/rup.1 | 2 +- usr.bin/rup/rup.c | 2 +- usr.bin/ruptime/ruptime.c | 2 +- usr.bin/rusers/Makefile | 2 +- usr.bin/rusers/rusers.1 | 2 +- usr.bin/rusers/rusers.c | 2 +- usr.bin/rwall/Makefile | 2 +- usr.bin/rwall/rwall.1 | 2 +- usr.bin/rwall/rwall.c | 2 +- usr.bin/sgmlfmt/Makefile | 2 +- usr.bin/sgmlfmt/sgmlfmt.pl | 2 +- usr.bin/sgmls/Makefile | 2 +- usr.bin/sgmls/Makefile.inc | 2 +- usr.bin/sgmls/README | 2 +- usr.bin/sgmls/sgmls/Makefile | 2 +- usr.bin/strip/strip.c | 2 +- usr.bin/su/su.c | 2 +- usr.bin/talk/Makefile | 2 +- usr.bin/talk/get_iface.c | 2 +- usr.bin/tconv/Makefile | 2 +- usr.bin/vi/USD.doc/vi.ref/index | 270 ++ usr.bin/wc/wc.c | 2 +- usr.bin/which/which.1 | 2 +- usr.bin/which/which.pl | 2 +- usr.bin/xinstall/install.1 | 2 +- usr.bin/xinstall/xinstall.c | 2 +- usr.bin/ypcat/Makefile | 2 +- usr.bin/ypcat/ypcat.1 | 2 +- usr.bin/ypmatch/Makefile | 2 +- usr.bin/ypmatch/ypmatch.1 | 2 +- usr.bin/ypwhich/Makefile | 2 +- usr.sbin/Makefile | 2 +- usr.sbin/ac/Makefile | 2 +- usr.sbin/ac/ac.8 | 2 +- usr.sbin/ac/ac.c | 2 +- usr.sbin/adduser/adduser.8 | 2 +- usr.sbin/adduser/adduser.perl | 2 +- usr.sbin/amd/amd/afs_ops.c | 2 +- usr.sbin/amd/amd/am_ops.c | 2 +- usr.sbin/amd/amd/amd.8 | 2 +- usr.sbin/amd/amd/amd.c | 2 +- usr.sbin/amd/amd/amq_subr.c | 2 +- usr.sbin/amd/amd/clock.c | 2 +- usr.sbin/amd/amd/efs_ops.c | 2 +- usr.sbin/amd/amd/get_args.c | 2 +- usr.sbin/amd/amd/host_ops.c | 2 +- usr.sbin/amd/amd/ifs_ops.c | 2 +- usr.sbin/amd/amd/info_file.c | 2 +- usr.sbin/amd/amd/info_hes.c | 2 +- usr.sbin/amd/amd/info_ndbm.c | 2 +- usr.sbin/amd/amd/info_nis.c | 2 +- usr.sbin/amd/amd/info_passwd.c | 2 +- usr.sbin/amd/amd/info_union.c | 2 +- usr.sbin/amd/amd/map.c | 2 +- usr.sbin/amd/amd/mapc.c | 2 +- usr.sbin/amd/amd/misc_rpc.c | 2 +- usr.sbin/amd/amd/mntfs.c | 2 +- usr.sbin/amd/amd/mount_fs.c | 2 +- usr.sbin/amd/amd/mtab.c | 2 +- usr.sbin/amd/amd/nfs_ops.c | 2 +- usr.sbin/amd/amd/nfs_start.c | 2 +- usr.sbin/amd/amd/nfs_subr.c | 2 +- usr.sbin/amd/amd/nfsx_ops.c | 2 +- usr.sbin/amd/amd/opts.c | 2 +- usr.sbin/amd/amd/pfs_ops.c | 2 +- usr.sbin/amd/amd/restart.c | 2 +- usr.sbin/amd/amd/rpc_fwd.c | 2 +- usr.sbin/amd/amd/sched.c | 2 +- usr.sbin/amd/amd/sfs_ops.c | 2 +- usr.sbin/amd/amd/srvr_afs.c | 2 +- usr.sbin/amd/amd/srvr_nfs.c | 2 +- usr.sbin/amd/amd/ufs_ops.c | 2 +- usr.sbin/amd/amd/umount_fs.c | 2 +- usr.sbin/amd/amd/util.c | 2 +- usr.sbin/amd/amd/wire.c | 2 +- usr.sbin/amd/amd/xutil.c | 2 +- usr.sbin/amd/amq/amq.8 | 2 +- usr.sbin/amd/amq/amq.c | 4 +- usr.sbin/amd/config/Configure | 2 +- usr.sbin/amd/config/Makefile.aix3 | 2 +- usr.sbin/amd/config/Makefile.bsd44 | 2 +- usr.sbin/amd/config/Makefile.config | 2 +- usr.sbin/amd/config/Makefile.hpux | 2 +- usr.sbin/amd/config/Makefile.irix | 2 +- usr.sbin/amd/config/Makefile.irix3 | 2 +- usr.sbin/amd/config/Makefile.irix4 | 2 +- usr.sbin/amd/config/Makefile.stellix | 2 +- usr.sbin/amd/config/RELEASE | 2 +- usr.sbin/amd/config/arch | 2 +- usr.sbin/amd/config/misc-aix3.h | 2 +- usr.sbin/amd/config/misc-hpux.h | 2 +- usr.sbin/amd/config/misc-irix.h | 2 +- usr.sbin/amd/config/misc-next.h | 2 +- usr.sbin/amd/config/misc-ultrix.h | 2 +- usr.sbin/amd/config/mount_aix.c | 2 +- usr.sbin/amd/config/mount_irix.c | 2 +- usr.sbin/amd/config/mtab_aix.c | 2 +- usr.sbin/amd/config/mtab_bsd.c | 2 +- usr.sbin/amd/config/mtab_file.c | 2 +- usr.sbin/amd/config/mtab_ultrix.c | 2 +- usr.sbin/amd/config/newvers.sh | 2 +- usr.sbin/amd/config/os-acis43.h | 2 +- usr.sbin/amd/config/os-aix3.h | 2 +- usr.sbin/amd/config/os-aux.h | 2 +- usr.sbin/amd/config/os-bsd44.h | 2 +- usr.sbin/amd/config/os-concentrix.h | 2 +- usr.sbin/amd/config/os-convex.h | 2 +- usr.sbin/amd/config/os-defaults.h | 2 +- usr.sbin/amd/config/os-dgux.h | 2 +- usr.sbin/amd/config/os-fpx4.h | 2 +- usr.sbin/amd/config/os-hcx.h | 2 +- usr.sbin/amd/config/os-hlh42.h | 2 +- usr.sbin/amd/config/os-hpux.h | 2 +- usr.sbin/amd/config/os-irix.h | 2 +- usr.sbin/amd/config/os-irix3.h | 2 +- usr.sbin/amd/config/os-irix4.h | 2 +- usr.sbin/amd/config/os-next.h | 2 +- usr.sbin/amd/config/os-pyrOSx.h | 2 +- usr.sbin/amd/config/os-riscix.h | 2 +- usr.sbin/amd/config/os-sos3.h | 2 +- usr.sbin/amd/config/os-sos4.h | 2 +- usr.sbin/amd/config/os-stellix.h | 2 +- usr.sbin/amd/config/os-type | 2 +- usr.sbin/amd/config/os-u2_2.h | 2 +- usr.sbin/amd/config/os-u3_0.h | 2 +- usr.sbin/amd/config/os-u4_0.h | 2 +- usr.sbin/amd/config/os-u4_2.h | 2 +- usr.sbin/amd/config/os-umax43.h | 2 +- usr.sbin/amd/config/os-utek.h | 2 +- usr.sbin/amd/config/os-utx32.h | 2 +- usr.sbin/amd/config/os-xinu43.h | 2 +- usr.sbin/amd/doc/Makefile | 2 +- usr.sbin/amd/doc/amdref.texinfo | 2 +- usr.sbin/amd/fsinfo/conf/csg_sun3 | 2 +- usr.sbin/amd/fsinfo/conf/csg_vax | 2 +- .../amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk | 2 +- .../amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk | 2 +- usr.sbin/amd/fsinfo/fsi_analyze.c | 2 +- usr.sbin/amd/fsinfo/fsi_data.h | 2 +- usr.sbin/amd/fsinfo/fsi_dict.c | 2 +- usr.sbin/amd/fsinfo/fsi_gram.y | 2 +- usr.sbin/amd/fsinfo/fsi_lex.l | 2 +- usr.sbin/amd/fsinfo/fsi_util.c | 2 +- usr.sbin/amd/fsinfo/fsinfo.c | 2 +- usr.sbin/amd/fsinfo/fsinfo.h | 2 +- usr.sbin/amd/fsinfo/wr_atab.c | 2 +- usr.sbin/amd/fsinfo/wr_bparam.c | 2 +- usr.sbin/amd/fsinfo/wr_dumpset.c | 2 +- usr.sbin/amd/fsinfo/wr_exportfs.c | 2 +- usr.sbin/amd/fsinfo/wr_fstab.c | 2 +- usr.sbin/amd/include/am.h | 2 +- usr.sbin/amd/include/config.h | 2 +- usr.sbin/amd/include/fstype.h | 2 +- usr.sbin/amd/include/uwait.h | 2 +- usr.sbin/amd/mk-amd-map/mk-amd-map.c | 4 +- usr.sbin/amd/rpcx/amq.h | 2 +- usr.sbin/amd/rpcx/amq.x | 2 +- usr.sbin/amd/rpcx/amq_clnt.c | 2 +- usr.sbin/amd/rpcx/amq_svc.c | 2 +- usr.sbin/amd/rpcx/amq_xdr.c | 2 +- usr.sbin/amd/rpcx/mount.h | 2 +- usr.sbin/amd/rpcx/mount_xdr.c | 2 +- usr.sbin/amd/rpcx/nfs_prot.h | 2 +- usr.sbin/amd/rpcx/nfs_prot_svc.c | 2 +- usr.sbin/amd/rpcx/nfs_prot_xdr.c | 2 +- usr.sbin/amd/text/INSTALL | 2 +- usr.sbin/amd/text/README | 2 +- usr.sbin/amd/text/amd.start.ex | 2 +- usr.sbin/bootparamd/bootparamd/Makefile | 2 +- usr.sbin/bootparamd/bootparamd/bootparamd.c | 2 +- usr.sbin/bootparamd/bootparamd/bootparams.5 | 2 +- usr.sbin/bootparamd/bootparamd/main.c | 2 +- usr.sbin/bootparamd/callbootd/Makefile | 2 +- usr.sbin/bootparamd/callbootd/callbootd.c | 2 +- usr.sbin/cron/cron/compat.h | 2 +- usr.sbin/cron/cron/config.h | 2 +- usr.sbin/cron/cron/cron.8 | 2 +- usr.sbin/cron/cron/cron.c | 2 +- usr.sbin/cron/cron/cron.h | 2 +- usr.sbin/cron/cron/database.c | 2 +- usr.sbin/cron/cron/do_command.c | 2 +- usr.sbin/cron/cron/job.c | 2 +- usr.sbin/cron/cron/pathnames.h | 2 +- usr.sbin/cron/cron/popen.c | 2 +- usr.sbin/cron/cron/user.c | 2 +- usr.sbin/cron/crontab/crontab.1 | 2 +- usr.sbin/cron/crontab/crontab.5 | 2 +- usr.sbin/cron/crontab/crontab.c | 2 +- usr.sbin/cron/doc/CONVERSION | 2 +- usr.sbin/cron/doc/FEATURES | 2 +- usr.sbin/cron/doc/INSTALL | 2 +- usr.sbin/cron/doc/MAIL | 2 +- usr.sbin/cron/doc/Makefile.vixie | 2 +- usr.sbin/cron/doc/README | 2 +- usr.sbin/cron/lib/compat.c | 2 +- usr.sbin/cron/lib/entry.c | 2 +- usr.sbin/cron/lib/env.c | 2 +- usr.sbin/cron/lib/misc.c | 2 +- usr.sbin/crunch/examples/filesystem.conf | 2 +- usr.sbin/crunch/examples/kcopy.conf | 2 +- usr.sbin/ctm/Makefile.inc | 2 +- usr.sbin/ctm/README | 2 +- usr.sbin/ctm/ctm/Makefile | 2 +- usr.sbin/ctm/ctm/ctm.1 | 2 +- usr.sbin/ctm/ctm/ctm.5 | 2 +- usr.sbin/ctm/ctm/ctm.c | 2 +- usr.sbin/ctm/ctm/ctm.h | 2 +- usr.sbin/ctm/ctm/ctm_ed.c | 2 +- usr.sbin/ctm/ctm/ctm_input.c | 2 +- usr.sbin/ctm/ctm/ctm_pass1.c | 2 +- usr.sbin/ctm/ctm/ctm_pass2.c | 2 +- usr.sbin/ctm/ctm/ctm_pass3.c | 2 +- usr.sbin/ctm/ctm/ctm_syntax.c | 2 +- usr.sbin/ctm/ctm_scan/Makefile | 2 +- usr.sbin/ctm/ctm_scan/ctm_scan.c | 2 +- usr.sbin/fdwrite/Makefile | 2 +- usr.sbin/fdwrite/fdwrite.1 | 2 +- usr.sbin/fdwrite/fdwrite.c | 2 +- usr.sbin/inetd/inetd.8 | 2 +- usr.sbin/inetd/inetd.c | 2 +- usr.sbin/kbdcontrol/kbdcontrol.c | 2 +- usr.sbin/kbdcontrol/lex.h | 2 +- usr.sbin/kbdcontrol/lex.l | 2 +- usr.sbin/kbdmap/Makefile | 2 +- usr.sbin/kbdmap/kbdmap.1 | 2 +- usr.sbin/kbdmap/kbdmap.pl | 2 +- usr.sbin/kernbb/Makefile | 2 +- usr.sbin/kernbb/kernbb.c | 2 +- usr.sbin/lpr/lp/lp.1 | 2 +- usr.sbin/lpr/lp/lp.sh | 2 +- usr.sbin/lptcontrol/lptcontrol.8 | 2 +- usr.sbin/lptcontrol/lptcontrol.c | 2 +- usr.sbin/lsdev/Makefile | 2 +- usr.sbin/lsdev/lsdev.8 | 2 +- usr.sbin/manctl/Makefile | 2 +- usr.sbin/manctl/manctl.8 | 2 +- usr.sbin/manctl/manctl.sh | 2 +- usr.sbin/mixer/Makefile | 2 +- usr.sbin/mrouted/Makefile | 2 +- usr.sbin/mrouted/callout.c | 2 +- usr.sbin/mrouted/cfparse.y | 2 +- usr.sbin/mrouted/common/Makefile | 2 +- usr.sbin/mrouted/config.c | 2 +- usr.sbin/mrouted/defs.h | 2 +- usr.sbin/mrouted/dvmrp.h | 2 +- usr.sbin/mrouted/igmp.c | 2 +- usr.sbin/mrouted/inet.c | 2 +- usr.sbin/mrouted/kern.c | 2 +- usr.sbin/mrouted/main.c | 4 +- usr.sbin/mrouted/map-mbone/Makefile | 2 +- usr.sbin/mrouted/mapper.c | 2 +- usr.sbin/mrouted/mrinfo.c | 2 +- usr.sbin/mrouted/mrinfo/Makefile | 2 +- usr.sbin/mrouted/mrouted.8 | 2 +- usr.sbin/mrouted/mrouted.conf | 2 +- usr.sbin/mrouted/mrouted/Makefile | 2 +- usr.sbin/mrouted/mtrace.8 | 2 +- usr.sbin/mrouted/mtrace.c | 2 +- usr.sbin/mrouted/mtrace/Makefile | 2 +- usr.sbin/mrouted/pathnames.h | 2 +- usr.sbin/mrouted/prune.c | 2 +- usr.sbin/mrouted/prune.h | 2 +- usr.sbin/mrouted/route.c | 2 +- usr.sbin/mrouted/route.h | 2 +- usr.sbin/mrouted/testrsrr/Makefile | 2 +- usr.sbin/mrouted/testrsrr/testrsrr.c | 2 +- usr.sbin/mrouted/vif.c | 2 +- usr.sbin/mrouted/vif.h | 2 +- usr.sbin/mtree/Makefile | 2 +- usr.sbin/mtree/mtree.8 | 2 +- usr.sbin/named/Version.c | 4 +- usr.sbin/named/db_defs.h | 2 +- usr.sbin/named/db_dump.c | 2 +- usr.sbin/named/db_func.h | 2 +- usr.sbin/named/db_glob.h | 2 +- usr.sbin/named/db_glue.c | 2 +- usr.sbin/named/db_load.c | 2 +- usr.sbin/named/db_lookup.c | 2 +- usr.sbin/named/db_reload.c | 2 +- usr.sbin/named/db_save.c | 2 +- usr.sbin/named/db_secure.c | 2 +- usr.sbin/named/db_update.c | 2 +- usr.sbin/named/dmalloc.c | 2 +- usr.sbin/named/dmalloc.h | 2 +- usr.sbin/named/named.h | 2 +- usr.sbin/named/ns_defs.h | 2 +- usr.sbin/named/ns_forw.c | 2 +- usr.sbin/named/ns_func.h | 2 +- usr.sbin/named/ns_glob.h | 2 +- usr.sbin/named/ns_main.c | 2 +- usr.sbin/named/ns_maint.c | 2 +- usr.sbin/named/ns_req.c | 2 +- usr.sbin/named/ns_resp.c | 2 +- usr.sbin/named/ns_sort.c | 2 +- usr.sbin/named/ns_stats.c | 2 +- usr.sbin/named/options.h | 2 +- usr.sbin/named/pathnames.h | 2 +- usr.sbin/named/portability.h | 2 +- usr.sbin/named/storage.c | 2 +- usr.sbin/named/tools/named.reload/named.reload.sh | 2 +- usr.sbin/named/tools/named.restart/Makefile | 2 +- usr.sbin/named/tools/named.restart/named.restart.8 | 2 +- .../named/tools/named.restart/named.restart.sh | 2 +- usr.sbin/named/tools/nsquery/nsquery.c | 2 +- usr.sbin/named/tools/nstest/nstest.c | 2 +- usr.sbin/named/tree.h | 2 +- usr.sbin/named/xfer/named-xfer.c | 2 +- usr.sbin/ncrcontrol/ncrcontrol.8 | 2 +- usr.sbin/ncrcontrol/ncrcontrol.c | 2 +- usr.sbin/nslookup/debug.c | 2 +- usr.sbin/nslookup/getinfo.c | 2 +- usr.sbin/nslookup/list.c | 2 +- usr.sbin/nslookup/main.c | 2 +- usr.sbin/nslookup/nslookup.help | 2 +- usr.sbin/nslookup/pathnames.h | 2 +- usr.sbin/nslookup/res.h | 2 +- usr.sbin/nslookup/send.c | 2 +- usr.sbin/nslookup/skip.c | 2 +- usr.sbin/nslookup/subr.c | 2 +- usr.sbin/pcvt/kbdio/kbdio.y | 6 +- usr.sbin/pcvt/kbdio/lex.l | 6 +- usr.sbin/pcvt/set2061/compiler.h | 2 +- usr.sbin/pcvt/vgaio/lex.l | 6 +- usr.sbin/pcvt/vgaio/vgaio.8 | 2 +- usr.sbin/pcvt/vgaio/vgaio.h | 3 + usr.sbin/pcvt/vgaio/vgaio.y | 6 +- usr.sbin/pkg_install/add/add.h | 2 +- usr.sbin/pkg_install/add/extract.c | 2 +- usr.sbin/pkg_install/add/futil.c | 2 +- usr.sbin/pkg_install/add/main.c | 2 +- usr.sbin/pkg_install/add/perform.c | 2 +- usr.sbin/pkg_install/create/create.h | 2 +- usr.sbin/pkg_install/create/main.c | 2 +- usr.sbin/pkg_install/create/perform.c | 2 +- usr.sbin/pkg_install/create/pkg_create.1 | 2 +- usr.sbin/pkg_install/create/pl.c | 2 +- usr.sbin/pkg_install/delete/delete.h | 2 +- usr.sbin/pkg_install/delete/main.c | 2 +- usr.sbin/pkg_install/delete/perform.c | 2 +- usr.sbin/pkg_install/info/info.h | 2 +- usr.sbin/pkg_install/info/main.c | 2 +- usr.sbin/pkg_install/info/perform.c | 2 +- usr.sbin/pkg_install/info/show.c | 2 +- usr.sbin/pkg_install/lib/exec.c | 2 +- usr.sbin/pkg_install/lib/file.c | 2 +- usr.sbin/pkg_install/lib/ftp.c | 2 +- usr.sbin/pkg_install/lib/global.c | 2 +- usr.sbin/pkg_install/lib/lib.h | 2 +- usr.sbin/pkg_install/lib/msg.c | 2 +- usr.sbin/pkg_install/lib/pen.c | 2 +- usr.sbin/pkg_install/lib/plist.c | 2 +- usr.sbin/pkg_install/tkpkg | 6 +- usr.sbin/pkg_manage/Makefile | 2 +- usr.sbin/ppp/Makefile | 2 +- usr.sbin/ppp/arp.c | 2 +- usr.sbin/ppp/arp.h | 2 +- usr.sbin/ppp/async.c | 2 +- usr.sbin/ppp/auth.c | 2 +- usr.sbin/ppp/auth.h | 2 +- usr.sbin/ppp/ccp.c | 2 +- usr.sbin/ppp/ccp.h | 2 +- usr.sbin/ppp/cdefs.h | 2 +- usr.sbin/ppp/chap.c | 2 +- usr.sbin/ppp/chap.h | 2 +- usr.sbin/ppp/chat.c | 2 +- usr.sbin/ppp/chat.h | 2 +- usr.sbin/ppp/command.c | 2 +- usr.sbin/ppp/command.h | 2 +- usr.sbin/ppp/defs.h | 2 +- usr.sbin/ppp/filter.c | 2 +- usr.sbin/ppp/filter.h | 2 +- usr.sbin/ppp/fsm.c | 2 +- usr.sbin/ppp/fsm.h | 2 +- usr.sbin/ppp/global.h | 2 +- usr.sbin/ppp/hdlc.c | 2 +- usr.sbin/ppp/hdlc.h | 2 +- usr.sbin/ppp/ip.c | 2 +- usr.sbin/ppp/ip.h | 2 +- usr.sbin/ppp/ipcp.c | 2 +- usr.sbin/ppp/ipcp.h | 2 +- usr.sbin/ppp/lcp.c | 2 +- usr.sbin/ppp/lcp.h | 2 +- usr.sbin/ppp/lcpproto.h | 2 +- usr.sbin/ppp/log.c | 2 +- usr.sbin/ppp/log.h | 2 +- usr.sbin/ppp/lqr.c | 2 +- usr.sbin/ppp/lqr.h | 2 +- usr.sbin/ppp/main.c | 2 +- usr.sbin/ppp/main.h | 2 +- usr.sbin/ppp/mbuf.c | 2 +- usr.sbin/ppp/mbuf.h | 2 +- usr.sbin/ppp/modem.c | 2 +- usr.sbin/ppp/modem.h | 2 +- usr.sbin/ppp/os.c | 2 +- usr.sbin/ppp/os.h | 2 +- usr.sbin/ppp/pap.c | 2 +- usr.sbin/ppp/pap.h | 2 +- usr.sbin/ppp/pathnames.h | 2 +- usr.sbin/ppp/phase.h | 2 +- usr.sbin/ppp/ppp.8 | 2 +- usr.sbin/ppp/pred.c | 2 +- usr.sbin/ppp/pred.h | 2 +- usr.sbin/ppp/route.c | 2 +- usr.sbin/ppp/route.h | 2 +- usr.sbin/ppp/slcompress.c | 4 +- usr.sbin/ppp/slcompress.h | 4 +- usr.sbin/ppp/systems.c | 2 +- usr.sbin/ppp/systems.h | 2 +- usr.sbin/ppp/timeout.h | 2 +- usr.sbin/ppp/timer.c | 2 +- usr.sbin/ppp/uucplock.c | 2 +- usr.sbin/ppp/vars.c | 4 +- usr.sbin/ppp/vars.h | 2 +- usr.sbin/ppp/vjcomp.c | 2 +- usr.sbin/pppd/Makefile | 2 +- usr.sbin/pppd/args.h | 2 +- usr.sbin/pppd/auth.c | 2 +- usr.sbin/pppd/callout.h | 2 +- usr.sbin/pppd/chap.c | 2 +- usr.sbin/pppd/chap.h | 2 +- usr.sbin/pppd/fsm.c | 2 +- usr.sbin/pppd/fsm.h | 2 +- usr.sbin/pppd/ipcp.c | 2 +- usr.sbin/pppd/ipcp.h | 2 +- usr.sbin/pppd/lcp.c | 2 +- usr.sbin/pppd/lcp.h | 2 +- usr.sbin/pppd/lock.c | 2 +- usr.sbin/pppd/magic.c | 2 +- usr.sbin/pppd/magic.h | 2 +- usr.sbin/pppd/main.c | 2 +- usr.sbin/pppd/options.c | 2 +- usr.sbin/pppd/patchlevel.h | 2 +- usr.sbin/pppd/pathnames.h | 2 +- usr.sbin/pppd/ppp.h | 2 +- usr.sbin/pppd/pppd.8 | 2 +- usr.sbin/pppd/pppd.h | 2 +- usr.sbin/pppd/sys-bsd.c | 2 +- usr.sbin/pppd/upap.c | 2 +- usr.sbin/pppd/upap.h | 2 +- usr.sbin/pppstats/Makefile | 2 +- usr.sbin/pppstats/pppstats.c | 2 +- usr.sbin/pstat/pstat.8 | 2 +- usr.sbin/quot/Makefile | 2 +- usr.sbin/quot/quot.8 | 2 +- usr.sbin/quot/quot.c | 2 +- usr.sbin/rarpd/Makefile | 2 +- usr.sbin/rarpd/rarpd.8 | 2 +- usr.sbin/rarpd/rarpd.c | 2 +- usr.sbin/rndcontrol/random.4 | 2 +- usr.sbin/rndcontrol/rndcontrol.8 | 2 +- usr.sbin/rndcontrol/rndcontrol.c | 2 +- usr.sbin/rtprio/Makefile | 2 +- usr.sbin/rtprio/rtprio.1 | 2 +- usr.sbin/rtprio/rtprio.c | 2 +- usr.sbin/sa/Makefile | 2 +- usr.sbin/sa/extern.h | 2 +- usr.sbin/sa/main.c | 2 +- usr.sbin/sa/pathnames.h | 2 +- usr.sbin/sa/pdb.c | 2 +- usr.sbin/sa/sa.8 | 2 +- usr.sbin/sa/usrdb.c | 2 +- usr.sbin/sendmail/cf/README | 2 +- usr.sbin/sendmail/cf/cf/freebsd.mc | 2 +- usr.sbin/sendmail/cf/cf/freefall.mc | 2 +- usr.sbin/sendmail/contrib/expn.pl | 2 +- usr.sbin/sgsc/Makefile | 2 +- usr.sbin/sicontrol/sicontrol.8 | 2 +- usr.sbin/sicontrol/sicontrol.c | 2 +- usr.sbin/slstat/Makefile | 2 +- usr.sbin/slstat/slstat.c | 2 +- usr.sbin/stallion/Makefile | 2 +- usr.sbin/stallion/Makefile.inc | 2 +- usr.sbin/stallion/bootcode/Makefile | 2 +- usr.sbin/stallion/stlload/Makefile | 2 +- usr.sbin/stallion/stlload/stlload.c | 2 +- usr.sbin/stallion/stlstats/Makefile | 2 +- usr.sbin/stallion/stlstats/stlstats.c | 2 +- usr.sbin/sup/Makefile | 2 +- usr.sbin/sup/Makefile.inc | 2 +- usr.sbin/sup/lib/Makefile | 2 +- usr.sbin/sup/lib/libc.h | 3 + usr.sbin/sup/lib/log.c | 3 + usr.sbin/sup/lib/netcryptvoid.c | 5 + usr.sbin/sup/lib/quit.c | 5 + usr.sbin/sup/lib/run.c | 3 + usr.sbin/sup/lib/scan.c | 3 + usr.sbin/sup/lib/scm.c | 3 + usr.sbin/sup/lib/scmio.c | 3 + usr.sbin/sup/lib/stree.c | 3 + usr.sbin/sup/lib/sup.h | 3 + usr.sbin/sup/lib/supmsg.c | 3 + usr.sbin/sup/lib/supmsg.h | 3 + usr.sbin/sup/sup/Makefile | 2 +- usr.sbin/sup/sup/sup.1 | 9 + usr.sbin/sup/sup/supcdefs.h | 3 + usr.sbin/sup/sup/supcmain.c | 3 + usr.sbin/sup/sup/supcmeat.c | 3 + usr.sbin/sup/sup/supcmisc.c | 5 + usr.sbin/sup/sup/supcname.c | 5 + usr.sbin/sup/sup/supcparse.c | 3 + usr.sbin/sup/sup/supcvers.c | 5 + usr.sbin/sup/supfilesrv/Makefile | 2 +- usr.sbin/sup/supfilesrv/supfilesrv.c | 7 + usr.sbin/sup/supfilesrv/supservers.8 | 3 + usr.sbin/sup/supscan/Makefile | 2 +- usr.sbin/sup/supscan/supscan.c | 3 + usr.sbin/sysctl/sysctl.8 | 2 +- usr.sbin/sysctl/sysctl.c | 2 +- usr.sbin/tcpdump/tcpdump/Makefile | 2 +- usr.sbin/tcpdump/tcpdump/addrtoname.c | 2 +- usr.sbin/tcpdump/tcpdump/addrtoname.h | 2 +- usr.sbin/tcpdump/tcpdump/appletalk.h | 2 +- usr.sbin/tcpdump/tcpdump/bootp.h | 2 +- usr.sbin/tcpdump/tcpdump/bpf_dump.c | 2 +- usr.sbin/tcpdump/tcpdump/decnet.h | 2 +- usr.sbin/tcpdump/tcpdump/ethertype.h | 2 +- usr.sbin/tcpdump/tcpdump/extract.h | 2 +- usr.sbin/tcpdump/tcpdump/fddi.h | 2 +- usr.sbin/tcpdump/tcpdump/interface.h | 2 +- usr.sbin/tcpdump/tcpdump/ipx.h | 2 +- usr.sbin/tcpdump/tcpdump/llc.h | 2 +- usr.sbin/tcpdump/tcpdump/md.h | 2 +- usr.sbin/tcpdump/tcpdump/nfsfh.h | 2 +- usr.sbin/tcpdump/tcpdump/ntp.h | 2 +- usr.sbin/tcpdump/tcpdump/os.h | 2 +- usr.sbin/tcpdump/tcpdump/parsenfsfh.c | 2 +- usr.sbin/tcpdump/tcpdump/print-arp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-atalk.c | 2 +- usr.sbin/tcpdump/tcpdump/print-bootp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-decnet.c | 2 +- usr.sbin/tcpdump/tcpdump/print-domain.c | 2 +- usr.sbin/tcpdump/tcpdump/print-egp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ether.c | 2 +- usr.sbin/tcpdump/tcpdump/print-fddi.c | 2 +- usr.sbin/tcpdump/tcpdump/print-icmp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ip.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ipx.c | 2 +- usr.sbin/tcpdump/tcpdump/print-isoclns.c | 2 +- usr.sbin/tcpdump/tcpdump/print-krb.c | 2 +- usr.sbin/tcpdump/tcpdump/print-llc.c | 2 +- usr.sbin/tcpdump/tcpdump/print-nfs.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ntp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-null.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ospf.c | 2 +- usr.sbin/tcpdump/tcpdump/print-ppp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-rip.c | 2 +- usr.sbin/tcpdump/tcpdump/print-sl.c | 2 +- usr.sbin/tcpdump/tcpdump/print-snmp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-sunrpc.c | 2 +- usr.sbin/tcpdump/tcpdump/print-tcp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-tftp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-udp.c | 2 +- usr.sbin/tcpdump/tcpdump/print-wb.c | 2 +- usr.sbin/tcpdump/tcpdump/tcpdump.1 | 2 +- usr.sbin/tcpdump/tcpdump/tcpdump.c | 2 +- usr.sbin/tcpdump/tcpdump/util.c | 2 +- usr.sbin/tcpdump/tcpslice/gwtm2secs.c | 2 +- usr.sbin/tcpdump/tcpslice/search.c | 2 +- usr.sbin/tcpdump/tcpslice/tcpslice.1 | 2 +- usr.sbin/tcpdump/tcpslice/tcpslice.c | 2 +- usr.sbin/tcpdump/tcpslice/util.c | 2 +- usr.sbin/timed/timed/acksend.c | 2 +- usr.sbin/timed/timed/byteorder.c | 2 +- usr.sbin/timed/timed/candidate.c | 2 +- usr.sbin/timed/timed/cksum.c | 2 +- usr.sbin/timed/timed/correct.c | 2 +- usr.sbin/timed/timed/globals.h | 2 +- usr.sbin/timed/timed/master.c | 2 +- usr.sbin/timed/timed/measure.c | 2 +- usr.sbin/timed/timed/networkdelta.c | 2 +- usr.sbin/timed/timed/readmsg.c | 2 +- usr.sbin/timed/timed/slave.c | 2 +- usr.sbin/timed/timed/timed.c | 2 +- usr.sbin/timed/timedc/cmds.c | 2 +- usr.sbin/timed/timedc/timedc.c | 2 +- usr.sbin/tzsetup/Makefile | 2 +- usr.sbin/tzsetup/main.c | 2 +- usr.sbin/tzsetup/tzmenu.c | 2 +- usr.sbin/tzsetup/tzsetup.8 | 2 +- usr.sbin/tzsetup/tzsetup.h | 2 +- usr.sbin/vidcontrol/decode.c | 2 +- usr.sbin/vidcontrol/vidcontrol.c | 2 +- usr.sbin/vnconfig/Makefile | 2 +- usr.sbin/wormcontrol/wormcontrol.8 | 2 +- usr.sbin/wormcontrol/wormcontrol.c | 2 +- usr.sbin/xntpd/Makefile | 2 +- usr.sbin/xntpd/README.FreeBSD | 2 +- usr.sbin/xntpd/authstuff/Makefile | 2 +- usr.sbin/xntpd/clockstuff/Makefile | 2 +- usr.sbin/xntpd/kernel/chuinit.c | 2 +- usr.sbin/xntpd/kernel/clkinit.c | 2 +- usr.sbin/xntpd/lib/Makefile | 2 +- usr.sbin/xntpd/lib/machines.c | 2 +- usr.sbin/xntpd/ntpdate/Makefile | 2 +- usr.sbin/xntpd/ntpq/Makefile | 2 +- usr.sbin/xntpd/ntptrace/Makefile | 2 +- usr.sbin/xntpd/parse/Makefile | 2 +- usr.sbin/xntpd/parse/clk_trimtaip.c | 6 +- usr.sbin/xntpd/parse/clk_trimtsip.c | 6 +- usr.sbin/xntpd/parse/util/Makefile | 2 +- usr.sbin/xntpd/parse/util/parsetest.c | 3 + usr.sbin/xntpd/util/Makefile | 2 +- usr.sbin/xntpd/xntpd/Makefile | 2 +- usr.sbin/xntpd/xntpdc/Makefile | 2 +- usr.sbin/ypbind/Makefile | 2 +- usr.sbin/ypbind/ypbind.8 | 2 +- usr.sbin/ypbind/ypbind.c | 2 +- usr.sbin/yppoll/Makefile | 2 +- usr.sbin/ypset/Makefile | 2 +- usr.sbin/zic/Makefile | 2 +- usr.sbin/zic/Makefile.inc | 2 +- usr.sbin/zic/zdump/Makefile | 2 +- usr.sbin/zic/zic/Makefile | 2 +- 4008 files changed, 9332 insertions(+), 81094 deletions(-) delete mode 100644 eBones/Copyright.MIT delete mode 100644 eBones/Copyright.SIPB delete mode 100644 eBones/Makefile delete mode 100644 eBones/Makefile.inc delete mode 100644 eBones/README.PATCH delete mode 100644 eBones/include/ChangeLog delete mode 100644 eBones/include/Makefile delete mode 100644 eBones/include/addr_comp.h delete mode 100644 eBones/include/admin_server.h delete mode 100644 eBones/include/conf-bsd386i.h delete mode 100644 eBones/include/conf-bsdapollo.h delete mode 100644 eBones/include/conf-bsdibm032.h delete mode 100644 eBones/include/conf-bsdm68k.h delete mode 100644 eBones/include/conf-bsdsparc.h delete mode 100644 eBones/include/conf-bsdtahoe.h delete mode 100644 eBones/include/conf-bsdvax.h delete mode 100644 eBones/include/conf-ibm370.h delete mode 100644 eBones/include/conf-pc.h delete mode 100644 eBones/include/conf-pyr.h delete mode 100644 eBones/include/conf-ultmips2.h delete mode 100644 eBones/include/conf.h delete mode 100644 eBones/include/highc.h delete mode 100644 eBones/include/kdc.h delete mode 100644 eBones/include/klog.h delete mode 100644 eBones/include/kparse.h delete mode 100644 eBones/include/krb.h delete mode 100644 eBones/include/krb_conf.h delete mode 100644 eBones/include/krb_db.h delete mode 100644 eBones/include/lsb_addr_comp.h delete mode 100644 eBones/include/osconf.h delete mode 100644 eBones/include/passwd_server.h delete mode 100644 eBones/include/principal.h delete mode 100644 eBones/include/prot.h delete mode 100644 eBones/include/rkinit.h delete mode 100644 eBones/include/rkinit_private.h delete mode 100644 eBones/lib/Makefile delete mode 100644 eBones/lib/Makefile.inc delete mode 100644 eBones/lib/libacl/Makefile delete mode 100644 eBones/lib/libacl/acl_check.3 delete mode 100644 eBones/lib/libacl/acl_files.c delete mode 100644 eBones/lib/libacl/acl_files.doc delete mode 100644 eBones/lib/libkadm/EXPORTABLE delete mode 100644 eBones/lib/libkadm/Makefile delete mode 100644 eBones/lib/libkadm/kadm.h delete mode 100644 eBones/lib/libkadm/kadm_cli_wrap.c delete mode 100644 eBones/lib/libkadm/kadm_err.et delete mode 100644 eBones/lib/libkadm/kadm_stream.c delete mode 100644 eBones/lib/libkadm/kadm_supp.c delete mode 100644 eBones/lib/libkdb/Makefile delete mode 100644 eBones/lib/libkdb/krb_cache.c delete mode 100644 eBones/lib/libkdb/krb_dbl.c delete mode 100644 eBones/lib/libkdb/krb_dbm.c delete mode 100644 eBones/lib/libkdb/krb_kdb_utils.c delete mode 100644 eBones/lib/libkdb/krb_lib.c delete mode 100644 eBones/lib/libkdb/print_princ.c delete mode 100644 eBones/lib/libkrb/Makefile delete mode 100644 eBones/lib/libkrb/add_ticket.c delete mode 100644 eBones/lib/libkrb/create_auth_reply.c delete mode 100644 eBones/lib/libkrb/create_ciph.c delete mode 100644 eBones/lib/libkrb/create_death_packet.c delete mode 100644 eBones/lib/libkrb/create_ticket.c delete mode 100644 eBones/lib/libkrb/debug_decl.c delete mode 100644 eBones/lib/libkrb/decomp_ticket.c delete mode 100644 eBones/lib/libkrb/des_rw.c delete mode 100644 eBones/lib/libkrb/dest_tkt.c delete mode 100644 eBones/lib/libkrb/extract_ticket.c delete mode 100644 eBones/lib/libkrb/fgetst.c delete mode 100644 eBones/lib/libkrb/get_ad_tkt.c delete mode 100644 eBones/lib/libkrb/get_admhst.c delete mode 100644 eBones/lib/libkrb/get_cred.c delete mode 100644 eBones/lib/libkrb/get_in_tkt.c delete mode 100644 eBones/lib/libkrb/get_krbhst.c delete mode 100644 eBones/lib/libkrb/get_krbrlm.c delete mode 100644 eBones/lib/libkrb/get_phost.c delete mode 100644 eBones/lib/libkrb/get_pw_tkt.c delete mode 100644 eBones/lib/libkrb/get_request.c delete mode 100644 eBones/lib/libkrb/get_svc_in_tkt.c delete mode 100644 eBones/lib/libkrb/get_tf_fullname.c delete mode 100644 eBones/lib/libkrb/get_tf_realm.c delete mode 100644 eBones/lib/libkrb/getrealm.c delete mode 100644 eBones/lib/libkrb/getst.c delete mode 100644 eBones/lib/libkrb/in_tkt.c delete mode 100644 eBones/lib/libkrb/k_gethostname.c delete mode 100644 eBones/lib/libkrb/klog.c delete mode 100644 eBones/lib/libkrb/kname_parse.c delete mode 100644 eBones/lib/libkrb/kntoln.c delete mode 100644 eBones/lib/libkrb/kparse.c delete mode 100644 eBones/lib/libkrb/krb.3 delete mode 100644 eBones/lib/libkrb/krb_err.et delete mode 100644 eBones/lib/libkrb/krb_err_txt.c delete mode 100644 eBones/lib/libkrb/krb_get_in_tkt.c delete mode 100644 eBones/lib/libkrb/krb_realmofhost.3 delete mode 100644 eBones/lib/libkrb/krb_sendauth.3 delete mode 100644 eBones/lib/libkrb/krb_set_tkt_string.3 delete mode 100644 eBones/lib/libkrb/krbglue.c delete mode 100644 eBones/lib/libkrb/kuserok.3 delete mode 100644 eBones/lib/libkrb/kuserok.c delete mode 100644 eBones/lib/libkrb/log.c delete mode 100644 eBones/lib/libkrb/mk_err.c delete mode 100644 eBones/lib/libkrb/mk_priv.c delete mode 100644 eBones/lib/libkrb/mk_req.c delete mode 100644 eBones/lib/libkrb/mk_safe.c delete mode 100644 eBones/lib/libkrb/month_sname.c delete mode 100644 eBones/lib/libkrb/netread.c delete mode 100644 eBones/lib/libkrb/netwrite.c delete mode 100644 eBones/lib/libkrb/one.c delete mode 100644 eBones/lib/libkrb/pkt_cipher.c delete mode 100644 eBones/lib/libkrb/pkt_clen.c delete mode 100644 eBones/lib/libkrb/rd_err.c delete mode 100644 eBones/lib/libkrb/rd_priv.c delete mode 100644 eBones/lib/libkrb/rd_req.c delete mode 100644 eBones/lib/libkrb/rd_safe.c delete mode 100644 eBones/lib/libkrb/read_service_key.c delete mode 100644 eBones/lib/libkrb/recvauth.c delete mode 100644 eBones/lib/libkrb/save_credentials.c delete mode 100644 eBones/lib/libkrb/send_to_kdc.c delete mode 100644 eBones/lib/libkrb/sendauth.c delete mode 100644 eBones/lib/libkrb/stime.c delete mode 100644 eBones/lib/libkrb/tf_shm.c delete mode 100644 eBones/lib/libkrb/tf_util.3 delete mode 100644 eBones/lib/libkrb/tf_util.c delete mode 100644 eBones/lib/libkrb/tkt_string.c delete mode 100644 eBones/lib/libkrb/util.c delete mode 100644 eBones/lib/librkinit/Makefile delete mode 100644 eBones/lib/librkinit/rk_krb.c delete mode 100644 eBones/lib/librkinit/rk_lib.c delete mode 100644 eBones/lib/librkinit/rk_rpc.c delete mode 100644 eBones/lib/librkinit/rk_util.c delete mode 100644 eBones/lib/librkinit/rkinit.3 delete mode 100644 eBones/lib/librkinit/rkinit_err.et delete mode 100644 eBones/libexec/Makefile delete mode 100644 eBones/libexec/Makefile.inc delete mode 100644 eBones/libexec/kpropd/Makefile delete mode 100644 eBones/libexec/kpropd/kpropd.c delete mode 100644 eBones/libexec/registerd/Makefile delete mode 100644 eBones/libexec/registerd/registerd.8 delete mode 100644 eBones/libexec/registerd/registerd.c delete mode 100644 eBones/libexec/rkinitd/Makefile delete mode 100644 eBones/libexec/rkinitd/krb.c delete mode 100644 eBones/libexec/rkinitd/rkinitd.8 delete mode 100644 eBones/libexec/rkinitd/rkinitd.c delete mode 100644 eBones/libexec/rkinitd/rkinitd.h delete mode 100644 eBones/libexec/rkinitd/rpc.c delete mode 100644 eBones/libexec/rkinitd/util.c delete mode 100644 eBones/man/Makefile delete mode 100644 eBones/man/kerberos.1 delete mode 100644 eBones/man/krb.conf.5 delete mode 100644 eBones/man/krb.realms.5 delete mode 100644 eBones/patchlevel.h delete mode 100644 eBones/usr.bin/Makefile delete mode 100644 eBones/usr.bin/Makefile.inc delete mode 100644 eBones/usr.bin/kadmin/Makefile delete mode 100644 eBones/usr.bin/kadmin/kadmin.8 delete mode 100644 eBones/usr.bin/kadmin/kadmin.c delete mode 100644 eBones/usr.bin/kadmin/kadmin_cmds.ct delete mode 100644 eBones/usr.bin/kdestroy/Makefile delete mode 100644 eBones/usr.bin/kdestroy/kdestroy.1 delete mode 100644 eBones/usr.bin/kdestroy/kdestroy.c delete mode 100644 eBones/usr.bin/kinit/Makefile delete mode 100644 eBones/usr.bin/kinit/kinit.1 delete mode 100644 eBones/usr.bin/kinit/kinit.c delete mode 100644 eBones/usr.bin/klist/Makefile delete mode 100644 eBones/usr.bin/klist/klist.1 delete mode 100644 eBones/usr.bin/klist/klist.c delete mode 100644 eBones/usr.bin/ksrvtgt/Makefile delete mode 100644 eBones/usr.bin/ksrvtgt/ksrvtgt.1 delete mode 100644 eBones/usr.bin/ksrvtgt/ksrvtgt.c delete mode 100644 eBones/usr.bin/passwd/kpasswd.c delete mode 100644 eBones/usr.bin/register/Makefile delete mode 100644 eBones/usr.bin/register/pathnames.h delete mode 100644 eBones/usr.bin/register/register.1 delete mode 100644 eBones/usr.bin/register/register.c delete mode 100644 eBones/usr.bin/register/register_proto.h delete mode 100644 eBones/usr.bin/rkinit/Makefile delete mode 100644 eBones/usr.bin/rkinit/rkinit.1 delete mode 100644 eBones/usr.bin/rkinit/rkinit.c delete mode 100644 eBones/usr.sbin/Makefile delete mode 100644 eBones/usr.sbin/Makefile.inc delete mode 100644 eBones/usr.sbin/ext_srvtab/Makefile delete mode 100644 eBones/usr.sbin/ext_srvtab/ext_srvtab.8 delete mode 100644 eBones/usr.sbin/ext_srvtab/ext_srvtab.c delete mode 100644 eBones/usr.sbin/fix_kdb_keys/Makefile delete mode 100644 eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 delete mode 100644 eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.c delete mode 100644 eBones/usr.sbin/kadmind/Makefile delete mode 100644 eBones/usr.sbin/kadmind/admin_server.c delete mode 100644 eBones/usr.sbin/kadmind/kadm_funcs.c delete mode 100644 eBones/usr.sbin/kadmind/kadm_ser_wrap.c delete mode 100644 eBones/usr.sbin/kadmind/kadm_server.c delete mode 100644 eBones/usr.sbin/kadmind/kadm_server.h delete mode 100644 eBones/usr.sbin/kadmind/kadmind.8 delete mode 100644 eBones/usr.sbin/kdb_destroy/Makefile delete mode 100644 eBones/usr.sbin/kdb_destroy/kdb_destroy.8 delete mode 100644 eBones/usr.sbin/kdb_destroy/kdb_destroy.c delete mode 100644 eBones/usr.sbin/kdb_edit/Makefile delete mode 100644 eBones/usr.sbin/kdb_edit/kdb_edit.8 delete mode 100644 eBones/usr.sbin/kdb_edit/kdb_edit.c delete mode 100644 eBones/usr.sbin/kdb_edit/maketime.c delete mode 100644 eBones/usr.sbin/kdb_edit/time.h delete mode 100644 eBones/usr.sbin/kdb_init/Makefile delete mode 100644 eBones/usr.sbin/kdb_init/kdb_init.8 delete mode 100644 eBones/usr.sbin/kdb_init/kdb_init.c delete mode 100644 eBones/usr.sbin/kdb_util/Makefile delete mode 100644 eBones/usr.sbin/kdb_util/kdb_util.8 delete mode 100644 eBones/usr.sbin/kdb_util/kdb_util.c delete mode 100644 eBones/usr.sbin/kerberos/Makefile delete mode 100644 eBones/usr.sbin/kerberos/cr_err_reply.c delete mode 100644 eBones/usr.sbin/kerberos/kerberos.c delete mode 100644 eBones/usr.sbin/kprop/Makefile delete mode 100644 eBones/usr.sbin/kprop/kprop.c delete mode 100644 eBones/usr.sbin/kprop/kprop.h delete mode 100644 eBones/usr.sbin/ksrvutil/Makefile delete mode 100644 eBones/usr.sbin/ksrvutil/ksrvutil.8 delete mode 100644 eBones/usr.sbin/ksrvutil/ksrvutil.c delete mode 100644 eBones/usr.sbin/kstash/Makefile delete mode 100644 eBones/usr.sbin/kstash/kstash.8 delete mode 100644 eBones/usr.sbin/kstash/kstash.c delete mode 100644 eBones/usr.sbin/make_keypair/Makefile delete mode 100644 eBones/usr.sbin/make_keypair/make_keypair.8 delete mode 100644 eBones/usr.sbin/make_keypair/make_keypair.c mode change 100755 => 100644 etc/netstart create mode 100644 games/boggle/Makefile create mode 100644 games/boggle/README create mode 100644 games/boggle/boggle/Makefile create mode 100644 games/boggle/boggle/bog.c create mode 100644 games/boggle/boggle/bog.h create mode 100644 games/boggle/boggle/boggle.6 create mode 100644 games/boggle/boggle/extern.h create mode 100644 games/boggle/boggle/help.c create mode 100644 games/boggle/boggle/helpfile create mode 100644 games/boggle/boggle/mach.c create mode 100644 games/boggle/boggle/prtable.c create mode 100644 games/boggle/boggle/timer.c create mode 100644 games/boggle/boggle/word.c create mode 100644 games/boggle/mkdict/Makefile create mode 100644 games/boggle/mkdict/mkdict.c create mode 100644 games/boggle/mkindex/Makefile create mode 100644 games/boggle/mkindex/mkindex.c create mode 100644 games/tetris/Makefile create mode 100644 games/tetris/input.c create mode 100644 games/tetris/input.h create mode 100644 games/tetris/pathnames.h create mode 100644 games/tetris/scores.c create mode 100644 games/tetris/scores.h create mode 100644 games/tetris/screen.c create mode 100644 games/tetris/screen.h create mode 100644 games/tetris/shapes.c create mode 100644 games/tetris/tetris.6 create mode 100644 games/tetris/tetris.c create mode 100644 games/tetris/tetris.h delete mode 100644 secure/Makefile delete mode 100644 secure/Makefile.inc delete mode 100644 secure/lib/Makefile delete mode 100644 secure/lib/Makefile.inc delete mode 100644 secure/lib/libcipher/Makefile delete mode 100644 secure/lib/libcipher/README delete mode 100644 secure/lib/libcipher/README.FreeBSD delete mode 100644 secure/lib/libcipher/cipher.3 delete mode 100644 secure/lib/libcipher/crypt.c delete mode 100644 secure/lib/libcipher/test/Makefile delete mode 100644 secure/lib/libcipher/test/README delete mode 100644 secure/lib/libcipher/test/cert.c delete mode 100644 secure/lib/libcipher/test/cert.input delete mode 100644 secure/lib/libcipher/test/speedcrypt.c delete mode 100644 secure/lib/libcipher/test/speeddes.c delete mode 100644 secure/lib/libcrypt/Makefile delete mode 100644 secure/lib/libcrypt/README delete mode 100644 secure/lib/libcrypt/README.FreeBSD delete mode 100644 secure/lib/libcrypt/crypt-md5.c delete mode 100644 secure/lib/libcrypt/crypt.3 delete mode 100644 secure/lib/libcrypt/crypt.c delete mode 100644 secure/lib/libcrypt/test/Makefile delete mode 100644 secure/lib/libcrypt/test/README delete mode 100644 secure/lib/libcrypt/test/cert.c delete mode 100644 secure/lib/libcrypt/test/cert.input delete mode 100644 secure/lib/libcrypt/test/speedcrypt.c delete mode 100644 secure/lib/libdes/COPYRIGHT delete mode 100644 secure/lib/libdes/DES.pm delete mode 100644 secure/lib/libdes/DES.pod delete mode 100644 secure/lib/libdes/DES.xs delete mode 100644 secure/lib/libdes/FILES delete mode 100644 secure/lib/libdes/GNUmakefile delete mode 100644 secure/lib/libdes/INSTALL delete mode 100644 secure/lib/libdes/Imakefile delete mode 100644 secure/lib/libdes/KERBEROS delete mode 100644 secure/lib/libdes/MODES.DES delete mode 100644 secure/lib/libdes/Makefile delete mode 100644 secure/lib/libdes/Makefile.PL delete mode 100644 secure/lib/libdes/Makefile.ssl delete mode 100644 secure/lib/libdes/Makefile.uni delete mode 100644 secure/lib/libdes/PC1 delete mode 100644 secure/lib/libdes/PC2 delete mode 100644 secure/lib/libdes/README delete mode 100644 secure/lib/libdes/VERSION delete mode 100644 secure/lib/libdes/cbc3_enc.c delete mode 100644 secure/lib/libdes/cbc_cksm.c delete mode 100644 secure/lib/libdes/cbc_enc.c delete mode 100644 secure/lib/libdes/cfb64ede.c delete mode 100644 secure/lib/libdes/cfb64enc.c delete mode 100644 secure/lib/libdes/cfb_enc.c delete mode 100644 secure/lib/libdes/des.c delete mode 100644 secure/lib/libdes/des.doc delete mode 100644 secure/lib/libdes/des.h delete mode 100644 secure/lib/libdes/des.man delete mode 100755 secure/lib/libdes/des.pl delete mode 100644 secure/lib/libdes/des_crypt.man delete mode 100644 secure/lib/libdes/des_locl.h delete mode 100644 secure/lib/libdes/des_locl.org delete mode 100644 secure/lib/libdes/destest.c delete mode 100644 secure/lib/libdes/doIP delete mode 100644 secure/lib/libdes/doPC1 delete mode 100644 secure/lib/libdes/doPC2 delete mode 100644 secure/lib/libdes/ecb3_enc.c delete mode 100644 secure/lib/libdes/ecb_enc.c delete mode 100644 secure/lib/libdes/ede_enc.c delete mode 100644 secure/lib/libdes/enc_read.c delete mode 100644 secure/lib/libdes/enc_writ.c delete mode 100644 secure/lib/libdes/fcrypt.c delete mode 100644 secure/lib/libdes/makefile.bc delete mode 100644 secure/lib/libdes/ncbc_enc.c delete mode 100644 secure/lib/libdes/new_rkey.c delete mode 100644 secure/lib/libdes/ofb64ede.c delete mode 100644 secure/lib/libdes/ofb64enc.c delete mode 100644 secure/lib/libdes/ofb_enc.c delete mode 100644 secure/lib/libdes/pcbc_enc.c delete mode 100644 secure/lib/libdes/podd.h delete mode 100644 secure/lib/libdes/qud_cksm.c delete mode 100644 secure/lib/libdes/rand_key.c delete mode 100644 secure/lib/libdes/read_pwd.c delete mode 100644 secure/lib/libdes/rpc_des.h delete mode 100644 secure/lib/libdes/rpc_enc.c delete mode 100644 secure/lib/libdes/rpw.c delete mode 100644 secure/lib/libdes/set_key.c delete mode 100755 secure/lib/libdes/shifts.pl delete mode 100644 secure/lib/libdes/sk.h delete mode 100644 secure/lib/libdes/speed.c delete mode 100644 secure/lib/libdes/spr.h delete mode 100644 secure/lib/libdes/str2key.c delete mode 100644 secure/lib/libdes/supp.c delete mode 100644 secure/lib/libdes/t/perl delete mode 100644 secure/lib/libdes/t/test delete mode 100755 secure/lib/libdes/testdes.pl delete mode 100644 secure/lib/libdes/times delete mode 100644 secure/lib/libdes/typemap delete mode 100644 secure/lib/libdes/version.h delete mode 100644 secure/lib/libdes/vms.com delete mode 100644 secure/lib/libtelnet/Makefile delete mode 100644 secure/lib/libtelnet/auth-proto.h delete mode 100644 secure/lib/libtelnet/auth.c delete mode 100644 secure/lib/libtelnet/auth.h delete mode 100644 secure/lib/libtelnet/enc-proto.h delete mode 100644 secure/lib/libtelnet/enc_des.c delete mode 100644 secure/lib/libtelnet/encrypt.c delete mode 100644 secure/lib/libtelnet/encrypt.h delete mode 100644 secure/lib/libtelnet/genget.c delete mode 100644 secure/lib/libtelnet/getent.c delete mode 100644 secure/lib/libtelnet/kerberos.c delete mode 100644 secure/lib/libtelnet/kerberos5.c delete mode 100644 secure/lib/libtelnet/key-proto.h delete mode 100644 secure/lib/libtelnet/krb4encpwd.c delete mode 100644 secure/lib/libtelnet/misc-proto.h delete mode 100644 secure/lib/libtelnet/misc.c delete mode 100644 secure/lib/libtelnet/misc.h delete mode 100644 secure/lib/libtelnet/read_password.c delete mode 100644 secure/lib/libtelnet/rsaencpwd.c delete mode 100644 secure/lib/libtelnet/spx.c delete mode 100644 secure/libexec/Makefile.inc delete mode 100644 secure/libexec/telnetd/Makefile delete mode 100644 secure/libexec/telnetd/authenc.c delete mode 100644 secure/libexec/telnetd/defs.h delete mode 100644 secure/libexec/telnetd/ext.h delete mode 100644 secure/libexec/telnetd/global.c delete mode 100644 secure/libexec/telnetd/pathnames.h delete mode 100644 secure/libexec/telnetd/slc.c delete mode 100644 secure/libexec/telnetd/state.c delete mode 100644 secure/libexec/telnetd/sys_term.c delete mode 100644 secure/libexec/telnetd/telnetd.8 delete mode 100644 secure/libexec/telnetd/telnetd.c delete mode 100644 secure/libexec/telnetd/telnetd.h delete mode 100644 secure/libexec/telnetd/termstat.c delete mode 100644 secure/libexec/telnetd/utility.c delete mode 100644 secure/usr.bin/Makefile delete mode 100644 secure/usr.bin/Makefile.inc delete mode 100644 secure/usr.bin/bdes/Makefile delete mode 100644 secure/usr.bin/bdes/bdes.1 delete mode 100644 secure/usr.bin/bdes/bdes.c delete mode 100644 secure/usr.bin/bdes/bdes.ps delete mode 100644 secure/usr.bin/telnet/Makefile delete mode 100644 secure/usr.bin/telnet/README delete mode 100644 secure/usr.bin/telnet/authenc.c delete mode 100644 secure/usr.bin/telnet/commands.c delete mode 100644 secure/usr.bin/telnet/defines.h delete mode 100644 secure/usr.bin/telnet/externs.h delete mode 100644 secure/usr.bin/telnet/fdset.h delete mode 100644 secure/usr.bin/telnet/general.h delete mode 100644 secure/usr.bin/telnet/main.c delete mode 100644 secure/usr.bin/telnet/network.c delete mode 100644 secure/usr.bin/telnet/ring.c delete mode 100644 secure/usr.bin/telnet/ring.h delete mode 100644 secure/usr.bin/telnet/sys_bsd.c delete mode 100644 secure/usr.bin/telnet/telnet.1 delete mode 100644 secure/usr.bin/telnet/telnet.c delete mode 100644 secure/usr.bin/telnet/terminal.c delete mode 100644 secure/usr.bin/telnet/tn3270.c delete mode 100644 secure/usr.bin/telnet/types.h delete mode 100644 secure/usr.bin/telnet/utilities.c delete mode 100644 secure/usr.sbin/xntpd/lib/authdes.c delete mode 100644 sys/sys/link_aout.h delete mode 100644 sys/sys/link_elf.h delete mode 100644 sys/sys/nlist_aout.h create mode 100644 usr.bin/vi/USD.doc/vi.ref/index diff --git a/Makefile b/Makefile index 50b989e410242..82ad555fb0c67 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.57.4.18 1996/08/11 03:05:16 rgrimes Exp $ +# $Id: Makefile,v 1.57.4.19 1996/11/08 06:08:10 jkh Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include and MOST of /usr/lib diff --git a/TODO b/TODO index f1711db91371b..bdf3cde1fd23a 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -; $Id: TODO,v 1.12 1995/04/23 21:34:23 paul Exp $ +; $Id: TODO,v 1.12.4.1 1996/03/22 21:27:44 nate Exp $ ** To skip this preamble, search forward for the pattern `**'. diff --git a/bin/Makefile b/bin/Makefile index e2c4bcc8af209..fe9771a5ab923 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.2 1994/09/18 21:25:26 wollman Exp $ +# $Id: Makefile,v 1.2.6.2 1996/06/05 02:35:06 jkh Exp $ SUBDIR= cat chmod cp csh date dd df domainname echo ed expr hostname \ kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \ diff --git a/bin/Makefile.inc b/bin/Makefile.inc index b053cc93d6dc1..39a3eacd3e1af 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $Id: Makefile.inc,v 1.7 1996/09/22 21:51:04 wosch Exp $ +# $Id: Makefile.inc,v 1.4.6.3 1996/11/24 09:30:28 joerg Exp $ BINDIR?= /bin NOSHARED?= YES diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 6da43b3828af3..7f4221e97ac10 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:53:25 davidg Exp $ PROG= cat diff --git a/bin/cat/cat.1 b/bin/cat/cat.1 index 05402f22a73bd..c18503459f1a3 100644 --- a/bin/cat/cat.1 +++ b/bin/cat/cat.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.1 (Berkeley) 6/29/93 -.\" $Id$ +.\" $Id: cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp $ .\" .Dd June 29, 1993 .Dt CAT 1 diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 3d3b210cc31f7..58f3eb298827c 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cat.c,v 1.3 1995/10/03 12:46:37 bde Exp $ + * $Id: cat.c,v 1.2.6.1 1995/10/05 07:20:59 davidg Exp $ */ #ifndef lint diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile index dc9390bb289f9..74c1dec8bd549 100644 --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:53:36 davidg Exp $ PROG= chmod diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1 index 60974ef533630..fcde87dbdab6a 100644 --- a/bin/chmod/chmod.1 +++ b/bin/chmod/chmod.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $Id: chmod.1,v 1.2 1994/09/24 02:53:37 davidg Exp $ +.\" $Id: chmod.1,v 1.2.6.1 1996/05/29 22:18:03 jkh Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index c02994df9bd75..979519eb3c1c3 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: chmod.c,v 1.3 1995/02/03 22:21:09 bde Exp $ + * $Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp $ */ #ifndef lint diff --git a/bin/cp/Makefile b/bin/cp/Makefile index 57883daad0d18..48c253b5153a3 100644 --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:53:39 davidg Exp $ PROG= cp SRCS= cp.c utils.c diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index fad0c0acc72ea..d8d4e73b0f141 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $Id: cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp $ +.\" $Id: cp.1,v 1.2.6.2 1996/06/05 02:35:09 jkh Exp $ .\" .Dd April 18, 1994 .Dt CP 1 diff --git a/bin/cp/cp.c b/bin/cp/cp.c index cfbcd5636f3a2..86539e9f86987 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cp.c,v 1.6 1995/05/30 00:06:21 rgrimes Exp $ + * $Id: cp.c,v 1.6.4.2 1996/06/05 02:35:10 jkh Exp $ */ #ifndef lint diff --git a/bin/cp/extern.h b/bin/cp/extern.h index d97d76aa46d6b..ae6d4dcd7e433 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $Id: extern.h,v 1.2 1994/09/24 02:53:41 davidg Exp $ + * $Id: extern.h,v 1.2.6.2 1996/06/05 02:35:10 jkh Exp $ */ typedef struct { diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 0f2c100c6a4b7..593335a42b45d 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: utils.c,v 1.3.4.2 1995/10/05 07:24:24 davidg Exp $ + * $Id: utils.c,v 1.3.4.4 1996/06/05 02:35:11 jkh Exp $ */ #ifndef lint diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 2bf842dde0746..bc35a56187754 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.5 1994/09/24 02:53:44 davidg Exp $ # # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria diff --git a/bin/csh/USD.doc/Makefile b/bin/csh/USD.doc/Makefile index c85e280415075..f0aa8fb0f0fe9 100644 --- a/bin/csh/USD.doc/Makefile +++ b/bin/csh/USD.doc/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp $ DIR= usd/04.csh SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1 index 6bc0856b59322..cea97f9b3ef20 100644 --- a/bin/csh/USD.doc/csh.1 +++ b/bin/csh/USD.doc/csh.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.1 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp $ .\" .EH 'USD:4-%''An Introduction to the C shell' .OH 'An Introduction to the C shell''USD:4-%' diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2 index 88711139d3624..1cdaccfda3395 100644 --- a/bin/csh/USD.doc/csh.2 +++ b/bin/csh/USD.doc/csh.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.2 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp $ .\" .nr H1 1 .NH diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3 index d6e3819c55d9f..26fa4963b88c9 100644 --- a/bin/csh/USD.doc/csh.3 +++ b/bin/csh/USD.doc/csh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.3 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.3,v 1.2 1994/09/24 02:54:26 davidg Exp $ .\" .nr H1 2 .NH diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4 index 2b2aaa9920a03..941b1c5029646 100644 --- a/bin/csh/USD.doc/csh.4 +++ b/bin/csh/USD.doc/csh.4 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.4 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.4,v 1.2 1994/09/24 02:54:27 davidg Exp $ .\" .nr H1 3 .NH diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a index f01312a41b94d..28b1264f9f74f 100644 --- a/bin/csh/USD.doc/csh.a +++ b/bin/csh/USD.doc/csh.a @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.a 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.a,v 1.2 1994/09/24 02:54:28 davidg Exp $ .\" .SH Appendix \- Special characters diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g index ac27152bccd63..51a600d6f7b77 100644 --- a/bin/csh/USD.doc/csh.g +++ b/bin/csh/USD.doc/csh.g @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.g 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: csh.g,v 1.2 1994/09/24 02:54:31 davidg Exp $ .\" .SH Glossary diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs index 84deab72a15f2..e7b6218d397fc 100644 --- a/bin/csh/USD.doc/tabs +++ b/bin/csh/USD.doc/tabs @@ -30,6 +30,6 @@ .\" SUCH DAMAGE. .\" .\" @(#)tabs 8.1 (Berkeley) 6/8/93 -.\" $Id$ +.\" $Id: tabs,v 1.2 1994/09/24 02:54:32 davidg Exp $ .\" .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c index 3c4a1869ff419..34b375481cfbb 100644 --- a/bin/csh/alloc.c +++ b/bin/csh/alloc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $ + * $Id: alloc.c,v 1.4 1995/05/30 00:06:28 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/char.c b/bin/csh/char.c index 5e1a1e4a6bc07..ee2679e14deee 100644 --- a/bin/csh/char.c +++ b/bin/csh/char.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: char.c,v 1.2 1994/09/24 02:53:46 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/char.h b/bin/csh/char.h index 9fba6f7157bf8..133a6ef36639e 100644 --- a/bin/csh/char.h +++ b/bin/csh/char.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)char.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: char.h,v 1.2 1994/09/24 02:53:47 davidg Exp $ */ #include diff --git a/bin/csh/const.c b/bin/csh/const.c index 7a6df42c26a64..c7aa23b08b18b 100644 --- a/bin/csh/const.c +++ b/bin/csh/const.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $ + * $Id: const.c,v 1.3.4.2 1996/06/05 02:35:13 jkh Exp $ */ #ifndef lint diff --git a/bin/csh/csh.1 b/bin/csh/csh.1 index 7f179d85a4662..b051022836326 100644 --- a/bin/csh/csh.1 +++ b/bin/csh/csh.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.1 8.2 (Berkeley) 1/21/94 -.\" $Id: csh.1,v 1.3 1995/05/06 13:52:29 ache Exp $ +.\" $Id: csh.1,v 1.3.4.2 1996/06/05 02:35:14 jkh Exp $ .\" .Dd January 21, 1994 .Dt CSH 1 diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 98a719b9c892d..aa573184e7fa7 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: csh.c,v 1.3.4.1 1995/08/25 02:55:47 davidg Exp $ + * $Id: csh.c,v 1.3.4.3 1996/06/05 02:35:15 jkh Exp $ */ #ifndef lint diff --git a/bin/csh/csh.h b/bin/csh/csh.h index 290262f5ca820..b58040d5944c2 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)csh.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: csh.h,v 1.2 1994/09/24 02:53:52 davidg Exp $ */ /* diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 4f8c44fc84605..e8fe9b7b97854 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $ + * $Id: dir.c,v 1.3.4.1 1995/08/25 02:57:08 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/dir.h b/bin/csh/dir.h index ec57104831cf1..5823901407114 100644 --- a/bin/csh/dir.h +++ b/bin/csh/dir.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: dir.h,v 1.2 1994/09/24 02:53:55 davidg Exp $ */ /* diff --git a/bin/csh/dol.c b/bin/csh/dol.c index 276ea2b59c134..7d5169ec9e426 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $ + * $Id: dol.c,v 1.3 1995/05/30 00:06:31 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/err.c b/bin/csh/err.c index 77ae9e055b979..b683309fe31f3 100644 --- a/bin/csh/err.c +++ b/bin/csh/err.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: err.c,v 1.2 1994/09/24 02:53:57 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/exec.c b/bin/csh/exec.c index d7750733a7faa..53a91b7bba2f0 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $ + * $Id: exec.c,v 1.3.4.1 1995/08/25 02:58:40 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/exp.c b/bin/csh/exp.c index ff484ce405dfe..eddc3956a6b4d 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: exp.c,v 1.2 1994/09/24 02:54:00 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/extern.h b/bin/csh/extern.h index f9ebd99aabe67..a0cb188924c70 100644 --- a/bin/csh/extern.h +++ b/bin/csh/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:54:02 davidg Exp $ */ #include diff --git a/bin/csh/file.c b/bin/csh/file.c index 639e09c000299..73b5d4f804b5d 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $ + * $Id: file.c,v 1.3.4.1 1995/08/25 03:01:01 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/func.c b/bin/csh/func.c index cdf1916593095..5f4e4465e34fd 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: func.c,v 1.3 1995/05/30 00:06:34 rgrimes Exp $ + * $Id: func.c,v 1.3.4.2 1996/06/05 02:35:16 jkh Exp $ */ #ifndef lint diff --git a/bin/csh/glob.c b/bin/csh/glob.c index 2dd0895911dc2..e5e16a5d51d33 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: glob.c,v 1.2 1994/09/24 02:54:05 davidg Exp $ + * $Id: glob.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/hist.c b/bin/csh/hist.c index c90dd66565a54..c92b7cb20757e 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: hist.c,v 1.2 1994/09/24 02:54:06 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/init.c b/bin/csh/init.c index cee64c6f64776..d15faaf9f66e4 100644 --- a/bin/csh/init.c +++ b/bin/csh/init.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: init.c,v 1.2 1994/09/24 02:54:07 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 940ccaedadabc..3fc7d64e389d3 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $ + * $Id: lex.c,v 1.3.4.1 1995/08/25 03:02:28 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 79d2f90344035..07f4c7d5e5f9b 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/parse.c b/bin/csh/parse.c index 5d0632e092b75..dad3d96f63663 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $ + * $Id: parse.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/pathnames.h b/bin/csh/pathnames.h index f1cf072c4a052..359e7d6ca6b1b 100644 --- a/bin/csh/pathnames.h +++ b/bin/csh/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: pathnames.h,v 1.2 1994/09/24 02:54:12 davidg Exp $ */ #define _PATH_BIN "/bin" diff --git a/bin/csh/proc.c b/bin/csh/proc.c index d70d29ffc4e44..90e0250a8233c 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: proc.c,v 1.2 1994/09/24 02:54:13 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/proc.h b/bin/csh/proc.h index c621a742787f9..b62ad57b7f81a 100644 --- a/bin/csh/proc.h +++ b/bin/csh/proc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: proc.h,v 1.2 1994/09/24 02:54:14 davidg Exp $ */ /* diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 8216d5590d2a4..64e6d1b25ff28 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $ + * $Id: sem.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/set.c b/bin/csh/set.c index f1b5532c0f00d..233c868c8eaf2 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $ + * $Id: set.c,v 1.3.4.1 1995/08/25 02:55:49 davidg Exp $ */ #ifndef lint diff --git a/bin/csh/str.c b/bin/csh/str.c index d30b95ef7bad4..dc76df52f559e 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $ + * $Id: str.c,v 1.3 1995/05/30 00:06:39 rgrimes Exp $ */ #ifndef lint diff --git a/bin/csh/time.c b/bin/csh/time.c index 95de7d2b444b0..10a9daae1e44a 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $ + * $Id: time.c,v 1.5 1995/05/30 00:06:40 rgrimes Exp $ */ #ifndef lint diff --git a/bin/date/Makefile b/bin/date/Makefile index 294aae0cc99b1..72e6369dd62e9 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:54:33 davidg Exp $ PROG= date SRCS= date.c netdate.c diff --git a/bin/date/date.1 b/bin/date/date.1 index e8946017864cc..306a571ec2cc0 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.2 (Berkeley) 11/17/93 -.\" $Id: date.1,v 1.5.4.1 1995/08/28 10:33:04 davidg Exp $ +.\" $Id: date.1,v 1.5.4.2 1996/03/12 05:32:12 nate Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 diff --git a/bin/date/date.c b/bin/date/date.c index af348ee15a929..dc6470d916b60 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: date.c,v 1.4.4.1 1995/08/28 10:31:25 davidg Exp $ + * $Id: date.c,v 1.4.4.3 1996/06/05 02:35:18 jkh Exp $ */ #ifndef lint diff --git a/bin/date/extern.h b/bin/date/extern.h index c21fdc63d0b28..560d2a9b4d169 100644 --- a/bin/date/extern.h +++ b/bin/date/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:54:37 davidg Exp $ */ int netsettime __P((time_t)); diff --git a/bin/date/netdate.c b/bin/date/netdate.c index 0f12aae5ddf57..08f6de7316703 100644 --- a/bin/date/netdate.c +++ b/bin/date/netdate.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: netdate.c,v 1.2 1994/09/24 02:54:38 davidg Exp $ + * $Id: netdate.c,v 1.3 1995/05/30 00:06:41 rgrimes Exp $ */ #ifndef lint diff --git a/bin/dd/Makefile b/bin/dd/Makefile index 09158e5a81c06..4ddbc0c41b962 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:54:40 davidg Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c diff --git a/bin/dd/args.c b/bin/dd/args.c index 61b479451826a..d2268dcf83c08 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: args.c,v 1.3 1994/09/24 02:54:42 davidg Exp $ */ #ifndef lint diff --git a/bin/dd/conv.c b/bin/dd/conv.c index e87c396440da3..295d88b749fa7 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: conv.c,v 1.3 1994/09/24 02:54:44 davidg Exp $ */ #ifndef lint diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c index 2fb2bc6ec706e..3a617ae475f2d 100644 --- a/bin/dd/conv_tab.c +++ b/bin/dd/conv_tab.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $ + * $Id: conv_tab.c,v 1.3 1995/01/17 23:04:28 ache Exp $ */ #ifndef lint diff --git a/bin/dd/dd.1 b/bin/dd/dd.1 index 03897fb96c749..9fa49873c91b1 100644 --- a/bin/dd/dd.1 +++ b/bin/dd/dd.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $Id$ +.\" $Id: dd.1,v 1.2 1994/09/24 02:54:49 davidg Exp $ .\" .Dd January 13, 1994 .Dt DD 1 diff --git a/bin/dd/dd.c b/bin/dd/dd.c index 89f3d3a207f01..613d98f790558 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dd.c,v 1.4 1995/01/17 23:04:29 ache Exp $ + * $Id: dd.c,v 1.4.4.2 1996/06/05 02:35:21 jkh Exp $ */ #ifndef lint diff --git a/bin/dd/dd.h b/bin/dd/dd.h index 4ad97473e25d4..45c221112257a 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $Id$ + * $Id: dd.h,v 1.2 1994/09/24 02:54:54 davidg Exp $ */ /* Input/output stream state. */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 7445fee4b0831..192ca82e15430 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:54:57 davidg Exp $ */ #include diff --git a/bin/dd/misc.c b/bin/dd/misc.c index a135c85496a77..3d9a1c5582997 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp $ */ #ifndef lint diff --git a/bin/dd/position.c b/bin/dd/position.c index c50102241c996..6062a9d4283fe 100644 --- a/bin/dd/position.c +++ b/bin/dd/position.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: position.c,v 1.2 1994/09/24 02:55:03 davidg Exp $ */ #ifndef lint diff --git a/bin/df/Makefile b/bin/df/Makefile index 3023452049677..4f94ca71a1d5b 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/1/94 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:55:06 davidg Exp $ PROG= df BINGRP= operator diff --git a/bin/df/df.1 b/bin/df/df.1 index 4337ac1bc0d0a..f1f6b359b2f75 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.2 (Berkeley) 1/13/94 -.\" $Id$ +.\" $Id: df.1,v 1.3 1994/09/24 02:55:08 davidg Exp $ .\" .Dd January 13, 1994 .Dt DF 1 diff --git a/bin/df/df.c b/bin/df/df.c index 24e0442ef0633..f93c06f1ae7ae 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: df.c,v 1.7.4.2 1996/06/05 02:35:24 jkh Exp $ + * $Id: df.c,v 1.7.4.3 1996/06/11 04:38:08 bde Exp $ */ #ifndef lint diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile index 8274b61c0ad63..b54c69ab79115 100644 --- a/bin/domainname/Makefile +++ b/bin/domainname/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/18 21:23:35 wollman Exp $ PROG= domainname diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1 index 782e708edac6f..24ae17d3b4a09 100644 --- a/bin/domainname/domainname.1 +++ b/bin/domainname/domainname.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" $Id: domainname.1,v 1.1 1994/09/18 21:23:36 wollman Exp $ +.\" $Id: domainname.1,v 1.2 1995/01/14 17:02:33 ats Exp $ .\" .Dd September 18, 1994 .Dt DOMAINNAME 1 diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 4295ec5bff27e..335b5d77b85ff 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; */ static const char rcsid[] = - "$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $"; + "$Id: domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp $"; #endif /* not lint */ #include diff --git a/bin/echo/Makefile b/bin/echo/Makefile index c296871792c5b..b562b331c319e 100644 --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:55:15 davidg Exp $ PROG= echo diff --git a/bin/echo/echo.1 b/bin/echo/echo.1 index e97ac08c837cb..93ed1fdb7ac7a 100644 --- a/bin/echo/echo.1 +++ b/bin/echo/echo.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $ +.\" $Id: echo.1,v 1.2.6.2 1996/06/05 02:35:27 jkh Exp $ .\" .Dd July 22, 1993 .Dt ECHO 1 diff --git a/bin/echo/echo.c b/bin/echo/echo.c index e12f0a6e9ee95..249ed1782d467 100644 --- a/bin/echo/echo.c +++ b/bin/echo/echo.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $ + * $Id: echo.c,v 1.2.6.2 1996/06/05 02:35:30 jkh Exp $ */ #ifndef lint diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 560aba0dfc9fa..8ec24393675db 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $ +# $Id: Makefile,v 1.10.4.3 1996/11/24 09:31:31 joerg Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c diff --git a/bin/ed/POSIX b/bin/ed/POSIX index db1a155e2cf21..179ce3d58fc17 100644 --- a/bin/ed/POSIX +++ b/bin/ed/POSIX @@ -1,4 +1,4 @@ -$Id$ +$Id: POSIX,v 1.4 1994/09/24 02:55:20 davidg Exp $ This version of ed(1) is not strictly POSIX compliant, as described in the POSIX 1003.2 document. The following is a summary of the omissions, diff --git a/bin/ed/README b/bin/ed/README index 322e65e0fcaf0..9988a30353f2d 100644 --- a/bin/ed/README +++ b/bin/ed/README @@ -1,4 +1,4 @@ -$Id$ +$Id: README,v 1.4 1994/09/24 02:55:21 davidg Exp $ ed is an 8-bit-clean, POSIX-compliant line editor. It should work with any regular expression package that conforms to the POSIX interface diff --git a/bin/ed/buf.c b/bin/ed/buf.c index e14a65c59730b..a6ec5244ee765 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: buf.c,v 1.6 1994/09/24 02:55:22 davidg Exp $ + * $Id: buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp $ */ #ifndef lint static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp"; diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c index 62fcd99092759..e41629832c545 100644 --- a/bin/ed/cbc.c +++ b/bin/ed/cbc.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)bdes.c 5.5 (Berkeley) 6/27/91 - * $Id: cbc.c,v 1.4 1994/09/24 02:55:24 davidg Exp $ + * $Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $ */ #ifndef lint diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index e650e3c4b58c5..f8a4e6da48907 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: ed.1,v 1.6 1994/09/24 02:55:24 davidg Exp $ .TH ED 1 "21 May 1993" .SH NAME .\" ed, red \- text editor diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 629651642cd0c..0f8164edddc62 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $ + * $Id: ed.h,v 1.8 1994/11/03 21:46:55 davidg Exp $ */ #include diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c index b9856c3e66545..a124e5b779c42 100644 --- a/bin/ed/glbl.c +++ b/bin/ed/glbl.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $ + * $Id: glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp $ */ #ifndef lint diff --git a/bin/ed/io.c b/bin/ed/io.c index f4b4f76ba17ac..5bf36eb6e484e 100644 --- a/bin/ed/io.c +++ b/bin/ed/io.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $ + * $Id: io.c,v 1.4.4.2 1996/06/05 02:35:35 jkh Exp $ */ #ifndef lint diff --git a/bin/ed/main.c b/bin/ed/main.c index 01f30e52d046e..dc6b1662f80c7 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: main.c,v 1.4 1995/03/19 13:28:34 joerg Exp $ + * $Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $ */ #ifndef lint diff --git a/bin/ed/re.c b/bin/ed/re.c index 252e8f8678d91..847b774649e90 100644 --- a/bin/ed/re.c +++ b/bin/ed/re.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $ + * $Id: re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp $ */ #ifndef lint diff --git a/bin/ed/sub.c b/bin/ed/sub.c index c61c7e4e196c2..e571d7ec877f4 100644 --- a/bin/ed/sub.c +++ b/bin/ed/sub.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $ + * $Id: sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp $ */ #ifndef lint diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile index 9f10e1e3c2259..da19e499659d3 100644 --- a/bin/ed/test/Makefile +++ b/bin/ed/test/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $ SHELL= /bin/sh ED= ../obj/ed diff --git a/bin/ed/undo.c b/bin/ed/undo.c index ec813c2d5c7dd..1fdad02cd5c6e 100644 --- a/bin/ed/undo.c +++ b/bin/ed/undo.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: undo.c,v 1.3 1994/09/24 02:55:32 davidg Exp $ */ #ifndef lint diff --git a/bin/expr/Makefile b/bin/expr/Makefile index 71cf46a003831..6a98fd9463254 100644 --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -1,5 +1,5 @@ # /b/source/CVS/src/bin/expr/Makefile,v 1.5 1993/06/14 19:56:06 jtc Exp -# $Id: Makefile,v 1.7 1995/05/30 00:06:49 rgrimes Exp $ +# $Id: Makefile,v 1.7.4.2 1996/06/05 02:35:37 jkh Exp $ PROG= expr SRCS= expr.c diff --git a/bin/expr/expr.1 b/bin/expr/expr.1 index c1c1d37d801ab..d1559ad06f137 100644 --- a/bin/expr/expr.1 +++ b/bin/expr/expr.1 @@ -28,7 +28,7 @@ .\" (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: expr.1,v 1.3 1994/04/24 01:18:46 jkh Exp $ +.\" $Id: expr.1,v 1.3.6.1 1996/01/30 13:59:02 mpp Exp $ .\" .Dd July 3, 1993 .Dt EXPR 1 diff --git a/bin/expr/expr.y b/bin/expr/expr.y index 931bf276a4a40..66647489442c8 100644 --- a/bin/expr/expr.y +++ b/bin/expr/expr.y @@ -4,7 +4,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $Id: expr.y,v 1.11 1995/11/18 18:05:03 joerg Exp $ + * $Id: expr.y,v 1.9.4.2 1995/12/11 22:59:22 joerg Exp $ */ #include diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index adee034af6867..a6eb65fa99e36 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:55:39 davidg Exp $ PROG= hostname diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1 index 4a3caa7704828..943743702abc0 100644 --- a/bin/hostname/hostname.1 +++ b/bin/hostname/hostname.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" $Id: hostname.1,v 1.2.6.2 1996/06/05 02:35:38 jkh Exp $ +.\" $Id: hostname.1,v 1.2.6.3 1996/06/27 05:31:00 gpalmer Exp $ .\" .Dd May 31, 1993 .Dt HOSTNAME 1 diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 00408ecdd3533..74e362473a221 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: hostname.c,v 1.2 1994/09/24 02:55:40 davidg Exp $ */ #ifndef lint diff --git a/bin/kill/Makefile b/bin/kill/Makefile index 610341f6b8c10..686167e3f2542 100644 --- a/bin/kill/Makefile +++ b/bin/kill/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:55:42 davidg Exp $ PROG= kill diff --git a/bin/kill/kill.1 b/bin/kill/kill.1 index 0795098d8aa0f..c18ede2509d93 100644 --- a/bin/kill/kill.1 +++ b/bin/kill/kill.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kill.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: kill.1,v 1.2 1994/09/24 02:55:43 davidg Exp $ .\" .Dd May 31, 1993 .Dt KILL 1 diff --git a/bin/kill/kill.c b/bin/kill/kill.c index 7de25e157206b..814885f8d4f2d 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kill.c,v 1.2 1994/09/24 02:55:44 davidg Exp $ + * $Id: kill.c,v 1.3 1995/03/05 21:52:41 jkh Exp $ */ #ifndef lint diff --git a/bin/ln/Makefile b/bin/ln/Makefile index 83a6e1dca2f18..77d66645eccb7 100644 --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.3 1994/09/24 02:55:45 davidg Exp $ PROG= ln MAN1= ln.1 diff --git a/bin/ln/ln.1 b/bin/ln/ln.1 index 2e1337376f538..98522bcea3fd2 100644 --- a/bin/ln/ln.1 +++ b/bin/ln/ln.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $Id$ +.\" $Id: ln.1,v 1.2 1994/09/24 02:55:47 davidg Exp $ .\" .Dd December 30, 1993 .Dt LN 1 diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 69ae926cabce8..124668e00f91c 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ln.c,v 1.5 1994/12/06 18:50:44 bde Exp $ + * $Id: ln.c,v 1.5.4.2 1996/06/05 02:35:39 jkh Exp $ */ #ifndef lint diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7 index 1fb4ea41bfdbe..94b5396cf7060 100644 --- a/bin/ln/symlink.7 +++ b/bin/ln/symlink.7 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 -.\" $Id$ +.\" $Id: symlink.7,v 1.2 1994/09/24 02:55:49 davidg Exp $ .\" .Dd March 31, 1994 .Dt SYMLINK 7 diff --git a/bin/ls/Makefile b/bin/ls/Makefile index d1a6b6b843848..262c5d6892d25 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:55:51 davidg Exp $ PROG= ls SRCS= cmp.c stat_flags.c ls.c print.c util.c diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c index 51397b45c3901..2327abb223df8 100644 --- a/bin/ls/cmp.c +++ b/bin/ls/cmp.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: cmp.c,v 1.2 1994/09/24 02:55:52 davidg Exp $ */ #ifndef lint diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 253d50642d4a0..34cd71ce7ece3 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:55:52 davidg Exp $ */ int acccmp __P((const FTSENT *, const FTSENT *)); diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 49fa38edb8eae..213d4fc575e8c 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.6 (Berkeley) 4/18/94 -.\" $Id: ls.1,v 1.4 1995/09/26 08:48:09 mpp Exp $ +.\" $Id: ls.1,v 1.3.6.1 1995/10/05 07:28:28 davidg Exp $ .\" .Dd April 18, 1994 .Dt LS 1 diff --git a/bin/ls/ls.c b/bin/ls/ls.c index c125d678e543c..d9074d38634d8 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ls.c,v 1.6 1995/03/23 19:05:00 phk Exp $ + * $Id: ls.c,v 1.6.4.2 1996/06/05 02:35:41 jkh Exp $ */ #ifndef lint diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 61c319e9c187f..4f34ba8127212 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: ls.h,v 1.2 1994/09/24 02:55:55 davidg Exp $ */ #define NO_PRINT 1 diff --git a/bin/ls/print.c b/bin/ls/print.c index 54e76bbfa8d50..647f14eb6ca9a 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: print.c,v 1.4.4.1 1995/08/28 10:30:27 davidg Exp $ + * $Id: print.c,v 1.4.4.3 1996/06/05 02:35:42 jkh Exp $ */ #ifndef lint diff --git a/bin/ls/stat_flags.c b/bin/ls/stat_flags.c index d62a0fd42e0d3..d3f335e4936f8 100644 --- a/bin/ls/stat_flags.c +++ b/bin/ls/stat_flags.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: stat_flags.c,v 1.2 1994/09/24 02:55:57 davidg Exp $ */ #ifndef lint diff --git a/bin/ls/util.c b/bin/ls/util.c index 12679945cc8f8..bbba1f928e8c9 100644 --- a/bin/ls/util.c +++ b/bin/ls/util.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: util.c,v 1.4 1994/10/09 15:25:23 ache Exp $ + * $Id: util.c,v 1.4.6.2 1996/06/05 02:35:42 jkh Exp $ */ #ifndef lint diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile index 03ca565911e99..a1ba4a55bb853 100644 --- a/bin/mkdir/Makefile +++ b/bin/mkdir/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:56:01 davidg Exp $ PROG= mkdir diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1 index 4627b8a68dd30..7e9a00322fb1b 100644 --- a/bin/mkdir/mkdir.1 +++ b/bin/mkdir/mkdir.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $Id$ +.\" $Id: mkdir.1,v 1.2 1994/09/24 02:56:02 davidg Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index d5fe7e516649b..1a6053b524ec8 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mkdir.c,v 1.5 1994/09/24 02:56:03 davidg Exp $ */ #ifndef lint diff --git a/bin/mv/Makefile b/bin/mv/Makefile index 0ba523e61b443..d5f89c6df6a80 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:56:05 davidg Exp $ PROG= mv diff --git a/bin/mv/mv.1 b/bin/mv/mv.1 index c79f74a3271cc..12a3b943599f5 100644 --- a/bin/mv/mv.1 +++ b/bin/mv/mv.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $Id: mv.1,v 1.2.6.1 1995/08/29 11:14:21 davidg Exp $ +.\" $Id: mv.1,v 1.2.6.3 1996/06/05 02:35:44 jkh Exp $ .\" .Dd May 31, 1993 .Dt MV 1 diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 41c71bd12b4f3..cfbd7de2085f8 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mv.c,v 1.2.6.1 1995/10/09 05:12:21 davidg Exp $ + * $Id: mv.c,v 1.2.6.3 1996/06/05 02:35:45 jkh Exp $ */ #ifndef lint diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h index 4adf62b4ec5f9..3ca9f6442c8ea 100644 --- a/bin/mv/pathnames.h +++ b/bin/mv/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: pathnames.h,v 1.2 1994/09/24 02:56:08 davidg Exp $ */ #define _PATH_RM "/bin/rm" diff --git a/bin/pax/Makefile b/bin/pax/Makefile index cd0cc2d82e4c2..eef5d60a121ad 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:56:10 davidg Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 9bf75662f15d3..caa8761d059f7 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ar_io.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $ + * $Id: ar_io.c,v 1.3.4.2 1996/06/05 02:35:47 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 79cbe0338a9ac..d9d76051e2fc1 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ar_subs.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $ + * $Id: ar_subs.c,v 1.3.4.2 1996/06/05 02:35:48 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 1cca4138b2704..f2321de5e1735 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: buf_subs.c,v 1.3 1995/05/30 00:06:53 rgrimes Exp $ + * $Id: buf_subs.c,v 1.3.4.2 1996/06/05 02:35:49 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/cache.c b/bin/pax/cache.c index 5e8770fd70b53..05d4096376f9a 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cache.c,v 1.2 1994/09/24 02:56:14 davidg Exp $ + * $Id: cache.c,v 1.2.6.2 1996/06/05 02:35:50 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/cache.h b/bin/pax/cache.h index 5c01ef410aef6..2be117544b8d0 100644 --- a/bin/pax/cache.h +++ b/bin/pax/cache.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)cache.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: cache.h,v 1.2 1994/09/24 02:56:15 davidg Exp $ */ /* diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index f0b0586e7a33d..f48bb5c88d20d 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpio.c,v 1.3 1995/05/30 00:06:54 rgrimes Exp $ + * $Id: cpio.c,v 1.3.4.2 1996/06/05 02:35:51 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h index 6e500487f5500..a3a174f02bcf3 100644 --- a/bin/pax/cpio.h +++ b/bin/pax/cpio.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $Id: cpio.h,v 1.2 1994/09/24 02:56:17 davidg Exp $ + * $Id: cpio.h,v 1.3 1995/05/30 00:06:55 rgrimes Exp $ */ /* diff --git a/bin/pax/extern.h b/bin/pax/extern.h index 819329f2c2b85..b95d88a6af2c0 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:56:18 davidg Exp $ */ /* diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index e8c6fd345d58a..eeb415f2893a5 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: file_subs.c,v 1.3 1995/05/30 00:06:56 rgrimes Exp $ + * $Id: file_subs.c,v 1.3.4.2 1996/06/05 02:35:52 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 36bdecf6ba35d..ee463bedff582 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftree.c,v 1.3 1995/05/30 00:06:57 rgrimes Exp $ + * $Id: ftree.c,v 1.3.4.2 1996/06/05 02:35:53 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h index a98654632f545..ca456c1205a24 100644 --- a/bin/pax/ftree.h +++ b/bin/pax/ftree.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)ftree.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: ftree.h,v 1.2 1994/09/24 02:56:21 davidg Exp $ */ /* diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index 8fb957514b5d8..a6c70914ad5e3 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gen_subs.c,v 1.4.4.1 1995/08/28 10:41:14 davidg Exp $ + * $Id: gen_subs.c,v 1.4.4.3 1996/06/05 02:35:54 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/options.c b/bin/pax/options.c index da5229829a067..468e9d070e596 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: options.c,v 1.3 1995/03/19 13:28:53 joerg Exp $ + * $Id: options.c,v 1.3.4.2 1996/06/05 02:35:55 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/options.h b/bin/pax/options.h index df1bd7daac415..675a78c9af246 100644 --- a/bin/pax/options.h +++ b/bin/pax/options.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)options.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: options.h,v 1.2 1994/09/24 02:56:24 davidg Exp $ */ /* diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 6c43f37ab191f..e5fdc20b6dc67 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pat_rep.c,v 1.4 1995/05/30 00:06:59 rgrimes Exp $ + * $Id: pat_rep.c,v 1.4.4.2 1996/06/05 02:35:56 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h index e994a33cb6ed4..ee5165496547c 100644 --- a/bin/pax/pat_rep.h +++ b/bin/pax/pat_rep.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)pat_rep.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: pat_rep.h,v 1.2 1994/09/24 02:56:25 davidg Exp $ */ /* diff --git a/bin/pax/pax.1 b/bin/pax/pax.1 index 8fe6b49538a24..a8b748368ef55 100644 --- a/bin/pax/pax.1 +++ b/bin/pax/pax.1 @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $Id: pax.1,v 1.3 1995/08/16 23:12:25 nate Exp $ +.\" $Id: pax.1,v 1.2.6.1 1995/08/29 11:46:20 davidg Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 6b9ee71d8ee63..26f272ebb960c 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pax.c,v 1.3 1995/05/30 00:07:00 rgrimes Exp $ + * $Id: pax.c,v 1.3.4.2 1996/06/05 02:35:57 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/pax.h b/bin/pax/pax.h index d6fe02c26c183..5109fff39a3aa 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)pax.h 8.2 (Berkeley) 4/18/94 - * $Id: pax.h,v 1.3 1995/05/30 00:07:01 rgrimes Exp $ + * $Id: pax.h,v 1.3.4.1 1995/08/25 03:15:56 davidg Exp $ */ /* diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 2af13397a5af7..f42036d8d1017 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sel_subs.c,v 1.2 1994/09/24 02:56:29 davidg Exp $ + * $Id: sel_subs.c,v 1.2.6.2 1996/06/05 02:35:58 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h index dbab257b3e83b..01acd79221cc5 100644 --- a/bin/pax/sel_subs.h +++ b/bin/pax/sel_subs.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)sel_subs.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: sel_subs.h,v 1.2 1994/09/24 02:56:31 davidg Exp $ */ /* diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 5cc749d9dd939..d8fa2789e895d 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tables.c,v 1.3 1995/05/30 00:07:01 rgrimes Exp $ + * $Id: tables.c,v 1.3.4.2 1996/06/05 02:35:59 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/tables.h b/bin/pax/tables.h index d7ff769fdb9ba..3596a35999749 100644 --- a/bin/pax/tables.h +++ b/bin/pax/tables.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)tables.h 8.1 (Berkeley) 5/31/93 - * $Id: tables.h,v 1.2 1994/09/24 02:56:35 davidg Exp $ + * $Id: tables.h,v 1.3 1995/05/30 00:07:02 rgrimes Exp $ */ /* diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 48a6ebfda0b9c..2da698802ab36 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tar.c,v 1.3 1995/05/30 00:07:03 rgrimes Exp $ + * $Id: tar.c,v 1.3.4.2 1996/06/05 02:36:00 jkh Exp $ */ #ifndef lint diff --git a/bin/pax/tar.h b/bin/pax/tar.h index 5533a0777e6da..f9b7db8f5aabe 100644 --- a/bin/pax/tar.h +++ b/bin/pax/tar.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: tar.h,v 1.2 1994/09/24 02:56:38 davidg Exp $ */ /* diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index ef507c1808daf..a205e5e35f5ea 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subs.c,v 1.2 1994/09/24 02:56:38 davidg Exp $ + * $Id: tty_subs.c,v 1.2.6.2 1996/06/05 02:36:01 jkh Exp $ */ #ifndef lint diff --git a/bin/ps/Makefile b/bin/ps/Makefile index dea0ff4e821dc..c71bbbe057df2 100644 --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $Id: Makefile,v 1.5 1995/04/15 03:31:19 davidg Exp $ +# $Id: Makefile,v 1.5.4.2 1996/06/05 02:36:06 jkh Exp $ PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c diff --git a/bin/ps/devname.c b/bin/ps/devname.c index 0aedb2b293be7..cce23d14ef335 100644 --- a/bin/ps/devname.c +++ b/bin/ps/devname.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: devname.c,v 1.2 1994/09/24 02:56:41 davidg Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 173ddf33c3ac3..305513b17a283 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:56:42 davidg Exp $ */ struct kinfo; diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 23d6adb6acc46..d660843394a5d 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: fmt.c,v 1.5 1995/03/09 20:40:17 davidg Exp $ + * $Id: fmt.c,v 1.5.4.2 1996/06/05 02:36:08 jkh Exp $ */ #ifndef lint diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 3b2f5a3bdc7c7..acb90c787b244 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: keyword.c,v 1.5.6.1 1995/10/05 07:46:36 davidg Exp $ + * $Id: keyword.c,v 1.5.6.3 1996/06/05 02:36:10 jkh Exp $ */ #ifndef lint diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c index 293a6273aaf0f..b41ecd4e4f786 100644 --- a/bin/ps/nlist.c +++ b/bin/ps/nlist.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: nlist.c,v 1.4 1994/10/02 08:33:29 davidg Exp $ + * $Id: nlist.c,v 1.5 1994/11/24 13:13:55 davidg Exp $ */ #ifndef lint diff --git a/bin/ps/print.c b/bin/ps/print.c index be2a4d089a4ab..49290f99ef468 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: print.c,v 1.7.4.2 1995/10/05 07:46:37 davidg Exp $ + * $Id: print.c,v 1.7.4.4 1996/06/05 02:36:11 jkh Exp $ */ #ifndef lint diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 250df97815cf4..ae6ba8d2c9124 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $Id: ps.1,v 1.4.6.2 1996/02/22 19:51:39 peter Exp $ +.\" $Id: ps.1,v 1.4.6.4 1996/06/05 02:36:11 jkh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 0fe890abce872..a121d95aa37e4 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ps.c,v 1.7.4.1 1996/02/22 19:51:40 peter Exp $ + * $Id: ps.c,v 1.7.4.3 1996/06/05 02:36:12 jkh Exp $ */ #ifndef lint diff --git a/bin/ps/ps.h b/bin/ps/ps.h index d1b84333ec01e..3f5ed2b9aee2f 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: ps.h,v 1.2 1994/09/24 02:56:48 davidg Exp $ */ #define UNLIMITED 0 /* unlimited terminal width */ diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile index 4937fb391932b..ef1af5ed6877a 100644 --- a/bin/pwd/Makefile +++ b/bin/pwd/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:56:50 davidg Exp $ PROG= pwd diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index d340aa7522a9d..03cd35c3fe105 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: pwd.1,v 1.2 1994/09/24 02:56:51 davidg Exp $ .\" .Dd May 31, 1993 .Dt PWD 1 diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 4cb2d1923e7f8..5fa2d77e079d9 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: pwd.c,v 1.2 1994/09/24 02:56:52 davidg Exp $ */ #ifndef lint diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index 06e2fe0bd260a..bf37d058a3daa 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.4 1994/09/29 13:06:00 csgr Exp $ +# $Id: Makefile,v 1.5 1994/11/20 23:18:15 wollman Exp $ PROG= rcp SRCS= rcp.c util.c diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h index ef055c4c7f477..ce959acd4ec07 100644 --- a/bin/rcp/extern.h +++ b/bin/rcp/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:56:54 davidg Exp $ */ typedef struct { diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h index 39158f0d49ca1..41ef6b9bc6905 100644 --- a/bin/rcp/pathnames.h +++ b/bin/rcp/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: pathnames.h,v 1.2 1994/09/24 02:56:55 davidg Exp $ */ #include diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1 index 67f1167e975d8..48d6080686973 100644 --- a/bin/rcp/rcp.1 +++ b/bin/rcp/rcp.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: rcp.1,v 1.2 1994/09/24 02:56:56 davidg Exp $ .\" .Dd May 31, 1993 .Dt RCP 1 diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 994a455e78f5a..90399f9cc494e 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rcp.c,v 1.4.4.2 1996/06/05 02:36:15 jkh Exp $ + * $Id: rcp.c,v 1.4.4.3 1996/06/23 13:07:37 markm Exp $ */ #ifndef lint diff --git a/bin/rcp/util.c b/bin/rcp/util.c index 099d2f9f2a54f..af356d7f8a704 100644 --- a/bin/rcp/util.c +++ b/bin/rcp/util.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: util.c,v 1.3 1995/03/19 13:29:16 joerg Exp $ + * $Id: util.c,v 1.4 1995/05/30 00:07:07 rgrimes Exp $ */ #ifndef lint diff --git a/bin/rm/Makefile b/bin/rm/Makefile index b7e1d5894cb94..9a534293f2468 100644 --- a/bin/rm/Makefile +++ b/bin/rm/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.2 1994/09/24 02:56:59 davidg Exp $ +# $Id: Makefile,v 1.3 1995/04/13 13:35:07 ache Exp $ PROG= rm SRCS= rm.c stat_flags.c diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 31aba2cfe6ced..d2b91be3e9773 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.2 (Berkeley) 4/18/94 -.\" $Id: rm.1,v 1.2 1994/09/24 02:57:00 davidg Exp $ +.\" $Id: rm.1,v 1.2.6.2 1996/06/05 02:36:16 jkh Exp $ .\" .Dd April 18, 1994 .Dt RM 1 diff --git a/bin/rm/rm.c b/bin/rm/rm.c index ffe5655052414..7f1aa9a8f9af4 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rm.c,v 1.6 1995/04/13 13:35:09 ache Exp $ + * $Id: rm.c,v 1.6.4.2 1996/06/05 02:36:17 jkh Exp $ */ #ifndef lint diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index ca3c69c2ea1df..f118add146760 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.3 1994/09/24 02:57:03 davidg Exp $ +# $Id: Makefile,v 1.4 1995/03/05 08:27:14 joerg Exp $ PROG= rmail MAN8= rmail.8 diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8 index 859a3c55c9b87..b7a5be0968559 100644 --- a/bin/rmail/rmail.8 +++ b/bin/rmail/rmail.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmail.8 6.10 (Berkeley) 4/29/93 -.\" $Id$ +.\" $Id: rmail.8,v 1.2 1994/09/24 02:57:04 davidg Exp $ .\" .Dd April 29, 1993 .Dt RMAIL 8 diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index d3f6221a211f0..ba92f0a78da9b 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rmail.c,v 1.5 1995/05/30 00:07:08 rgrimes Exp $ + * $Id: rmail.c,v 1.5.4.2 1996/06/05 02:36:19 jkh Exp $ */ #ifndef lint diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile index 4bedbff9d4782..76befda8dcf1f 100644 --- a/bin/rmdir/Makefile +++ b/bin/rmdir/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:57:09 davidg Exp $ PROG= rmdir diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1 index 7b2ddf7cd4a4d..02ab22befb5c2 100644 --- a/bin/rmdir/rmdir.1 +++ b/bin/rmdir/rmdir.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: rmdir.1,v 1.2 1994/09/24 02:57:11 davidg Exp $ .\" .Dd May 31, 1993 .Dt RMDIR 1 diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index e47cbb2bdba1b..6bd13df3dcd7c 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: rmdir.c,v 1.2 1994/09/24 02:57:13 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/Makefile b/bin/sh/Makefile index cf591a60e4acb..7d5d556eaba1e 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.7.6.3 1996/06/05 02:36:21 jkh Exp $ +# $Id: Makefile,v 1.7.6.4 1996/06/25 14:37:44 joerg Exp $ PROG= sh SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \ diff --git a/bin/sh/TOUR b/bin/sh/TOUR index 23925e4fa3120..d026868ec9ffa 100644 --- a/bin/sh/TOUR +++ b/bin/sh/TOUR @@ -1,5 +1,5 @@ # @(#)TOUR 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: TOUR,v 1.2 1994/09/24 02:57:19 davidg Exp $ NOTE -- This is the original TOUR paper distributed with ash and does not represent the current state of the shell. It is provided anyway diff --git a/bin/sh/alias.c b/bin/sh/alias.c index c851287a46434..e37f70332cb13 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: alias.c,v 1.2 1994/09/24 02:57:20 davidg Exp $ + * $Id: alias.c,v 1.3 1995/05/30 00:07:10 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/alias.h b/bin/sh/alias.h index b5fed8dd50dd7..cbb98c94a8f7e 100644 --- a/bin/sh/alias.h +++ b/bin/sh/alias.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)alias.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: alias.h,v 1.2 1994/09/24 02:57:20 davidg Exp $ */ #define ALIASINUSE 1 diff --git a/bin/sh/arith.y b/bin/sh/arith.y index b71be6ba639a4..53aefa58d00c9 100644 --- a/bin/sh/arith.y +++ b/bin/sh/arith.y @@ -74,7 +74,7 @@ expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; } * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: arith.y,v 1.2 1994/09/24 02:57:21 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l index c50463f56815a..9c3b851c4dff6 100644 --- a/bin/sh/arith_lex.l +++ b/bin/sh/arith_lex.l @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: arith_lex.l,v 1.2 1994/09/24 02:57:22 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h index ee25eba9c14b7..bbd5099b1598b 100644 --- a/bin/sh/bltin/bltin.h +++ b/bin/sh/bltin/bltin.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bltin.h 8.1 (Berkeley) 5/31/93 - * $Id: bltin.h,v 1.2.6.1 1995/12/11 23:05:26 joerg Exp $ + * $Id: bltin.h,v 1.2.6.3 1996/06/05 02:36:24 jkh Exp $ */ /* diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1 index 435b85131a082..81ac89b848318 100644 --- a/bin/sh/bltin/echo.1 +++ b/bin/sh/bltin/echo.1 @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: echo.1,v 1.2 1994/09/24 02:58:27 davidg Exp $ .\" .Dd May 31, 1993 .Dt ECHO 1 diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c index f9f1928aa68be..121ab23f81295 100644 --- a/bin/sh/bltin/echo.c +++ b/bin/sh/bltin/echo.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)echo.c 8.1 (Berkeley) 5/31/93 - * $Id: echo.c,v 1.2 1994/09/24 02:58:29 davidg Exp $ + * $Id: echo.c,v 1.2.6.1 1995/08/30 05:44:18 davidg Exp $ */ /* diff --git a/bin/sh/builtins b/bin/sh/builtins index a636390256d7f..246a888b5e462 100755 --- a/bin/sh/builtins +++ b/bin/sh/builtins @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)builtins 8.1 (Berkeley) 5/31/93 -# $Id: builtins,v 1.3 1995/10/19 18:42:09 joerg Exp $ +# $Id: builtins,v 1.2.6.1 1995/12/11 23:04:41 joerg Exp $ # # This file lists all the builtin commands. The first column is the name diff --git a/bin/sh/cd.c b/bin/sh/cd.c index 4b9880135a177..476f82781c328 100644 --- a/bin/sh/cd.c +++ b/bin/sh/cd.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cd.c,v 1.5 1995/11/14 01:04:52 peter Exp $ + * $Id: cd.c,v 1.4.4.1 1995/12/11 23:04:43 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/errmsg.c b/bin/sh/errmsg.c index 87a8d0cd1bdfd..00fef65d29505 100644 --- a/bin/sh/errmsg.c +++ b/bin/sh/errmsg.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: errmsg.c,v 1.2 1994/09/24 02:57:26 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/errmsg.h b/bin/sh/errmsg.h index 209094a3843df..34dc6c28035cc 100644 --- a/bin/sh/errmsg.h +++ b/bin/sh/errmsg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)errmsg.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: errmsg.h,v 1.2 1994/09/24 02:57:26 davidg Exp $ */ #define E_OPEN 01 diff --git a/bin/sh/error.c b/bin/sh/error.c index c1c3b826eba73..4bce4a565cca3 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: error.c,v 1.2 1994/09/24 02:57:27 davidg Exp $ + * $Id: error.c,v 1.3 1995/05/30 00:07:10 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/error.h b/bin/sh/error.h index 03a2f89c56e10..cbb76f4cda396 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: error.h,v 1.2 1994/09/24 02:57:28 davidg Exp $ */ /* diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 34417df5f3c10..8b4405e6d54be 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eval.c,v 1.3 1995/05/30 00:07:11 rgrimes Exp $ + * $Id: eval.c,v 1.3.4.1 1995/09/20 08:34:47 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/eval.h b/bin/sh/eval.h index 6d64449599f95..53aa5755915e1 100644 --- a/bin/sh/eval.h +++ b/bin/sh/eval.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)eval.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: eval.h,v 1.2 1994/09/24 02:57:31 davidg Exp $ */ extern char *commandname; /* currently executing command */ diff --git a/bin/sh/exec.c b/bin/sh/exec.c index e9061e8b18795..169e0f528661a 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exec.c,v 1.3 1994/09/24 02:57:32 davidg Exp $ + * $Id: exec.c,v 1.4 1995/05/30 00:07:12 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/exec.h b/bin/sh/exec.h index 90d91003ae332..60500ca248d25 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: exec.h,v 1.2 1994/09/24 02:57:33 davidg Exp $ */ /* values of cmdtype */ diff --git a/bin/sh/expand.c b/bin/sh/expand.c index a5d69ce9672d6..50779276fb94c 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: expand.c,v 1.3 1995/03/01 13:04:15 guido Exp $ + * $Id: expand.c,v 1.4 1995/05/30 00:07:13 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/expand.h b/bin/sh/expand.h index 6af4360abe165..efc75f12791e5 100644 --- a/bin/sh/expand.h +++ b/bin/sh/expand.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)expand.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: expand.h,v 1.2 1994/09/24 02:57:35 davidg Exp $ */ struct strlist { diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv index cacb5ba65c518..9ddddffc12ee3 100644 --- a/bin/sh/funcs/cmv +++ b/bin/sh/funcs/cmv @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)cmv 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: cmv,v 1.2 1994/09/24 02:58:33 davidg Exp $ # Conditional move--don't replace an existing file. diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs index fe70c6856c704..b6a02c3facdf2 100644 --- a/bin/sh/funcs/dirs +++ b/bin/sh/funcs/dirs @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)dirs 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: dirs,v 1.2 1994/09/24 02:58:34 davidg Exp $ # pushd, popd, and dirs --- written by Chris Bertin # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill index f3489b5efe3c5..5578ca45b1f0d 100644 --- a/bin/sh/funcs/kill +++ b/bin/sh/funcs/kill @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)kill 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: kill,v 1.2 1994/09/24 02:58:36 davidg Exp $ # Convert job names to process ids and then run /bin/kill. diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login index f44d3a593d78b..b4e2747d3871e 100644 --- a/bin/sh/funcs/login +++ b/bin/sh/funcs/login @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)login 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: login,v 1.2 1994/09/24 02:58:38 davidg Exp $ # replaces the login builtin in the BSD shell login () exec login "$@" diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp index fc02baacd0faa..ba38f221157fc 100644 --- a/bin/sh/funcs/newgrp +++ b/bin/sh/funcs/newgrp @@ -33,6 +33,6 @@ # SUCH DAMAGE. # # @(#)newgrp 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: newgrp,v 1.2 1994/09/24 02:58:40 davidg Exp $ newgrp() exec newgrp "$@" diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd index 938aabc2b7022..b6c198e2a8c56 100644 --- a/bin/sh/funcs/popd +++ b/bin/sh/funcs/popd @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)popd 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: popd,v 1.2 1994/09/24 02:58:41 davidg Exp $ # pushd, popd, and dirs --- written by Chris Bertin # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd index 879ae207c1115..f4c3b389002f8 100644 --- a/bin/sh/funcs/pushd +++ b/bin/sh/funcs/pushd @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)pushd 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: pushd,v 1.2 1994/09/24 02:58:43 davidg Exp $ # pushd, popd, and dirs --- written by Chris Bertin # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend index 3a0735c21856f..6c776c296a40e 100644 --- a/bin/sh/funcs/suspend +++ b/bin/sh/funcs/suspend @@ -33,7 +33,7 @@ # SUCH DAMAGE. # # @(#)suspend 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: suspend,v 1.2 1994/09/24 02:58:44 davidg Exp $ suspend() { local - diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 9cf8a2305957a..5801038a391cc 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: histedit.c,v 1.3 1995/05/05 06:34:13 davidg Exp $ + * $Id: histedit.c,v 1.4 1995/05/30 00:07:14 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/init.h b/bin/sh/init.h index 8466409e46f2a..b603dc5c86ff3 100644 --- a/bin/sh/init.h +++ b/bin/sh/init.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)init.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: init.h,v 1.2 1994/09/24 02:57:37 davidg Exp $ */ #ifdef __STDC__ diff --git a/bin/sh/input.c b/bin/sh/input.c index db39b973ef279..2dc7ecb773f0c 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: input.c,v 1.4 1995/11/03 18:50:14 peter Exp $ + * $Id: input.c,v 1.3.4.1 1995/12/11 23:04:46 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/input.h b/bin/sh/input.h index 77b193b81c6a9..a7677726a8c85 100644 --- a/bin/sh/input.h +++ b/bin/sh/input.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: input.h,v 1.2 1994/09/24 02:57:40 davidg Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index ebc1d3d59595d..5aded576f3591 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: jobs.c,v 1.4 1995/09/21 13:24:20 bde Exp $ + * $Id: jobs.c,v 1.3.4.1 1995/10/01 06:08:43 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h index fd08023833779..8f70b5b5151d0 100644 --- a/bin/sh/jobs.h +++ b/bin/sh/jobs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: jobs.h,v 1.2 1994/09/24 02:57:42 davidg Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h index 97d82a952a723..85dbe48761e31 100644 --- a/bin/sh/machdep.h +++ b/bin/sh/machdep.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)machdep.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: machdep.h,v 1.2 1994/09/24 02:57:43 davidg Exp $ */ /* diff --git a/bin/sh/mail.c b/bin/sh/mail.c index a122c9bd09616..61b0bda915782 100644 --- a/bin/sh/mail.c +++ b/bin/sh/mail.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mail.c,v 1.2 1994/09/24 02:57:44 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/mail.h b/bin/sh/mail.h index d7b4fe3e4c023..ae2f617f83aef 100644 --- a/bin/sh/mail.h +++ b/bin/sh/mail.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)mail.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: mail.h,v 1.2 1994/09/24 02:57:45 davidg Exp $ */ #ifdef __STDC__ diff --git a/bin/sh/main.c b/bin/sh/main.c index 3b4ac2986e609..b0dad1a62c881 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: main.c,v 1.3 1995/05/30 00:07:18 rgrimes Exp $ + * $Id: main.c,v 1.3.4.1 1997/02/15 10:09:13 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/main.h b/bin/sh/main.h index b43f04108575f..6158883ecb285 100644 --- a/bin/sh/main.h +++ b/bin/sh/main.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)main.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: main.h,v 1.2 1994/09/24 02:57:49 davidg Exp $ */ extern int rootpid; /* pid of main shell */ diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index 873e30c8d6b4c..45104314da3bd 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: memalloc.c,v 1.2 1994/09/24 02:57:50 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h index 43f3335567ee3..1fff3da8749ca 100644 --- a/bin/sh/memalloc.h +++ b/bin/sh/memalloc.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)memalloc.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: memalloc.h,v 1.2 1994/09/24 02:57:51 davidg Exp $ */ struct stackmark { diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 447d759af8565..eab81e06b5c23 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: miscbltin.c,v 1.4 1995/10/21 00:47:30 joerg Exp $ + * $Id: miscbltin.c,v 1.2.6.1 1995/12/11 23:04:50 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins index e7f0d8dbbdf23..a1fca5c5e13e2 100755 --- a/bin/sh/mkbuiltins +++ b/bin/sh/mkbuiltins @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.1 (Berkeley) 5/31/93 -# $Id: mkbuiltins,v 1.2 1994/09/24 02:57:53 davidg Exp $ +# $Id: mkbuiltins,v 1.3 1995/03/30 19:45:20 phk Exp $ temp=/tmp/ka$$ havejobs=0 diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c index fc71cdb9cdbe6..387268c620e7d 100644 --- a/bin/sh/mkinit.c +++ b/bin/sh/mkinit.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mkinit.c,v 1.5 1995/10/01 15:13:31 joerg Exp $ + * $Id: mkinit.c,v 1.4.4.1 1995/10/02 07:55:17 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 5ede3af9cef0b..1c08d1487ab64 100644 --- a/bin/sh/mknodes.c +++ b/bin/sh/mknodes.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mknodes.c,v 1.2 1994/09/24 02:57:55 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/mksignames.c b/bin/sh/mksignames.c index 5d7b9da253c1c..a348dcd6bff6b 100644 --- a/bin/sh/mksignames.c +++ b/bin/sh/mksignames.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mksignames.c,v 1.2 1994/09/24 02:57:56 davidg Exp $ + * $Id: mksignames.c,v 1.3 1995/05/30 00:07:20 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c index b55545c20e32c..45cd1535ed390 100644 --- a/bin/sh/mksyntax.c +++ b/bin/sh/mksyntax.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mksyntax.c,v 1.2 1994/09/24 02:57:57 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/mktokens b/bin/sh/mktokens index 12983e846be47..e37c4505108b1 100644 --- a/bin/sh/mktokens +++ b/bin/sh/mktokens @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)mktokens 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: mktokens,v 1.2 1994/09/24 02:57:58 davidg Exp $ # The following is a list of tokens. The second column is nonzero if the # token marks the end of a list. The third column is the name to print in diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h index c08951117ba16..7d9d9de748a0d 100644 --- a/bin/sh/myhistedit.h +++ b/bin/sh/myhistedit.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)myhistedit.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: myhistedit.h,v 1.2 1994/09/24 02:57:59 davidg Exp $ */ #include diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c index 01b1add01abc2..62d96644257c6 100644 --- a/bin/sh/mystring.c +++ b/bin/sh/mystring.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mystring.c,v 1.2 1994/09/24 02:57:59 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h index ca04daab2543b..419df4487b978 100644 --- a/bin/sh/mystring.h +++ b/bin/sh/mystring.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)mystring.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: mystring.h,v 1.2 1994/09/24 02:58:00 davidg Exp $ */ #include diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index e0602ed69ddbb..c22a80611dd8f 100644 --- a/bin/sh/nodes.c.pat +++ b/bin/sh/nodes.c.pat @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: nodes.c.pat,v 1.2 1994/09/24 02:58:02 davidg Exp $ */ /* diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes index 5f33a1703e491..ee1037276b360 100644 --- a/bin/sh/nodetypes +++ b/bin/sh/nodetypes @@ -34,7 +34,7 @@ # SUCH DAMAGE. # # @(#)nodetypes 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: nodetypes,v 1.2 1994/09/24 02:58:03 davidg Exp $ # This file describes the nodes used in parse trees. Unindented lines # contain a node type followed by a structure tag. Subsequent indented diff --git a/bin/sh/options.c b/bin/sh/options.c index 4b8b9cfe1d87f..7c4a62c6bc1f2 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: options.c,v 1.3.4.3 1995/10/10 01:04:38 davidg Exp $ + * $Id: options.c,v 1.3.4.4 1997/02/15 10:09:16 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/options.h b/bin/sh/options.h index 8637412f01cd3..15677290e63f0 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)options.h 8.1 (Berkeley) 5/31/93 - * $Id: options.h,v 1.2 1994/09/24 02:58:05 davidg Exp $ + * $Id: options.h,v 1.2.6.1 1997/02/15 10:09:18 joerg Exp $ */ struct shparam { diff --git a/bin/sh/output.c b/bin/sh/output.c index 914df67eb3870..fd51672bcd310 100644 --- a/bin/sh/output.c +++ b/bin/sh/output.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: output.c,v 1.2 1994/09/24 02:58:06 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/output.h b/bin/sh/output.h index e4318f3cacb14..032cd2d8b4f30 100644 --- a/bin/sh/output.h +++ b/bin/sh/output.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)output.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: output.h,v 1.2 1994/09/24 02:58:08 davidg Exp $ */ #ifndef OUTPUT_INCL diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 0720e01c5329c..4600e8adbec5c 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parser.c,v 1.6.4.4 1996/06/05 02:36:22 jkh Exp $ + * $Id: parser.c,v 1.6.4.5 1996/06/25 14:37:46 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/parser.h b/bin/sh/parser.h index 7408bd7a340cf..6991a7aee7be4 100644 --- a/bin/sh/parser.h +++ b/bin/sh/parser.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: parser.h,v 1.2 1994/09/24 02:58:09 davidg Exp $ */ /* control characters in argument strings */ diff --git a/bin/sh/redir.c b/bin/sh/redir.c index c1e7fbc59d1d3..4782d43480c90 100644 --- a/bin/sh/redir.c +++ b/bin/sh/redir.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: redir.c,v 1.4 1995/10/21 00:47:31 joerg Exp $ + * $Id: redir.c,v 1.3.4.1 1995/12/11 23:04:53 joerg Exp $ */ #ifndef lint diff --git a/bin/sh/redir.h b/bin/sh/redir.h index 05842bba5137b..ded09f773f68e 100644 --- a/bin/sh/redir.h +++ b/bin/sh/redir.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)redir.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: redir.h,v 1.2 1994/09/24 02:58:11 davidg Exp $ */ /* flags passed to redirect */ diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index e80bdd2f258fc..636a67c473ac8 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sh.1 8.4 (Berkeley) 4/18/94 -.\" $Id: sh.1,v 1.3.4.1 1995/12/11 23:04:55 joerg Exp $ +.\" $Id: sh.1,v 1.3.4.2 1997/02/15 10:09:23 joerg Exp $ .\" .\" .\" diff --git a/bin/sh/shell.h b/bin/sh/shell.h index d038f91b81f04..5f77da3004b23 100644 --- a/bin/sh/shell.h +++ b/bin/sh/shell.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)shell.h 8.1 (Berkeley) 5/31/93 - * $Id: shell.h,v 1.2 1994/09/24 02:58:15 davidg Exp $ + * $Id: shell.h,v 1.2.6.1 1995/08/30 05:53:08 davidg Exp $ */ /* diff --git a/bin/sh/show.c b/bin/sh/show.c index 43fb34c82709d..785ed31c5ce18 100644 --- a/bin/sh/show.c +++ b/bin/sh/show.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: show.c,v 1.2 1994/09/24 02:58:16 davidg Exp $ */ #ifndef lint diff --git a/bin/sh/trap.c b/bin/sh/trap.c index a09a0cf9782f2..dec7bd4da32c4 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: trap.c,v 1.2 1994/09/24 02:58:18 davidg Exp $ + * $Id: trap.c,v 1.3 1995/05/30 00:07:23 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/trap.h b/bin/sh/trap.h index a588432ef8821..c21496d830e03 100644 --- a/bin/sh/trap.h +++ b/bin/sh/trap.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)trap.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: trap.h,v 1.2 1994/09/24 02:58:20 davidg Exp $ */ extern int pendingsigs; diff --git a/bin/sh/var.c b/bin/sh/var.c index 00420d56b78d2..9db81e402da8d 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: var.c,v 1.2 1994/09/24 02:58:22 davidg Exp $ + * $Id: var.c,v 1.3 1995/05/30 00:07:24 rgrimes Exp $ */ #ifndef lint diff --git a/bin/sh/var.h b/bin/sh/var.h index 38e61ef276c91..758e23836067b 100644 --- a/bin/sh/var.h +++ b/bin/sh/var.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)var.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: var.h,v 1.2 1994/09/24 02:58:23 davidg Exp $ */ /* diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile index 163470fb3bd04..c148da8ccacf8 100644 --- a/bin/sleep/Makefile +++ b/bin/sleep/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:58:47 davidg Exp $ PROG= sleep diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1 index 1e4934bc066c6..9dad07d04fe04 100644 --- a/bin/sleep/sleep.1 +++ b/bin/sleep/sleep.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sleep.1 8.3 (Berkeley) 4/18/94 -.\" $Id$ +.\" $Id: sleep.1,v 1.2 1994/09/24 02:58:49 davidg Exp $ .\" .Dd April 18, 1994 .Dt SLEEP 1 diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 773abe830570b..14662b9208f29 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: sleep.c,v 1.2 1994/09/24 02:58:51 davidg Exp $ */ #ifndef lint diff --git a/bin/stty/Makefile b/bin/stty/Makefile index d0b160d74b039..fdff14bcc63d5 100644 --- a/bin/stty/Makefile +++ b/bin/stty/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:58:53 davidg Exp $ PROG= stty SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c index 8b0c97004024f..fec0d204569c4 100644 --- a/bin/stty/cchar.c +++ b/bin/stty/cchar.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cchar.c,v 1.3 1995/04/28 19:29:28 ache Exp $ + * $Id: cchar.c,v 1.4 1995/05/30 00:07:25 rgrimes Exp $ */ #ifndef lint diff --git a/bin/stty/extern.h b/bin/stty/extern.h index aa7a35b13d272..be23aed5dbb7c 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: extern.h,v 1.2 1994/09/24 02:58:56 davidg Exp $ */ int c_cchars __P((const void *, const void *)); diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c index f6ef0e15c4433..52e2bebec88f3 100644 --- a/bin/stty/gfmt.c +++ b/bin/stty/gfmt.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gfmt.c,v 1.3 1995/03/19 13:29:23 joerg Exp $ + * $Id: gfmt.c,v 1.4 1995/05/30 00:07:26 rgrimes Exp $ */ #ifndef lint diff --git a/bin/stty/key.c b/bin/stty/key.c index 362b6f110be45..5574ba3d05e97 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: key.c,v 1.3 1995/03/19 13:29:25 joerg Exp $ + * $Id: key.c,v 1.4 1995/04/28 19:29:29 ache Exp $ */ #ifndef lint diff --git a/bin/stty/modes.c b/bin/stty/modes.c index 0aa7438ae7f2b..a1f4b9d988a6b 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: modes.c,v 1.2 1994/09/24 02:58:59 davidg Exp $ + * $Id: modes.c,v 1.3 1995/04/29 15:17:17 bde Exp $ */ #ifndef lint diff --git a/bin/stty/print.c b/bin/stty/print.c index 6df7fea2dc164..eb44c19496fec 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: print.c,v 1.4 1995/04/29 15:17:16 bde Exp $ + * $Id: print.c,v 1.5 1995/05/30 00:07:27 rgrimes Exp $ */ #ifndef lint diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index 1f15e17454f40..d323957e65b82 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)stty.1 8.4 (Berkeley) 4/18/94 -.\" $Id: stty.1,v 1.2.6.2 1996/06/05 02:36:26 jkh Exp $ +.\" $Id: stty.1,v 1.2.6.3 1996/07/02 12:45:08 bde Exp $ .\" .Dd April 18, 1994 .Dt STTY 1 diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 5062c0403cdd7..40e0f242f1110 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stty.c,v 1.4 1995/05/30 00:07:28 rgrimes Exp $ + * $Id: stty.c,v 1.4.4.1 1995/08/25 03:23:33 davidg Exp $ */ #ifndef lint diff --git a/bin/stty/stty.h b/bin/stty/stty.h index 2b822d6a8fb87..115b59c712b08 100644 --- a/bin/stty/stty.h +++ b/bin/stty/stty.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stty.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: stty.h,v 1.2 1994/09/24 02:59:03 davidg Exp $ */ #include diff --git a/bin/stty/util.c b/bin/stty/util.c index 036c48eb1f163..3f62cb22e4098 100644 --- a/bin/stty/util.c +++ b/bin/stty/util.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: util.c,v 1.2 1994/09/24 02:59:05 davidg Exp $ + * $Id: util.c,v 1.2.6.1 1995/08/30 05:56:31 davidg Exp $ */ #ifndef lint diff --git a/bin/sync/Makefile b/bin/sync/Makefile index 0656381fd00cb..a4d88ebb052b8 100644 --- a/bin/sync/Makefile +++ b/bin/sync/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.3 1994/09/24 02:59:07 davidg Exp $ PROG= sync MAN8= sync.8 diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index 33c20574a3029..0d0ec2f6db429 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sync.8 8.1 (Berkeley) 5/31/93 -.\" $Id: sync.8,v 1.2 1994/09/24 02:59:08 davidg Exp $ +.\" $Id: sync.8,v 1.2.6.2 1996/06/05 02:36:27 jkh Exp $ .\" .Dd May 31, 1993 .Dt SYNC 8 diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 7e5a387e1a21c..ff82a60c402ff 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: sync.c,v 1.4 1994/09/24 02:59:09 davidg Exp $ */ #ifndef lint diff --git a/bin/test/Makefile b/bin/test/Makefile index a3a8126b435b6..6e2703803311e 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/09/24 02:59:10 davidg Exp $ PROG= test SRCS= test.c operators.c diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh index b18fefbaf9406..eda32b3a34dff 100644 --- a/bin/test/TEST.csh +++ b/bin/test/TEST.csh @@ -1,5 +1,5 @@ # @(#)TEST.csh 5.2 (Berkeley) 4/30/93 -# $Id$ +# $Id: TEST.csh,v 1.3 1994/09/24 02:59:11 davidg Exp $ #alias t '/usr/src/bin/test/obj/test \!*; echo $status' alias t '/bin/test \!*; echo $status' diff --git a/bin/test/operators.c b/bin/test/operators.c index 38d73dab38c3b..fb2ebd2b88a6d 100644 --- a/bin/test/operators.c +++ b/bin/test/operators.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: operators.c,v 1.3 1994/09/24 02:59:12 davidg Exp $ */ #ifndef lint diff --git a/bin/test/operators.h b/bin/test/operators.h index 4bf8563652fe0..19fdc68ac6d42 100644 --- a/bin/test/operators.h +++ b/bin/test/operators.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)operators.h 8.3 (Berkeley) 4/2/94 - * $Id$ + * $Id: operators.h,v 1.3 1994/09/24 02:59:13 davidg Exp $ */ #define NOT 0 diff --git a/bin/test/test.1 b/bin/test/test.1 index e7af6447f8186..9a010d1a3334a 100644 --- a/bin/test/test.1 +++ b/bin/test/test.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $Id$ +.\" $Id: test.1,v 1.2 1994/09/24 02:59:14 davidg Exp $ .\" .Dd May 31, 1993 .Dt TEST 1 diff --git a/bin/test/test.c b/bin/test/test.c index 9131c3b413d03..bed1b79c5c344 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: test.c,v 1.11.4.1 1996/02/20 09:48:53 jkh Exp $ + * $Id: test.c,v 1.11.4.2 1996/03/11 11:04:23 joerg Exp $ */ #ifndef lint diff --git a/eBones/Copyright.MIT b/eBones/Copyright.MIT deleted file mode 100644 index cd1d89bc88d79..0000000000000 --- a/eBones/Copyright.MIT +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: Copyright.MIT,v 1.3 1995/07/18 16:34:16 mark Exp $ - -The following Copyright notice applies to the original Bones package. - -/*- - Copyright (C) 1989 by the Massachusetts Institute of Technology - - Export of this software from the United States of America is assumed - to require a specific license from the United States Government. - It is the responsibility of any person or organization contemplating - export to obtain such a license before exporting. - -WITHIN THAT CONSTRAINT, permission to use, copy, modify, and -distribute this software and its documentation for any purpose and -without fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright notice and -this permission notice appear in supporting documentation, and that -the name of M.I.T. not be used in advertising or publicity pertaining -to distribution of the software without specific, written prior -permission. M.I.T. makes no representations about the suitability of -this software for any purpose. It is provided "as is" without express -or implied warranty. - - */ diff --git a/eBones/Copyright.SIPB b/eBones/Copyright.SIPB deleted file mode 100644 index 5e6c38af38e7f..0000000000000 --- a/eBones/Copyright.SIPB +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: Copyright.SIPB,v 1.3 1995/07/18 16:34:18 mark Exp $ - -The following Copyright notice applies to parts of the Bones package. -See source code for exact references. - -/*- -Copyright 1987 by the Student Information Processing Board - of the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is -hereby granted, provided that the above copyright notice -appear in all copies and that both that copyright notice and -this permission notice appear in supporting documentation, -and that the names of M.I.T. and the M.I.T. S.I.P.B. not be -used in advertising or publicity pertaining to distribution -of the software without specific, written prior permission. -M.I.T. and the M.I.T. S.I.P.B. make no representations about -the suitability of this software for any purpose. It is -provided "as is" without express or implied warranty. - - */ - diff --git a/eBones/Makefile b/eBones/Makefile deleted file mode 100644 index b52db778cf6ba..0000000000000 --- a/eBones/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -SUBDIR= include lib libexec usr.bin usr.sbin man - -SDIR= ${.CURDIR}/.. - -CODAI= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all install - -CODAD= ${MAKE} ${MFLAGS} MAKE_EBONES=yes cleandir; \ - ${MAKE} ${MFLAGS} MAKE_EBONES=yes obj; \ - ${MAKE} ${MFLAGS} MAKE_EBONES=yes depend all distribute - -# These are the programs which depend on kerberos -kprog: - cd ${SDIR}/bin/rcp; ${CODAI} - cd ${SDIR}/libexec/rlogind; ${CODAI} - cd ${SDIR}/libexec/rshd; ${CODAI} - cd ${SDIR}/sbin/mount_nfs; ${CODAI} - cd ${SDIR}/sbin/nfsd; ${CODAI} - cd ${SDIR}/usr.bin/login; ${CODAI} - cd ${SDIR}/usr.bin/passwd; ${CODAI} - cd ${SDIR}/usr.bin/rlogin; ${CODAI} - cd ${SDIR}/usr.bin/rsh; ${CODAI} - cd ${SDIR}/usr.bin/su; ${CODAI} - -bootstrap: - ( cd include; ${MAKE} ${MFLAGS} install ) - ( cd lib; ${MAKE} ${MFLAGS} depend all install ) - ${MAKE} ${MFLAGS} cleandir - ${MAKE} ${MFLAGS} obj - ${MAKE} ${MFLAGS} depend all install kprog - -help-distribute: distribute - cd ${SDIR}/bin/rcp; ${CODAD} - cd ${SDIR}/libexec/rlogind; ${CODAD} - cd ${SDIR}/libexec/rshd; ${CODAD} - cd ${SDIR}/sbin/mount_nfs; ${CODAD} - cd ${SDIR}/sbin/nfsd; ${CODAD} - cd ${SDIR}/usr.bin/login; ${CODAD} - cd ${SDIR}/usr.bin/passwd; ${CODAD} - cd ${SDIR}/usr.bin/rlogin; ${CODAD} - cd ${SDIR}/usr.bin/rsh; ${CODAD} - cd ${SDIR}/usr.bin/su; ${CODAD} - -.include diff --git a/eBones/Makefile.inc b/eBones/Makefile.inc deleted file mode 100644 index 8ea27113c5b50..0000000000000 --- a/eBones/Makefile.inc +++ /dev/null @@ -1,63 +0,0 @@ -# From: @(#)Makefile.inc 5.1 (Berkeley) 6/25/90 -# $Id$ - -DISTRIBUTION= krb - -.if exists(${.CURDIR}/../../../secure/lib/libdes/obj) -DESOBJDIR= ${.CURDIR}/../../../secure/lib/libdes/obj -.else -DESOBJDIR= ${.CURDIR}/../../../secure/lib/libdes -.endif - -.if exists(${.CURDIR}/../../lib/libkrb/obj) -KRBOBJDIR= ${.CURDIR}/../../lib/libkrb/obj -.else -KRBOBJDIR= ${.CURDIR}/../../lib/libkrb -.endif - -.if exists(${.CURDIR}/../../lib/libkdb/obj) -KDBOBJDIR= ${.CURDIR}/../../lib/libkdb/obj -.else -KDBOBJDIR= ${.CURDIR}/../../lib/libkdb -.endif - -.if exists(${.CURDIR}/../../lib/libacl/obj) -ACLOBJDIR= ${.CURDIR}/../../lib/libacl/obj -.else -ACLOBJDIR= ${.CURDIR}/../../lib/libacl -.endif - -.if exists(${.CURDIR}/../../lib/libkadm/obj) -KADMOBJDIR= ${.CURDIR}/../../lib/libkadm/obj -.else -KADMOBJDIR= ${.CURDIR}/../../lib/libkadm -.endif - -.if exists(${.CURDIR}/../../lib/librkinit/obj) -RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit/obj -.else -RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit -.endif - -CFLAGS+= -I${.CURDIR}/../../../secure/lib/libdes -I${.CURDIR}/../../include -Wall - -COMPILE_ET= compile_et - -${KRBOBJDIR}/krb_err.h: ${.CURDIR}/../../lib/libkrb/krb_err.et - test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR} - cd ${KRBOBJDIR}; compile_et krb_err.et - -CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c - -${KADMOBJDIR}/kadm_err.h: ${.CURDIR}/../../lib/libkadm/kadm_err.et - test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR} - cd ${KADMOBJDIR}; compile_et kadm_err.et - -CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c - -${RKINITOBJDIR}/rkinit_err.h: ${.CURDIR}/../../lib/librkinit/rkinit_err.et - test -e ${RKINITOBJDIR}/rkinit_err.et || \ - ln -s ${.ALLSRC} ${RKINITOBJDIR} - cd ${RKINITOBJDIR}; compile_et rkinit_err.et - -CLEANFILES+=${RKINITOBJDIR}/rkinit_err.h ${RKINITOBJDIR}/rkinit_err.c diff --git a/eBones/README.PATCH b/eBones/README.PATCH deleted file mode 100644 index 6fb39f602b4c0..0000000000000 --- a/eBones/README.PATCH +++ /dev/null @@ -1,52 +0,0 @@ -IMPORTANT! - -This distribution includes a patch (already applied), that updates -Kerberos' key generation. The gist of the patch is to replace calls -to des_random_key() with calls to des_new_random_key(). - -The primary difference is that des_random_key() uses a seeding -technique which is predictable and therefore vulnerable. -des_new_random_key() uses a feedback mechanism based on the Data -Encryption Standard (DES) and is seeded with a secret (and therefore -unknown to an attacker) value. This value is the database master -key, which is a convenient secret value. - -This patch uses the new_rnd_key.c key module (which contains the -definition and code for des_new_random_key()). It has been part of -the standard Version 4 distribution since 1992 (and was recreated -for FreeBSD in 1995). This is used in the MIT admin server (the -primary error at MIT was not upgrading all of Kerberos to use this -newer generator. This patch finishes the job). - -In addition to the patch for the Kerberos distribution this -distribution also contains a program for changing critical system keys -(namely the "krbtgt" and "changepw.kerberos" keys). When you -originally built your Kerberos database these keys were chosen at -random, using the vulnerable version of the kerberos random number -generator. Therefore it is possible for an attacker to mount an attack -to guess these values. If an attacker can determine the key for the -"krbtgt" ticket, they can construct tickets claiming to be any -kerberos principal. Similarly if an attacker can obtain the -"changepw.kerberos" key, they can change anyone's password. - -The new "fix_kdb_keys(8)" program, which you run on the KDC -server, will change these critical keys to new values using the -newer random number generator. IMPORTANT: When you run fix_kdb_keys, -all outstanding ticket granting tickets will immediately become -invalid. This will be disruptive to your user community. We recommend -that you either do this late at night or early in the morning before -most users have logged in. Alternatively pre-announce a definitive -time when you will run the program and inform your users that they -will have to get new tickets at that time (using either "kinit" or -simply by logging out and then in again). - -NOTE: The only client program modified is "ksrvutil" which is used -to generate new server keys. All other client/server programs are -unaffected. End users do *not* need to obtain new versions of -programs that use Kerberos. This is because most random number -generation in the Kerberos system is done on the KDC system. - -After getting these sources, type "make world" at the toplevel of -your source tree. This will, among other things, build the fix_kdb_keys -program. This is not necessary if you have already got prebuilt -binaries with this distribution. diff --git a/eBones/include/ChangeLog b/eBones/include/ChangeLog deleted file mode 100644 index 77bc7552a42fd..0000000000000 --- a/eBones/include/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: ChangeLog,v 1.3 1995/07/18 16:35:58 mark Exp $ - -Mon Mar 21 15:48:59 MET 1994 Piero Serini - * 1st port to FreeBSD - -Tue Nov 29 11:52:51 1988 John T Kohl (jtkohl at lycus) - - * osconf.h: add #ifdef's for SUN processors (bsd/m68k) - - * conf-bsdm68k.h: new file for BSD unix/M68000-based unix boxes - -Mon Sep 12 14:33:58 1988 Bill Sommerfeld (wesommer at ra) - - * des_conf.h: deleted file (superceded by conf.h) - - * des.h: remove #include of des_conf.h - - * des.h: remove internal details (sbox structure, bit_{32,64}) from -interface. - Rename data types. - Add #defines, turned off if NCOMPAT, for compatibility with old - versions. - - - diff --git a/eBones/include/Makefile b/eBones/include/Makefile deleted file mode 100644 index d6e263e7d8972..0000000000000 --- a/eBones/include/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# from: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -FILES= kparse.h krb.h krb_db.h - -NOOBJ= noobj -NOMAN= noman - -all include clean cleandir depend lint tags: - -beforeinstall: - -cd ${.CURDIR}; for file in ${FILES}; do \ - cmp -s $$file ${DESTDIR}/usr/include/kerberosIV/$$file || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$file \ - ${DESTDIR}/usr/include/kerberosIV; done - -.include diff --git a/eBones/include/addr_comp.h b/eBones/include/addr_comp.h deleted file mode 100644 index 2421bc683de5a..0000000000000 --- a/eBones/include/addr_comp.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 1987, 1988, 1989 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for address comparison macros. - * - * from: addr_comp.h,v 4.0 89/01/23 09:57:44 jtkohl Exp $ - * $Id: addr_comp.h,v 1.3 1995/07/18 16:36:01 mark Exp $ - */ - -#ifndef ADDR_COMP_DEFS -#define ADDR_COMP_DEFS - -/* -** Look boys and girls, a big kludge -** We need to compare the two internet addresses in network byte order, not -** local byte order. This is a *really really slow way of doing that* -** But..... -** .....it works -** so we run with it -** -** long_less_than gets fed two (u_char *)'s.... -*/ - -#define u_char_comp(x,y) \ - (((x)>(y))?(1):(((x)==(y))?(0):(-1))) - -#define long_less_than(x,y) \ - (u_char_comp((x)[0],(y)[0])?u_char_comp((x)[0],(y)[0]): \ - (u_char_comp((x)[1],(y)[1])?u_char_comp((x)[1],(y)[1]): \ - (u_char_comp((x)[2],(y)[2])?u_char_comp((x)[2],(y)[2]): \ - (u_char_comp((x)[3],(y)[3]))))) - -#endif /* ADDR_COMP_DEFS */ diff --git a/eBones/include/admin_server.h b/eBones/include/admin_server.h deleted file mode 100644 index ca0977da63b22..0000000000000 --- a/eBones/include/admin_server.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for the Kerberos administration server. - * - * from: admin_server.h,v 4.7 89/01/11 11:59:42 steiner Exp $ - * $Id: admin_server.h,v 1.3 1995/07/18 16:36:03 mark Exp $ - */ - -#ifndef ADMIN_SERVER_DEFS -#define ADMIN_SERVER_DEFS - -#define PW_SRV_VERSION 2 /* version number */ - -#define INSTALL_NEW_PW (1<<0) /* - * ver, cmd, name, password, - * old_pass, crypt_pass, uid - */ - -#define ADMIN_NEW_PW (2<<1) /* - * ver, cmd, name, passwd, - * old_pass - * (grot), crypt_pass (grot) - */ - -#define ADMIN_SET_KDC_PASSWORD (3<<1) /* ditto */ -#define ADMIN_ADD_NEW_KEY (4<<1) /* ditto */ -#define ADMIN_ADD_NEW_KEY_ATTR (5<<1) /* - * ver, cmd, name, passwd, - * inst, attr (grot) - */ -#define INSTALL_REPLY (1<<1) /* ver, cmd, name, password */ -#define RETRY_LIMIT 1 -#define TIME_OUT 30 -#define USER_TIMEOUT 90 -#define MAX_KPW_LEN 40 - -#define KADM "changepw" /* service name */ - -#endif /* ADMIN_SERVER_DEFS */ diff --git a/eBones/include/conf-bsd386i.h b/eBones/include/conf-bsd386i.h deleted file mode 100644 index a009450d70e0c..0000000000000 --- a/eBones/include/conf-bsd386i.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 1989 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: Sun 386i using SunOS (~BSD) - * - * from: conf-bsd386i.h,v 4.0 89/12/19 13:26:55 jtkohl Exp $ - * $Id: conf-bsd386i.h,v 1.3 1995/07/18 16:36:05 mark Exp $ - */ - -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX - diff --git a/eBones/include/conf-bsdapollo.h b/eBones/include/conf-bsdapollo.h deleted file mode 100644 index 12dc5806c8e55..0000000000000 --- a/eBones/include/conf-bsdapollo.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: conf-bsdapollo.h,v 4.1 89/01/24 14:26:22 jtkohl Exp $ - * $Id: conf-bsdapollo.h,v 1.3 1995/07/18 16:36:06 mark Exp $ - */ - -#define BSDUNIX -#define BITS32 -#define BIG -#define MSBFIRST -#define DES_SHIFT_SHIFT -/* - * As of SR10, the C compiler claims to be __STDC__, but doesn't support - * const. Sigh. - */ -#define const - - diff --git a/eBones/include/conf-bsdibm032.h b/eBones/include/conf-bsdibm032.h deleted file mode 100644 index 8331498e55dc5..0000000000000 --- a/eBones/include/conf-bsdibm032.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: IBM 032 (RT/PC) - * - * from: conf-bsdibm032.h,v 4.0 89/01/23 09:58:01 jtkohl Exp $ - * $Id: conf-bsdibm032.h,v 1.3 1995/07/18 16:36:08 mark Exp $ - */ - -#define BSDUNIX -#define IBMWS -#define IBMWSASM -#define BITS32 -#define BIG -#define MSBFIRST -#define MUSTALIGN diff --git a/eBones/include/conf-bsdm68k.h b/eBones/include/conf-bsdm68k.h deleted file mode 100644 index 9e60e060e509a..0000000000000 --- a/eBones/include/conf-bsdm68k.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: 68000 with BSD Unix, e.g. SUN - * - * from: conf-bsdm68k.h,v 4.0 88/11/29 11:46:58 jtkohl Exp $ - * $Id: conf-bsdm68k.h,v 1.3 1995/07/18 16:36:10 mark Exp $ - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX - diff --git a/eBones/include/conf-bsdsparc.h b/eBones/include/conf-bsdsparc.h deleted file mode 100644 index 7359aec78ec3f..0000000000000 --- a/eBones/include/conf-bsdsparc.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: SPARC with BSD Unix, e.g. SUN-4 - * - * from: conf-bsdsparc.h,v 4.0 89/06/02 13:04:06 jtkohl Exp $ - * $Id: conf-bsdsparc.h,v 1.3 1995/07/18 16:36:12 mark Exp $ - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX -#define MUSTALIGN - diff --git a/eBones/include/conf-bsdtahoe.h b/eBones/include/conf-bsdtahoe.h deleted file mode 100644 index fa8c462cf3af6..0000000000000 --- a/eBones/include/conf-bsdtahoe.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 1989 by the Regents of the University of California - * - * Machine Description : TAHOE. - * - * from: conf-bsdtahoe.h,v 4.0 89/08/30 11:06:53 jtkohl Exp $ - * $Id: conf-bsdtahoe.h,v 1.3 1995/07/18 16:36:14 mark Exp $ - */ - -#define TAHOE -#define BSDUNIX -#define BITS32 -#define BIG -#define MSBFIRST -#define MUSTALIGN -#define NOASM diff --git a/eBones/include/conf-bsdvax.h b/eBones/include/conf-bsdvax.h deleted file mode 100644 index ef0c05228fc0b..0000000000000 --- a/eBones/include/conf-bsdvax.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: VAX - * - * from: conf-bsdvax.h,v 4.0 89/01/23 09:58:12 jtkohl Exp $ - * $Id: conf-bsdvax.h,v 1.3 1995/07/18 16:36:15 mark Exp $ - */ - -#define VAX -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX - -#ifndef __STDC__ -#ifndef NOASM -#define VAXASM -#endif /* no assembly */ -#endif /* standard C */ diff --git a/eBones/include/conf-ibm370.h b/eBones/include/conf-ibm370.h deleted file mode 100644 index 7b8b504ba4deb..0000000000000 --- a/eBones/include/conf-ibm370.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: IBM 370 - * - * from: conf-ibm370.h,v 4.0 89/01/23 09:58:19 jtkohl Exp $ - * $Id: conf-ibm370.h,v 1.3 1995/07/18 16:36:17 mark Exp $ - */ - -/* What else? */ -#define BIG -#define NONASCII -#define SHORTNAMES diff --git a/eBones/include/conf-pc.h b/eBones/include/conf-pc.h deleted file mode 100644 index 4b633ffdba33d..0000000000000 --- a/eBones/include/conf-pc.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: IBM PC 8086 - * - * from: conf-pc.h,v 4.0 89/01/23 09:58:26 jtkohl Exp $ - * $Id: conf-pc.h,v 1.3 1995/07/18 16:36:19 mark Exp $ - * - */ - -#define IBMPC -#define BITS16 -#define CROSSMSDOS -#define LSBFIRST diff --git a/eBones/include/conf-pyr.h b/eBones/include/conf-pyr.h deleted file mode 100644 index f47c2155031fd..0000000000000 --- a/eBones/include/conf-pyr.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 1989 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: Pyramid - * - * from: conf-pyr.h,v 4.0 89/12/19 13:27:16 jtkohl Exp $ - * $Id: conf-pyr.h,v 1.3 1995/07/18 16:36:20 mark Exp $ - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX diff --git a/eBones/include/conf-ultmips2.h b/eBones/include/conf-ultmips2.h deleted file mode 100644 index 9733090aa2aaf..0000000000000 --- a/eBones/include/conf-ultmips2.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Machine-type definitions: DECstation 3100 (MIPS R2000) - * - * from: conf-ultmips2.h,v 4.0 89/01/23 09:58:32 jtkohl Exp $ - * $Id: conf-ultmips2.h,v 1.3 1995/07/18 16:36:22 mark Exp $ - */ - -#define MIPS2 -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX -#define MUSTALIGN diff --git a/eBones/include/conf.h b/eBones/include/conf.h deleted file mode 100644 index 64797e6bdfc46..0000000000000 --- a/eBones/include/conf.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Configuration info for operating system, hardware description, - * language implementation, C library, etc. - * - * This file should be included in (almost) every file in the Kerberos - * sources, and probably should *not* be needed outside of those - * sources. (How do we deal with /usr/include/des.h and - * /usr/include/krb.h?) - * - * from: conf.h,v 4.0 89/01/23 09:58:40 jtkohl Exp $ - * $Id: conf.h,v 1.3 1995/07/18 16:36:24 mark Exp $ - */ - -#ifndef _CONF_H_ - -#include "osconf.h" - -#ifdef SHORTNAMES -#include "names.h" -#endif - -/* - * Language implementation-specific definitions - */ - -/* special cases */ -#ifdef __HIGHC__ -/* broken implementation of ANSI C */ -#undef __STDC__ -#endif - -#ifndef __STDC__ -#define const -#define volatile -#define signed -typedef char *pointer; /* pointer to generic data */ -#define PROTOTYPE(p) () -#else -typedef void *pointer; -#define PROTOTYPE(p) p -#endif - -/* Does your compiler understand "void"? */ -#ifdef notdef -#define void int -#endif - -/* - * A few checks to see that necessary definitions are included. - */ - -/* byte order */ - -#ifndef MSBFIRST -#ifndef LSBFIRST -Error: byte order not defined. -#endif -#endif - -/* machine size */ -#ifndef BITS16 -#ifndef BITS32 -Error: how big is this machine anyways? -#endif -#endif - -/* end of checks */ - -#endif /* _CONF_H_ */ diff --git a/eBones/include/highc.h b/eBones/include/highc.h deleted file mode 100644 index 7ff2f7cbd5e04..0000000000000 --- a/eBones/include/highc.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Known breakage in the version of Metaware's High C compiler that - * we've got available.... - * - * from: highc.h,v 4.0 89/01/23 09:59:15 jtkohl Exp $ - * $Id: highc.h,v 1.3 1995/07/18 16:36:27 mark Exp $ - */ - -#define const -/*#define volatile*/ - -/* - * Some builtin functions we can take advantage of for inlining.... - */ - -#define abs _abs -/* the _max and _min builtins accept any number of arguments */ -#undef MAX -#define MAX(x,y) _max(x,y) -#undef MIN -#define MIN(x,y) _min(x,y) -/* - * I'm not sure if 65535 is a limit for this builtin, but it's - * reasonable for a string length. Or is it? - */ -/*#define strlen(s) _find_char(s,65535,0)*/ -#define bzero(ptr,len) _fill_char(ptr,len,'\0') -#define bcmp(b1,b2,len) _compare(b1,b2,len) diff --git a/eBones/include/kdc.h b/eBones/include/kdc.h deleted file mode 100644 index 70756a49afde0..0000000000000 --- a/eBones/include/kdc.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for the Kerberos Key Distribution Center. - * - * from: kdc.h,v 4.1 89/01/24 17:54:04 jon Exp $ - * $Id: kdc.h,v 1.3 1995/07/18 16:36:29 mark Exp $ - */ - -#ifndef KDC_DEFS -#define KDC_DEFS - -#define S_AD_SZ sizeof(struct sockaddr_in) - -#define max(a,b) (a>b ? a : b) -#define min(a,b) (a. - * - * This file defines the types of log messages logged by klog. Each - * type of message may be selectively turned on or off. - * - * from: klog.h,v 4.7 89/01/24 17:55:07 jon Exp $ - * $Id: klog.h,v 1.3 1995/07/18 16:36:30 mark Exp $ - */ - -#ifndef KLOG_DEFS -#define KLOG_DEFS - -#define KRBLOG "/var/log/kerberos.log" /* master server */ -#define KRBSLAVELOG "/var/log/kerberos_slave.log" /* master server */ -#define NLOGTYPE 100 /* Maximum number of log msg types */ - -#define L_NET_ERR 1 /* Error in network code */ -#define L_NET_INFO 2 /* Info on network activity */ -#define L_KRB_PERR 3 /* Kerberos protocol errors */ -#define L_KRB_PINFO 4 /* Kerberos protocol info */ -#define L_INI_REQ 5 /* Request for initial ticket */ -#define L_NTGT_INTK 6 /* Initial request not for TGT */ -#define L_DEATH_REQ 7 /* Request for server death */ -#define L_TKT_REQ 8 /* All ticket requests using a tgt */ -#define L_ERR_SEXP 9 /* Service expired */ -#define L_ERR_MKV 10 /* Master key version incorrect */ -#define L_ERR_NKY 11 /* User's key is null */ -#define L_ERR_NUN 12 /* Principal not unique */ -#define L_ERR_UNK 13 /* Principal Unknown */ -#define L_ALL_REQ 14 /* All requests */ -#define L_APPL_REQ 15 /* Application requests (using tgt) */ -#define L_KRB_PWARN 16 /* Protocol warning messages */ - -char *klog(); - -#endif /* KLOG_DEFS */ diff --git a/eBones/include/kparse.h b/eBones/include/kparse.h deleted file mode 100644 index d506d9dc3b312..0000000000000 --- a/eBones/include/kparse.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for kparse routines. - * - * from: kparse.h,v 4.5 89/01/11 12:05:53 steiner Exp $ - * $Id: kparse.h,v 1.4 1995/09/07 20:50:34 mark Exp $ - */ - -#ifndef KPARSE_DEFS -#define KPARSE_DEFS - -/* - * values returned by fGetParameterSet() - */ - -#define PS_BAD_KEYWORD -2 /* unknown or duplicate keyword */ -#define PS_SYNTAX -1 /* syntax error */ -#define PS_OKAY 0 /* got a complete parameter set */ -#define PS_EOF 1 /* nothing more in the file */ - -/* - * values returned by fGetKeywordValue() - */ - -#define KV_SYNTAX -2 /* syntax error */ -#define KV_EOF -1 /* nothing more in the file */ -#define KV_OKAY 0 /* got a keyword/value pair */ -#define KV_EOL 1 /* nothing more on this line */ - -/* - * values returned by fGetToken() - */ - -#define GTOK_BAD_QSTRING -1 /* newline found in quoted string */ -#define GTOK_EOF 0 /* end of file encountered */ -#define GTOK_QSTRING 1 /* quoted string */ -#define GTOK_STRING 2 /* unquoted string */ -#define GTOK_NUMBER 3 /* one or more digits */ -#define GTOK_PUNK 4 /* punks are punctuation, newline, - * etc. */ -#define GTOK_WHITE 5 /* one or more whitespace chars */ - -/* - * extended character classification macros - */ - -#define ISOCTAL(CH) ( (CH>='0') && (CH<='7') ) -#define ISQUOTE(CH) ( (CH=='\"') || (CH=='\'') || (CH=='`') ) -#define ISWHITESPACE(C) ( (C==' ') || (C=='\t') ) -#define ISLINEFEED(C) ( (C=='\n') || (C=='\r') || (C=='\f') ) - -/* - * tokens consist of any printable charcacter except comma, equal, or - * whitespace - */ - -#define ISTOKENCHAR(C) ((C>040) && (C<0177) && (C != ',') && (C != '=')) - -/* - * the parameter table defines the keywords that will be recognized by - * fGetParameterSet, and their default values if not specified. - */ - -typedef struct { - char *keyword; - char *defvalue; - char *value; -} parmtable; - -#define PARMCOUNT(P) (sizeof(P)/sizeof(P[0])) - -extern int LineNbr; /* current line # in parameter file */ - -extern char ErrorMsg[]; /* - * meaningful only when KV_SYNTAX, - * PS_SYNTAX, or PS_BAD_KEYWORD is - * returned by fGetKeywordValue or - * fGetParameterSet - */ - -extern char *strsave(char *p); /* defined in this module */ -extern char *strutol(char *p); /* defined in this module */ - -int fGetParameterSet(FILE *fp, parmtable parm[], int parmcount); -int fGetKeywordValue(FILE *fp, char *keyword, int klen, char *value, int vlen); -int fGetToken(FILE *fp, char *dest, int maxlen); - -#endif /* KPARSE_DEFS */ diff --git a/eBones/include/krb.h b/eBones/include/krb.h deleted file mode 100644 index 63ce3291fe1ab..0000000000000 --- a/eBones/include/krb.h +++ /dev/null @@ -1,517 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for the Kerberos library. - * - * from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $ - * $Id$ - */ - -/* Only one time, please */ -#ifndef KRB_DEFS -#define KRB_DEFS - -/* Need some defs from des.h */ -#include -#include -#include - -/* Text describing error codes */ -#define MAX_KRB_ERRORS 256 -extern char *krb_err_txt[MAX_KRB_ERRORS]; - -/* These are not defined for at least SunOS 3.3 and Ultrix 2.2 */ -#if defined(ULTRIX022) || (defined(SunOS) && SunOS < 40) -#define FD_ZERO(p) ((p)->fds_bits[0] = 0) -#define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n))) -#define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n))) -#endif /* ULTRIX022 || SunOS */ - -/* General definitions */ -#define KSUCCESS 0 -#define KFAILURE 255 - -#ifdef NO_UIDGID_T -typedef unsigned short uid_t; -typedef unsigned short gid_t; -#endif /* NO_UIDGID_T */ - -/* - * Kerberos specific definitions - * - * KRBLOG is the log file for the kerberos master server. KRB_CONF is - * the configuration file where different host machines running master - * and slave servers can be found. KRB_MASTER is the name of the - * machine with the master database. The admin_server runs on this - * machine, and all changes to the db (as opposed to read-only - * requests, which can go to slaves) must go to it. KRB_HOST is the - * default machine * when looking for a kerberos slave server. Other - * possibilities are * in the KRB_CONF file. KRB_REALM is the name of - * the realm. - */ - -#ifdef notdef -this is server - only, does not belong here; -#define KRBLOG "/etc/kerberosIV/kerberos.log" -are these used anyplace '?'; -#define VX_KRB_HSTFILE "/etc/krbhst" -#define PC_KRB_HSTFILE "\\kerberos\\krbhst" -#endif - -#define KRB_CONF "/etc/kerberosIV/krb.conf" -#define KRB_RLM_TRANS "/etc/kerberosIV/krb.realms" -#define KRB_MASTER "kerberos" -#define KRB_HOST KRB_MASTER -#define KRB_REALM "ATHENA.MIT.EDU" - -/* The maximum sizes for aname, realm, sname, and instance +1 */ -#define ANAME_SZ 40 -#define REALM_SZ 40 -#define SNAME_SZ 40 -#define INST_SZ 40 -/* include space for '.' and '@' */ -#define MAX_K_NAME_SZ (ANAME_SZ + INST_SZ + REALM_SZ + 2) -#define KKEY_SZ 100 -#define VERSION_SZ 1 -#define MSG_TYPE_SZ 1 -#define DATE_SZ 26 /* RTI date output */ - -#define MAX_HSTNM 100 - -#ifndef DEFAULT_TKT_LIFE /* allow compile-time override */ -#define DEFAULT_TKT_LIFE 96 /* default lifetime for krb_mk_req - & co., 8 hrs */ -#endif - -/* Definition of text structure used to pass text around */ -#define MAX_KTXT_LEN 1250 - -struct ktext { - int length; /* Length of the text */ - unsigned char dat[MAX_KTXT_LEN]; /* The data itself */ - unsigned long mbz; /* zero to catch runaway strings */ -}; - -typedef struct ktext *KTEXT; -typedef struct ktext KTEXT_ST; - - -/* Definitions for send_to_kdc */ -#define CLIENT_KRB_TIMEOUT 4 /* time between retries */ -#define CLIENT_KRB_RETRY 5 /* retry this many times */ -#define CLIENT_KRB_BUFLEN 512 /* max unfragmented packet */ - -/* Definitions for ticket file utilities */ -#define R_TKT_FIL 0 -#define W_TKT_FIL 1 - -/* Definitions for cl_get_tgt */ -#ifdef PC -#define CL_GTGT_INIT_FILE "\\kerberos\\k_in_tkts" -#else -#define CL_GTGT_INIT_FILE "/etc/k_in_tkts" -#endif PC - -/* Parameters for rd_ap_req */ -/* Maximum alloable clock skew in seconds */ -#define CLOCK_SKEW 5*60 -/* Filename for readservkey */ -#define KEYFILE "/etc/kerberosIV/srvtab" - -/* Structure definition for rd_ap_req */ - -struct auth_dat { - unsigned char k_flags; /* Flags from ticket */ - char pname[ANAME_SZ]; /* Principal's name */ - char pinst[INST_SZ]; /* His Instance */ - char prealm[REALM_SZ]; /* His Realm */ - unsigned long checksum; /* Data checksum (opt) */ - C_Block session; /* Session Key */ - int life; /* Life of ticket */ - unsigned long time_sec; /* Time ticket issued */ - unsigned long address; /* Address in ticket */ - KTEXT_ST reply; /* Auth reply (opt) */ -}; - -typedef struct auth_dat AUTH_DAT; - -/* Structure definition for credentials returned by get_cred */ - -struct credentials { - char service[ANAME_SZ]; /* Service name */ - char instance[INST_SZ]; /* Instance */ - char realm[REALM_SZ]; /* Auth domain */ - C_Block session; /* Session key */ - int lifetime; /* Lifetime */ - int kvno; /* Key version number */ - KTEXT_ST ticket_st; /* The ticket itself */ - long issue_date; /* The issue time */ - char pname[ANAME_SZ]; /* Principal's name */ - char pinst[INST_SZ]; /* Principal's instance */ -}; - -typedef struct credentials CREDENTIALS; - -/* Structure definition for rd_private_msg and rd_safe_msg */ - -struct msg_dat { - unsigned char *app_data; /* pointer to appl data */ - unsigned long app_length; /* length of appl data */ - unsigned long hash; /* hash to lookup replay */ - int swap; /* swap bytes? */ - long time_sec; /* msg timestamp seconds */ - unsigned char time_5ms; /* msg timestamp 5ms units */ -}; - -typedef struct msg_dat MSG_DAT; - - -/* Location of ticket file for save_cred and get_cred */ -#ifdef PC -#define TKT_FILE "\\kerberos\\ticket.ses" -#else -#define TKT_FILE tkt_string() -#define TKT_ROOT "/tmp/tkt" -#endif PC - -/* Error codes returned from the KDC */ -#define KDC_OK 0 /* Request OK */ -#define KDC_NAME_EXP 1 /* Principal expired */ -#define KDC_SERVICE_EXP 2 /* Service expired */ -#define KDC_AUTH_EXP 3 /* Auth expired */ -#define KDC_PKT_VER 4 /* Protocol version unknown */ -#define KDC_P_MKEY_VER 5 /* Wrong master key version */ -#define KDC_S_MKEY_VER 6 /* Wrong master key version */ -#define KDC_BYTE_ORDER 7 /* Byte order unknown */ -#define KDC_PR_UNKNOWN 8 /* Principal unknown */ -#define KDC_PR_N_UNIQUE 9 /* Principal not unique */ -#define KDC_NULL_KEY 10 /* Principal has null key */ -#define KDC_GEN_ERR 20 /* Generic error from KDC */ - - -/* Values returned by get_credentials */ -#define GC_OK 0 /* Retrieve OK */ -#define RET_OK 0 /* Retrieve OK */ -#define GC_TKFIL 21 /* Can't read ticket file */ -#define RET_TKFIL 21 /* Can't read ticket file */ -#define GC_NOTKT 22 /* Can't find ticket or TGT */ -#define RET_NOTKT 22 /* Can't find ticket or TGT */ - - -/* Values returned by mk_ap_req */ -#define MK_AP_OK 0 /* Success */ -#define MK_AP_TGTEXP 26 /* TGT Expired */ - -/* Values returned by rd_ap_req */ -#define RD_AP_OK 0 /* Request authentic */ -#define RD_AP_UNDEC 31 /* Can't decode authenticator */ -#define RD_AP_EXP 32 /* Ticket expired */ -#define RD_AP_NYV 33 /* Ticket not yet valid */ -#define RD_AP_REPEAT 34 /* Repeated request */ -#define RD_AP_NOT_US 35 /* The ticket isn't for us */ -#define RD_AP_INCON 36 /* Request is inconsistent */ -#define RD_AP_TIME 37 /* delta_t too big */ -#define RD_AP_BADD 38 /* Incorrect net address */ -#define RD_AP_VERSION 39 /* protocol version mismatch */ -#define RD_AP_MSG_TYPE 40 /* invalid msg type */ -#define RD_AP_MODIFIED 41 /* message stream modified */ -#define RD_AP_ORDER 42 /* message out of order */ -#define RD_AP_UNAUTHOR 43 /* unauthorized request */ - -/* Values returned by get_pw_tkt */ -#define GT_PW_OK 0 /* Got password changing tkt */ -#define GT_PW_NULL 51 /* Current PW is null */ -#define GT_PW_BADPW 52 /* Incorrect current password */ -#define GT_PW_PROT 53 /* Protocol Error */ -#define GT_PW_KDCERR 54 /* Error returned by KDC */ -#define GT_PW_NULLTKT 55 /* Null tkt returned by KDC */ - - -/* Values returned by send_to_kdc */ -#define SKDC_OK 0 /* Response received */ -#define SKDC_RETRY 56 /* Retry count exceeded */ -#define SKDC_CANT 57 /* Can't send request */ - -/* - * Values returned by get_intkt - * (can also return SKDC_* and KDC errors) - */ - -#define INTK_OK 0 /* Ticket obtained */ -#define INTK_W_NOTALL 61 /* Not ALL tickets returned */ -#define INTK_BADPW 62 /* Incorrect password */ -#define INTK_PROT 63 /* Protocol Error */ -#define INTK_ERR 70 /* Other error */ - -/* Values returned by get_adtkt */ -#define AD_OK 0 /* Ticket Obtained */ -#define AD_NOTGT 71 /* Don't have tgt */ - -/* Error codes returned by ticket file utilities */ -#define NO_TKT_FIL 76 /* No ticket file found */ -#define TKT_FIL_ACC 77 /* Couldn't access tkt file */ -#define TKT_FIL_LCK 78 /* Couldn't lock ticket file */ -#define TKT_FIL_FMT 79 /* Bad ticket file format */ -#define TKT_FIL_INI 80 /* tf_init not called first */ - -/* Error code returned by kparse_name */ -#define KNAME_FMT 81 /* Bad Kerberos name format */ - -/* Error codes returned by get_local_addr and bind_local_addr */ -#define GT_LADDR_NOSOCK 82 /* Can't open socket */ -#define GT_LADDR_IFLIST 83 /* - * Can't retrieve local interface - * configuration list - */ -#define GT_LADDR_NVI 84 /* No valid local interface found */ -#define BND_LADDR_BIND 85 /* Can't bind local address */ - -/* Error code returned by krb_mk_safe */ -#define SAFE_PRIV_ERROR -1 /* syscall error */ - -/* - * macros for byte swapping; also scratch space - * u_quad 0-->7, 1-->6, 2-->5, 3-->4, 4-->3, 5-->2, 6-->1, 7-->0 - * u_long 0-->3, 1-->2, 2-->1, 3-->0 - * u_short 0-->1, 1-->0 - */ - -#define swap_u_16(x) {\ - unsigned long _krb_swap_tmp[4];\ - swab(((char *) x) +0, ((char *) _krb_swap_tmp) +14 ,2); \ - swab(((char *) x) +2, ((char *) _krb_swap_tmp) +12 ,2); \ - swab(((char *) x) +4, ((char *) _krb_swap_tmp) +10 ,2); \ - swab(((char *) x) +6, ((char *) _krb_swap_tmp) +8 ,2); \ - swab(((char *) x) +8, ((char *) _krb_swap_tmp) +6 ,2); \ - swab(((char *) x) +10,((char *) _krb_swap_tmp) +4 ,2); \ - swab(((char *) x) +12,((char *) _krb_swap_tmp) +2 ,2); \ - swab(((char *) x) +14,((char *) _krb_swap_tmp) +0 ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,16);\ - } - -#define swap_u_12(x) {\ - unsigned long _krb_swap_tmp[4];\ - swab(( char *) x, ((char *) _krb_swap_tmp) +10 ,2); \ - swab(((char *) x) +2, ((char *) _krb_swap_tmp) +8 ,2); \ - swab(((char *) x) +4, ((char *) _krb_swap_tmp) +6 ,2); \ - swab(((char *) x) +6, ((char *) _krb_swap_tmp) +4 ,2); \ - swab(((char *) x) +8, ((char *) _krb_swap_tmp) +2 ,2); \ - swab(((char *) x) +10,((char *) _krb_swap_tmp) +0 ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,12);\ - } - -#define swap_C_Block(x) {\ - unsigned long _krb_swap_tmp[4];\ - swab(( char *) x, ((char *) _krb_swap_tmp) +6 ,2); \ - swab(((char *) x) +2,((char *) _krb_swap_tmp) +4 ,2); \ - swab(((char *) x) +4,((char *) _krb_swap_tmp) +2 ,2); \ - swab(((char *) x) +6,((char *) _krb_swap_tmp) ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,8);\ - } -#define swap_u_quad(x) {\ - unsigned long _krb_swap_tmp[4];\ - swab(( char *) &x, ((char *) _krb_swap_tmp) +6 ,2); \ - swab(((char *) &x) +2,((char *) _krb_swap_tmp) +4 ,2); \ - swab(((char *) &x) +4,((char *) _krb_swap_tmp) +2 ,2); \ - swab(((char *) &x) +6,((char *) _krb_swap_tmp) ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)&x,8);\ - } - -#define swap_u_long(x) {\ - unsigned long _krb_swap_tmp[4];\ - swab((char *) &x, ((char *) _krb_swap_tmp) +2 ,2); \ - swab(((char *) &x) +2,((char *) _krb_swap_tmp),2); \ - x = _krb_swap_tmp[0]; \ - } - -#define swap_u_short(x) {\ - unsigned short _krb_swap_sh_tmp; \ - swab((char *) &x, ( &_krb_swap_sh_tmp) ,2); \ - x = (unsigned short) _krb_swap_sh_tmp; \ - } - -/* Kerberos ticket flag field bit definitions */ -#define K_FLAG_ORDER 0 /* bit 0 --> lsb */ -#define K_FLAG_1 /* reserved */ -#define K_FLAG_2 /* reserved */ -#define K_FLAG_3 /* reserved */ -#define K_FLAG_4 /* reserved */ -#define K_FLAG_5 /* reserved */ -#define K_FLAG_6 /* reserved */ -#define K_FLAG_7 /* reserved, bit 7 --> msb */ - -#ifndef PC -char *tkt_string(); -#endif PC - -#ifdef OLDNAMES -#define krb_mk_req mk_ap_req -#define krb_rd_req rd_ap_req -#define krb_kntoln an_to_ln -#define krb_set_key set_serv_key -#define krb_get_cred get_credentials -#define krb_mk_priv mk_private_msg -#define krb_rd_priv rd_private_msg -#define krb_mk_safe mk_safe_msg -#define krb_rd_safe rd_safe_msg -#define krb_mk_err mk_appl_err_msg -#define krb_rd_err rd_appl_err_msg -#define krb_ck_repl check_replay -#define krb_get_pw_in_tkt get_in_tkt -#define krb_get_svc_in_tkt get_svc_in_tkt -#define krb_get_pw_tkt get_pw_tkt -#define krb_realmofhost krb_getrealm -#define krb_get_phost get_phost -#define krb_get_krbhst get_krbhst -#define krb_get_lrealm get_krbrlm -#endif OLDNAMES - -/* Defines for krb_sendauth and krb_recvauth */ - -#define KOPT_DONT_MK_REQ 0x00000001 /* don't call krb_mk_req */ -#define KOPT_DO_MUTUAL 0x00000002 /* do mutual auth */ - -#define KOPT_DONT_CANON 0x00000004 /* - * don't canonicalize inst as - * a hostname - */ - -#define KRB_SENDAUTH_VLEN 8 /* length for version strings */ - -#ifdef ATHENA_COMPAT -#define KOPT_DO_OLDSTYLE 0x00000008 /* use the old-style protocol */ -#endif ATHENA_COMPAT - -/* libacl */ -void acl_canonicalize_principal __P((char *principal, char *buf)); -int acl_check __P((char *acl, char *principal)); -int acl_exact_match __P((char *acl, char *principal)); -int acl_add __P((char *acl, char *principal)); -int acl_delete __P((char *acl, char *principal)); -int acl_initialize __P((char *acl_file, int mode)); - -/* libkrb - krb.3 */ -int krb_mk_req __P((KTEXT authent, char *service, char *instance, char *realm, - long checksum); -int krb_rd_req __P((KTEXT authent, char *service, char *instance, - long from_addr, AUTH_DAT *ad, char *fn)); -int krb_kntoln __P((AUTH_DAT *ad, char *lname)); -int krb_set_key __P((char *key, int cvt)); -int krb_get_cred __P((char *service, char *instance, char *realm, - CREDENTIALS *c)); -long krb_mk_priv __P((u_char *in, u_char *out, u_long in_length, - des_key_schedule schedule, des_cblock key, struct sockaddr_in *sender, - struct sockaddr_in *receiver)); -long krb_rd_priv __P((u_char *in, u_long in_length, Key_schedule schedule, - des_cblock key, struct sockaddr_in *sender, struct sockaddr_in *receiver, - MSG_DAT *msg_data)); -long krb_mk_safe __P((u_char *in, u_char *out, u_long in_length, - des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver)); -long krb_rd_safe __P((u_char *in, u_long length, des_cblock *key, - struct sockaddr_in *sender, struct sockaddr_in *receiver, - MSG_DAT *msg_data)); -long krb_mk_err __P((u_char *out, long code, char *string)); -int krb_rd_err __P((u_char *in, u_long in_length, long *code, MSG_DAT *m_data)); - -/* libkrb - krb_sendauth.3 */ -int krb_sendauth __P((long options, int fd, KTEXT ticket, char *service, - char *inst, char *realm, u_long checksum, MSG_DAT *msg_data, - CREDENTIALS *cred, Key_schedule schedule, struct sockaddr_in *laddr, - struct sockaddr_in *faddr, char *version)); -int krb_recvauth __P((long options, int fd, KTEXT ticket, char *service, - char *instance, struct sockaddr_in *faddr, struct sockaddr_in *laddr, - AUTH_DAT *kdata, char *filename, Key_schedule schedule, char *version)); -int krb_net_write __P((int fd, char *buf, int len)); -int krb_net_read __P((int fd, char *buf, int len)); - -/* libkrb - krb_realmofhost.3 */ -char *krb_realmofhost __P((char *host)); -char *krb_get_phost __P((char *alias)); -int krb_get_krbhst __P((char *h, char *r, int n)); -int krb_get_admhst __P((char *h, char *r, int n)); -int krb_get_lrealm __P((char *r, int n)); - -/* libkrb - krb_set_tkt_string.3 */ -void krb_set_tkt_string(char *val); - -/* libkrb - kuserok.3 */ -int kuserok __P((AUTH_DAT *authdata, char *localuser)); - -/* libkrb - tf_util.3 */ -int tf_init __P((char *tf_name, int rw)); -int tf_get_pname __P((char *p)); -int tf_get_pinst __P((char *inst)); -int tf_get_cred __P((CREDENTIALS *c)); -void tf_close __P((void)); - -/* Internal routines */ -int des_set_key_krb __P((des_cblock *inkey, des_key_schedule insched)); -void des_clear_key_krb __P((void)); -int des_read __P((int fd, char *buf, int len)); -int des_write __P((int fd, char *buf, int len)); -int krb_get_tf_realm __P((char *ticket_file, char *realm)); -int krb_get_in_tkt __P((char *user, char *instance, char *realm, char *service, - char *sinstance, int life, int (*key_proc)(), int (*decrypt_proc)(), - char *arg)); -int krb_get_pw_in_tkt __P((char *user, char *instance, char *realm, - char *service, char *sinstance, int life, char *password)); -int krb_get_svc_in_tkt __P((char *user, char *instance, char *realm, - char *service, char *sinstance, int life, char *srvtab)); -int krb_get_tf_fullname __P((char *ticket_file, char *name, char *instance, - char *realm)); -int save_credentials __P((char *service, char *instance, char *realm, - des_cblock session, int lifetime, int kvno, KTEXT ticket, long issue_date)); -int read_service_key __P((char *service, char *instance, char *realm, int kvno, - char *file, char *key)); -int get_ad_tkt __P((char *service, char *sinstance, char *realm, int lifetime)); -int send_to_kdc __P((KTEXT pkt, KTEXT rpkt, char *realm)); -int krb_bind_local_addr __P((int s)); -int krb_get_local_addr __P((struct sockaddr_in *returned_addr)); -int krb_create_ticket __P((KTEXT tkt, unsigned char flags, char *pname, - char *pinstance, char *prealm, long paddress, char *session, short life, - long time_sec, char *sname, char *sinstance, C_Block key)); -int decomp_ticket __P((KTEXT tkt, unsigned char *flags, char *pname, - char *pinstance, char *prealm, unsigned long *paddress, des_cblock session, - int *life, unsigned long *time_sec, char *sname, char *sinstance, - des_cblock key, des_key_schedule key_s)); -int create_ciph __P((KTEXT c, C_Block session, char *service, char *instance, - char *realm, unsigned long life, int kvno, KTEXT tkt, - unsigned long kdc_time, C_Block key)); -int kname_parse __P((char *np, char *ip, char *rp, char *fullname)); -int tf_save_cred __P((char *service, char *instance, char *realm, - des_cblock session, int lifetime, int kvno, KTEXT ticket, long issue_date)); -int getst(int fd, char *s, int n)); -int pkt_clen __P((KTEXT pkt)); -int in_tkt __P((char *pname, char *pinst)); -int dest_tkt __P((void)); -char *month_sname __P((int n)); -void log __P(()); /* Actually VARARGS - markm */ -void kset_logfile __P((char *filename)); -void set_logfile __P((char *filename)); -int k_isinst __P((char *s)); -int k_isrealm __P((char *s)); -int k_isname __P((char *s)); -int k_gethostname __P((char *name, int namelen)); -int kerb_init __P((void)); -void kerb_fini __P((void)); -int kerb_db_set_name __P((char *name)); -int kerb_db_set_lockmode __P((int mode)); -int kerb_db_create __P((char *db_name)); -int kerb_db_iterate __P((int (*func)(), char *arg)); -int kerb_db_rename __P((char *from, char *to)); -long kerb_get_db_age __P((void)); -char * stime __P((long *t)); - -long kdb_get_master_key __P((int prompt, C_Block master_key, - Key_schedule master_key_sched)); -long kdb_verify_master_key __P((C_Block master_key, - Key_schedule master_key_sched, FILE *out)); -void kdb_encrypt_key __P((C_Block in, C_Block out, C_Block master_key, - Key_schedule master_key_sched, int e_d_flag)); - -extern int krb_ap_req_debug; -extern int krb_debug; - -#endif KRB_DEFS diff --git a/eBones/include/krb_conf.h b/eBones/include/krb_conf.h deleted file mode 100644 index ac7c2a83ec70f..0000000000000 --- a/eBones/include/krb_conf.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * This file contains configuration information for the Kerberos library - * which is machine specific; currently, this file contains - * configuration information for the vax, the "ibm032" (RT), and the - * "PC8086" (IBM PC). - * - * Note: cross-compiled targets must appear BEFORE their corresponding - * cross-compiler host. Otherwise, both will be defined when running - * the native compiler on the programs that construct cross-compiled - * sources. - * - * from: krb_conf.h,v 4.0 89/01/23 09:59:27 jtkohl Exp $ - * $Id: krb_conf.h,v 1.3 1995/07/18 16:36:36 mark Exp $ - */ - -#ifndef KRB_CONF_DEFS -#define KRB_CONF_DEFS - -/* Byte ordering */ -extern int krbONE; -#define HOST_BYTE_ORDER (* (char *) &krbONE) -#define MSB_FIRST 0 /* 68000, IBM RT/PC */ -#define LSB_FIRST 1 /* Vax, PC8086 */ - -#endif KRB_CONF_DEFS diff --git a/eBones/include/krb_db.h b/eBones/include/krb_db.h deleted file mode 100644 index d6d125a3551f4..0000000000000 --- a/eBones/include/krb_db.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * spm Project Athena 8/85 - * - * This file defines data structures for the kerberos - * authentication/authorization database. - * - * They MUST correspond to those defined in *.rel - * - * from: krb_db.h,v 4.9 89/01/24 17:55:39 jon Exp $ - * $Id: krb_db.h,v 1.4 1995/08/25 21:25:12 mark Exp $ - */ - -#ifndef KRB_DB_DEFS -#define KRB_DB_DEFS - -#define KERB_M_NAME "K" /* Kerberos */ -#define KERB_M_INST "M" /* Master */ -#define KERB_DEFAULT_NAME "default" -#define KERB_DEFAULT_INST "" -#define DBM_FILE "/etc/kerberosIV/principal" - -/* this also defines the number of queue headers */ -#define KERB_DB_HASH_MODULO 64 - - -/* Arguments to kerb_dbl_lock() */ - -#define KERB_DBL_EXCLUSIVE 1 -#define KERB_DBL_SHARED 0 - -/* arguments to kerb_db_set_lockmode() */ - -#define KERB_DBL_BLOCKING 0 -#define KERB_DBL_NONBLOCKING 1 - -/* Principal defines the structure of a principal's name */ - -typedef struct { - char name[ANAME_SZ]; - char instance[INST_SZ]; - - unsigned long key_low; - unsigned long key_high; - unsigned long exp_date; - char exp_date_txt[DATE_SZ]; - unsigned long mod_date; - char mod_date_txt[DATE_SZ]; - unsigned short attributes; - unsigned char max_life; - unsigned char kdc_key_ver; - unsigned char key_version; - - char mod_name[ANAME_SZ]; - char mod_instance[INST_SZ]; - char *old; /* cast to (Principal *); not in db, - * ptr to old vals */ -} - Principal; - -typedef struct { - long cpu; - long elapsed; - long dio; - long pfault; - long t_stamp; - long n_retrieve; - long n_replace; - long n_append; - long n_get_stat; - long n_put_stat; -} - DB_stat; - -/* Dba defines the structure of a database administrator */ - -typedef struct { - char name[ANAME_SZ]; - char instance[INST_SZ]; - unsigned short attributes; - unsigned long exp_date; - char exp_date_txt[DATE_SZ]; - char *old; /* - * cast to (Dba *); not in db, ptr to - * old vals - */ -} - Dba; - -extern int kerb_get_principal(char *name, char *inst, Principal *principal, - unsigned int max, int *more); -extern int kerb_put_principal(Principal *principal, unsigned int n); -extern void kerb_db_get_stat(DB_stat *s); -extern void kerb_db_put_stat(DB_stat *s); -extern int kerb_get_dba(char *name, char *inst, Dba *dba, unsigned int max, - int *more); -extern int kerb_db_get_dba(char *dba_name, char *dba_inst, Dba *dba, - unsigned int max, int *more); - -extern void krb_print_principal(Principal *p); -extern int kerb_db_get_principal(char *name, char *inst, Principal *principal, - unsigned int max, int *more); -extern int kerb_db_put_principal(Principal *principal, unsigned int max); -extern int kerb_db_init(void); -extern void kerb_db_fini(void); - -#endif /* KRB_DB_DEFS */ diff --git a/eBones/include/lsb_addr_comp.h b/eBones/include/lsb_addr_comp.h deleted file mode 100644 index 2686ade5481f3..0000000000000 --- a/eBones/include/lsb_addr_comp.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Comparison macros to emulate LSBFIRST comparison results of network - * byte-order quantities - * - * from: lsb_addr_comp.h,v 4.0 89/01/23 15:44:46 jtkohl Exp $ - * $Id: lsb_addr_comp.h,v 1.3 1995/07/18 16:36:39 mark Exp $ - */ - -#ifndef LSB_ADDR_COMP_DEFS -#define LSB_ADDR_COMP_DEFS - -#include "osconf.h" - -#ifdef LSBFIRST -#define lsb_net_ulong_less(x,y) ((x < y) ? -1 : ((x > y) ? 1 : 0)) -#define lsb_net_ushort_less(x,y) ((x < y) ? -1 : ((x > y) ? 1 : 0)) -#else -/* MSBFIRST */ -#define u_char_comp(x,y) \ - (((x)>(y))?(1):(((x)==(y))?(0):(-1))) -/* This is gross, but... */ -#define lsb_net_ulong_less(x, y) long_less_than((u_char *)&x, (u_char *)&y) -#define lsb_net_ushort_less(x, y) short_less_than((u_char *)&x, (u_char *)&y) - -#define long_less_than(x,y) \ - (u_char_comp((x)[3],(y)[3])?u_char_comp((x)[3],(y)[3]): \ - (u_char_comp((x)[2],(y)[2])?u_char_comp((x)[2],(y)[2]): \ - (u_char_comp((x)[1],(y)[1])?u_char_comp((x)[1],(y)[1]): \ - (u_char_comp((x)[0],(y)[0]))))) -#define short_less_than(x,y) \ - (u_char_comp((x)[1],(y)[1])?u_char_comp((x)[1],(y)[1]): \ - (u_char_comp((x)[0],(y)[0]))) - -#endif /* LSBFIRST */ - -#endif /* LSB_ADDR_COMP_DEFS */ diff --git a/eBones/include/osconf.h b/eBones/include/osconf.h deleted file mode 100644 index e0af41a9570c7..0000000000000 --- a/eBones/include/osconf.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Athena configuration. - * - * from: osconf.h,v 4.4 89/12/19 13:26:27 jtkohl Exp $ - * $Id: osconf.h,v 1.3 1995/07/18 16:36:41 mark Exp $ - */ - -#ifdef tahoe -#include "conf-bsdtahoe.h" -#else /* !tahoe */ -#ifdef vax -#include "conf-bsdvax.h" -#else /* !vax */ -#if defined(mips) && defined(ultrix) -#include "conf-ultmips2.h" -#else /* !Ultrix MIPS-2 */ -#ifdef ibm032 -#include "conf-bsdibm032.h" -#else /* !ibm032 */ -#ifdef apollo -#include "conf-bsdapollo.h" -#else /* !apollo */ -#ifdef sun -#ifdef sparc -#include "conf-bsdsparc.h" -#else /* sun but not sparc */ -#ifdef i386 -#include "conf-bsd386i.h" -#else /* sun but not (sparc or 386i) */ -#include "conf-bsdm68k.h" -#endif /* i386 */ -#endif /* sparc */ -#else /* !sun */ -#ifdef pyr -#include "conf-pyr.h" -#endif /* pyr */ -#endif /* sun */ -#endif /* apollo */ -#endif /* ibm032 */ -#endif /* mips */ -#endif /* vax */ -#endif /* tahoe */ - -#if defined(__FreeBSD__) && defined(i386) -#include "conf-bsd386i.h" -#endif - diff --git a/eBones/include/passwd_server.h b/eBones/include/passwd_server.h deleted file mode 100644 index 662e65423cd2f..0000000000000 --- a/eBones/include/passwd_server.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file for password server - * - * from: passwd_server.h,v 4.6 89/01/11 15:12:22 steiner Exp $ - * $Id: passwd_server.h,v 1.3 1995/07/18 16:36:43 mark Exp $ - */ - -#ifndef PASSWD_SERVER_DEFS -#define PASSWD_SERVER_DEFS - -#define PW_SRV_VERSION 2 /* version number */ -#define RETRY_LIMIT 1 -#define TIME_OUT 30 -#define USER_TIMEOUT 90 -#define MAX_KPW_LEN 40 /* hey, seems like a good number */ - -#define INSTALL_NEW_PW (1<<0) /* - * ver, cmd, name, password, old_pass, - * crypt_pass, uid - */ - -#define INSTALL_REPLY (1<<1) /* ver, cmd, name, password */ - -#endif /* PASSWD_SERVER_DEFS */ diff --git a/eBones/include/principal.h b/eBones/include/principal.h deleted file mode 100644 index 7fa67bc42976d..0000000000000 --- a/eBones/include/principal.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Definitions for principal names. - * - * from: principal.h,v 4.5 89/01/11 15:15:01 steiner Exp $ - * $Id: principal.h,v 1.3 1995/07/18 16:36:45 mark Exp $ - */ - -#ifndef PRINCIPAL_DEFS -#define PRINCIPAL_DEFS - -#define NAME_LEN 39 -#define INSTANCE_LEN 39 - -#endif /* PRINCIPAL_DEFS */ diff --git a/eBones/include/prot.h b/eBones/include/prot.h deleted file mode 100644 index ec0ee07dcc9f3..0000000000000 --- a/eBones/include/prot.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * Include file with authentication protocol information. - * - * from: prot.h,v 4.13 89/01/24 14:27:22 jtkohl Exp $ - * $Id: prot.h,v 1.3 1995/07/18 16:36:46 mark Exp $ - */ - -#include - -#ifndef PROT_DEFS -#define PROT_DEFS - -#define KRB_PORT 750 /* PC's don't have - * /etc/services */ -#define KRB_PROT_VERSION 4 -#define MAX_PKT_LEN 1000 -#define MAX_TXT_LEN 1000 -#define TICKET_GRANTING_TICKET "krbtgt" - -/* Macro's to obtain various fields from a packet */ - -#define pkt_version(packet) (unsigned int) *(packet->dat) -#define pkt_msg_type(packet) (unsigned int) *(packet->dat+1) -#define pkt_a_name(packet) (packet->dat+2) -#define pkt_a_inst(packet) \ - (packet->dat+3+strlen((char *)pkt_a_name(packet))) -#define pkt_a_realm(packet) \ - (pkt_a_inst(packet)+1+strlen((char *)pkt_a_inst(packet))) - -/* Macro to obtain realm from application request */ -#define apreq_realm(auth) (auth->dat + 3) - -#define pkt_time_ws(packet) (char *) \ - (packet->dat+5+strlen((char *)pkt_a_name(packet)) + \ - strlen((char *)pkt_a_inst(packet)) + \ - strlen((char *)pkt_a_realm(packet))) - -#define pkt_no_req(packet) (unsigned short) \ - *(packet->dat+9+strlen((char *)pkt_a_name(packet)) + \ - strlen((char *)pkt_a_inst(packet)) + \ - strlen((char *)pkt_a_realm(packet))) -#define pkt_x_date(packet) (char *) \ - (packet->dat+10+strlen((char *)pkt_a_name(packet)) + \ - strlen((char *)pkt_a_inst(packet)) + \ - strlen((char *)pkt_a_realm(packet))) -#define pkt_err_code(packet) ( (char *) \ - (packet->dat+9+strlen((char *)pkt_a_name(packet)) + \ - strlen((char *)pkt_a_inst(packet)) + \ - strlen((char *)pkt_a_realm(packet)))) -#define pkt_err_text(packet) \ - (packet->dat+13+strlen((char *)pkt_a_name(packet)) + \ - strlen((char *)pkt_a_inst(packet)) + \ - strlen((char *)pkt_a_realm(packet))) - -/* Routines to create and read packets may be found in prot.c */ - -KTEXT create_auth_reply(); -KTEXT create_death_packet(); -KTEXT pkt_cipher(); - -/* Message types , always leave lsb for byte order */ - -#define AUTH_MSG_KDC_REQUEST 1<<1 -#define AUTH_MSG_KDC_REPLY 2<<1 -#define AUTH_MSG_APPL_REQUEST 3<<1 -#define AUTH_MSG_APPL_REQUEST_MUTUAL 4<<1 -#define AUTH_MSG_ERR_REPLY 5<<1 -#define AUTH_MSG_PRIVATE 6<<1 -#define AUTH_MSG_SAFE 7<<1 -#define AUTH_MSG_APPL_ERR 8<<1 -#define AUTH_MSG_DIE 63<<1 - -/* values for kerb error codes */ - -#define KERB_ERR_OK 0 -#define KERB_ERR_NAME_EXP 1 -#define KERB_ERR_SERVICE_EXP 2 -#define KERB_ERR_AUTH_EXP 3 -#define KERB_ERR_PKT_VER 4 -#define KERB_ERR_NAME_MAST_KEY_VER 5 -#define KERB_ERR_SERV_MAST_KEY_VER 6 -#define KERB_ERR_BYTE_ORDER 7 -#define KERB_ERR_PRINCIPAL_UNKNOWN 8 -#define KERB_ERR_PRINCIPAL_NOT_UNIQUE 9 -#define KERB_ERR_NULL_KEY 10 - -#endif /* PROT_DEFS */ diff --git a/eBones/include/rkinit.h b/eBones/include/rkinit.h deleted file mode 100644 index 8be12029cd8e6..0000000000000 --- a/eBones/include/rkinit.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * $Id: rkinit.h,v 1.2 1993/12/23 16:47:27 dglo Exp $ - * $Source: /usr/sww/share/src/kerberosIV.BSD/include/RCS/rkinit.h,v $ - * $Author: dglo $ - * - * Main header file for rkinit library users - */ - -#ifndef __RKINIT_H__ -#define __RKINIT_H__ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid_rkinit_h = "$Id: rkinit.h,v 1.2 1993/12/23 16:47:27 dglo Exp $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include - -#ifdef __STDC__ -#define RK_PROTO(x) x -#else -#define RK_PROTO(x) () -#endif /* __STDC__ */ - -typedef struct { - char aname[ANAME_SZ + 1]; - char inst[INST_SZ + 1]; - char realm[REALM_SZ + 1]; - char sname[ANAME_SZ + 1]; - char sinst[INST_SZ + 1]; - char username[9]; /* max local name length + 1 */ - char tktfilename[MAXPATHLEN + 1]; - u_int lifetime; -} rkinit_info; - -#define RKINIT_SUCCESS 0 - -/* Function declarations */ -extern int rkinit RK_PROTO((char *, char *, rkinit_info *, int)); -extern char *rkinit_errmsg RK_PROTO((char *)); - -#endif /* __RKINIT_H__ */ diff --git a/eBones/include/rkinit_private.h b/eBones/include/rkinit_private.h deleted file mode 100644 index 7784b6e51d0a6..0000000000000 --- a/eBones/include/rkinit_private.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * $Id: rkinit_private.h,v 1.4 1993/12/23 16:47:39 dglo Exp $ - * $Source: /usr/sww/share/src/kerberosIV.BSD/include/RCS/rkinit_private.h,v $ - * $Author: dglo $ - * - * Header file for rkinit library and server internal use - */ - -#ifndef __RKINIT_PRIVATE_H__ -#define __RKINIT_PRIVATE_H__ - -#if !defined(lint) && !defined(SABER) -static const char *rcsid_rkinit_private_h = "$Id: rkinit_private.h,v 1.4 1993/12/23 16:47:39 dglo Exp $"; -#endif /* lint || SABER */ - -#include -#include - -#ifdef __STDC__ -#define RK_PROTO(x) x -#else -#define RK_PROTO(x) () -#define const -#endif /* __STDC__ */ - -/* Lowest and highest versions supported */ -#define RKINIT_LVERSION 3 -#define RKINIT_HVERSION 3 - -/* Service to be used; port number to fall back on if service isn't found */ -#define SERVENT "rkinit" -#define PORT 2108 - -/* Key for kerberos authentication */ -#define KEY "rcmd" - -/* Packet format information */ -#define PKT_TYPE 0 -#define PKT_LEN 1 -#define PKT_DATA (PKT_LEN + sizeof(u_int32_t)) - -/* Number of retries during message reads */ -#define RETRIES 15 - -/* - * Message types for packets. Make sure that rki_mt_to_string is right in - * rk_util.c - */ -#define MT_STATUS 0 -#define MT_CVERSION 1 -#define MT_SVERSION 2 -#define MT_RKINIT_INFO 3 -#define MT_SKDC 4 -#define MT_CKDC 5 -#define MT_AUTH 6 -#define MT_DROP 7 - -/* Miscellaneous protocol constants */ -#define VERSION_INFO_SIZE 2 - -/* Useful definitions */ -#define BCLEAR(a) bzero((char *)(a), sizeof(a)) -#define SBCLEAR(a) bzero((char *)&(a), sizeof(a)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#define max(a,b) (((a) > (b)) ? (a) : (b)) - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifdef _JBLEN -#define SETJMP_TYPEDEFED -#endif - -/* Function declarations */ -int rki_key_proc RK_PROTO((char *, char *, char *, char *, des_cblock *)); -int rki_get_tickets RK_PROTO((int, char *, char *, rkinit_info *)); -int rki_send_packet RK_PROTO((int, char, u_int32_t, const char *)); -int rki_get_packet RK_PROTO((int, u_char, u_int32_t *, char *)); -int rki_setup_rpc RK_PROTO((char *)); -int rki_rpc_exchange_version_info RK_PROTO((int, int, int *, int *)); -int rki_rpc_send_rkinit_info RK_PROTO((rkinit_info *)); -int rki_rpc_get_status RK_PROTO((void)); -int rki_rpc_get_ktext RK_PROTO((int, KTEXT, u_char)); -int rki_rpc_sendauth RK_PROTO((KTEXT)); -int rki_rpc_get_skdc RK_PROTO((KTEXT)); -int rki_rpc_send_ckdc RK_PROTO((MSG_DAT *)); -int rki_get_csaddr RK_PROTO((struct sockaddr_in *, struct sockaddr_in *)); -void rki_drop_server RK_PROTO((void)); -void rki_cleanup_rpc RK_PROTO((void)); -void rki_dmsg RK_PROTO((char *)); -const char *rki_mt_to_string RK_PROTO((int)); -int rki_choose_version RK_PROTO((int *)); -int rki_send_rkinit_info RK_PROTO((int, rkinit_info *)); -#ifdef SETJMP_TYPEDEFED -void (*rki_setup_timer RK_PROTO((jmp_buf env))) RK_PROTO((int)); -#endif -void rki_restore_timer RK_PROTO((void (*old_alrm)(int))); -void rki_cleanup_rpc RK_PROTO((void)); - - -#endif /* __RKINIT_PRIVATE_H__ */ diff --git a/eBones/lib/Makefile b/eBones/lib/Makefile deleted file mode 100644 index 206bcaacfcf48..0000000000000 --- a/eBones/lib/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -SUBDIR= libacl libkdb libkrb libkadm librkinit - -.include diff --git a/eBones/lib/Makefile.inc b/eBones/lib/Makefile.inc deleted file mode 100644 index b0b4ed25a2904..0000000000000 --- a/eBones/lib/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -SHLIB_MAJOR?= 2 -SHLIB_MINOR?= 0 - -.include "../Makefile.inc" diff --git a/eBones/lib/libacl/Makefile b/eBones/lib/libacl/Makefile deleted file mode 100644 index 7fa05c06a09cc..0000000000000 --- a/eBones/lib/libacl/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.4 1995/09/13 17:23:49 markm Exp $ - -LIB= acl -CFLAGS+=-DDEBUG -DKERBEROS -SRCS= acl_files.c -MAN3= acl_check.3 -MLINKS= acl_check.3 acl_canonicalize_principal.3 \ - acl_check.3 acl_exact_match.3 acl_check.3 acl_add.3 \ - acl_check.3 acl_delete.3 acl_check.3 acl_initialize.3 - -.include diff --git a/eBones/lib/libacl/acl_check.3 b/eBones/lib/libacl/acl_check.3 deleted file mode 100644 index 2e5129c47038e..0000000000000 --- a/eBones/lib/libacl/acl_check.3 +++ /dev/null @@ -1,183 +0,0 @@ -.\" from: acl_check.3,v 4.1 89/01/23 11:06:54 jtkohl Exp $ -.\" $Id: acl_check.3,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH ACL_CHECK 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -acl_canonicalize_principal, acl_check, acl_exact_match, acl_add, -acl_delete, acl_initialize \- Access control list routines -.SH SYNOPSIS -.nf -.nj -.ft B -cc \-lacl \-lkrb -.PP -.ft B -#include -.PP -.ft B -acl_canonicalize_principal(principal, buf) -char *principal; -char *buf; -.PP -.ft B -acl_check(acl, principal) -char *acl; -char *principal; -.PP -.ft B -acl_exact_match(acl, principal) -char *acl; -char *principal; -.PP -.ft B -acl_add(acl, principal) -char *acl; -char *principal; -.PP -.ft B -acl_delete(acl, principal) -char *acl; -char *principal; -.PP -.ft B -acl_initialize(acl_file, mode) -char *acl_file; -int mode; -.fi -.ft R -.SH DESCRIPTION -.SS Introduction -.PP -An access control list (ACL) is a list of principals, where each -principal is represented by a text string which cannot contain -whitespace. The library allows application programs to refer to named -access control lists to test membership and to atomically add and -delete principals using a natural and intuitive interface. At -present, the names of access control lists are required to be Unix -filenames, and refer to human-readable Unix files; in the future, when -a networked ACL server is implemented, the names may refer to a -different namespace specific to the ACL service. -.PP -.SS Principal Names -.PP -Principal names have the form -.nf -.in +5n -[.][@] -.in -5n -e.g.: -.in +5n -asp -asp.root -asp@ATHENA.MIT.EDU -asp.@ATHENA.MIT.EDU -asp.root@ATHENA.MIT.EDU -.in -5n -.fi -It is possible for principals to be underspecified. If an instance is -missing, it is assumed to be "". If realm is missing, it is assumed -to be the local realm as determined by -.IR krb_get_lrealm (3). -The canonical form contains all of name, instance, -and realm; the acl_add and acl_delete routines will always -leave the file in that form. Note that the canonical form of -asp@ATHENA.MIT.EDU is actually asp.@ATHENA.MIT.EDU. -.SS Routines -.PP -.I acl_canonicalize_principal -stores the canonical form of -.I principal -in -.IR buf . -.I Buf -must contain enough -space to store a principal, given the limits on the sizes of name, -instance, and realm specified as ANAME_SZ, INST_SZ, and REALM_SZ, -respectively, in -.IR /usr/include/kerberosIV/krb.h . -.PP -.I acl_check -returns nonzero if -.I principal -appears in -.IR acl . -Returns 0 if principal -does not appear in acl, or if an error occurs. Canonicalizes -principal before checking, and allows the ACL to contain wildcards. The -only supported wildcards are entries of the form -name.*@realm, *.*@realm, and *.*@*. An asterisk matches any value for the -its component field. For example, "jtkohl.*@*" would match principal -jtkohl, with any instance and any realm. -.PP -.I acl_exact_match -performs like -.IR acl_check , -but does no canonicalization or wildcard matching. -.PP -.I acl_add -atomically adds -.I principal -to -.IR acl . -Returns 0 if successful, nonzero otherwise. It is considered a failure -if -.I principal -is already in -.IR acl . -This routine will canonicalize -.IR principal , -but will treat wildcards literally. -.PP -.I acl_delete -atomically deletes -.I principal -from -.IR acl . -Returns 0 if successful, -nonzero otherwise. It is considered a failure if -.I principal -is not -already in -.IR acl . -This routine will canonicalize -.IR principal , -but will treat wildcards literally. -.PP -.I acl_initialize -initializes -.IR acl_file . -If the file -.I acl_file -does not exist, -.I acl_initialize -creates it with mode -.IR mode . -If the file -.I acl_file -exists, -.I acl_initialize -removes all members. Returns 0 if successful, -nonzero otherwise. WARNING: Mode argument is likely to change with -the eventual introduction of an ACL service. -.SH NOTES -In the presence of concurrency, there is a very small chance that -.I acl_add -or -.I acl_delete -could report success even though it would have -had no effect. This is a necessary side effect of using lock files -for concurrency control rather than flock(2), which is not supported -by NFS. -.PP -The current implementation caches ACLs in memory in a hash-table -format for increased efficiency in checking membership; one effect of -the caching scheme is that one file descriptor will be kept open for -each ACL cached, up to a maximum of 8. -.SH SEE ALSO -kerberos(3), krb_get_lrealm(3) -.SH AUTHOR -James Aspnes (MIT Project Athena) diff --git a/eBones/lib/libacl/acl_files.c b/eBones/lib/libacl/acl_files.c deleted file mode 100644 index 7670f2aa22aac..0000000000000 --- a/eBones/lib/libacl/acl_files.c +++ /dev/null @@ -1,555 +0,0 @@ -/* - * - * Copyright 1987,1989 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * . - * - * from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $ - * $Id: acl_files.c,v 1.5 1995/09/07 20:50:26 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: acl_files.c,v 1.5 1995/09/07 20:50:26 mark Exp $"; -#endif lint -#endif - - -/*** Routines for manipulating access control list files ***/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "krb.h" - -__BEGIN_DECLS -static int acl_abort __P((char *, FILE *)); -__END_DECLS - -#ifndef KRB_REALM -#define KRB_REALM "ATHENA.MIT.EDU" -#endif - -/* "aname.inst@realm" */ -#define MAX_PRINCIPAL_SIZE (ANAME_SZ + INST_SZ + REALM_SZ + 3) -#define INST_SEP '.' -#define REALM_SEP '@' - -#define LINESIZE 2048 /* Maximum line length in an acl file */ - -#define NEW_FILE "%s.~NEWACL~" /* Format for name of altered acl file */ -#define WAIT_TIME 300 /* Maximum time allowed write acl file */ - -#define CACHED_ACLS 8 /* How many acls to cache */ - /* Each acl costs 1 open file descriptor */ -#define ACL_LEN 16 /* Twice a reasonable acl length */ - -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) - -#define COR(a,b) ((a!=NULL)?(a):(b)) - -/* Canonicalize a principal name */ -/* If instance is missing, it becomes "" */ -/* If realm is missing, it becomes the local realm */ -/* Canonicalized form is put in canon, which must be big enough to hold - MAX_PRINCIPAL_SIZE characters */ -void -acl_canonicalize_principal(principal, canon) -char *principal; -char *canon; -{ - char *dot, *atsign, *end; - int len; - - dot = index(principal, INST_SEP); - atsign = index(principal, REALM_SEP); - - /* Maybe we're done already */ - if(dot != NULL && atsign != NULL) { - if(dot < atsign) { - /* It's for real */ - /* Copy into canon */ - strncpy(canon, principal, MAX_PRINCIPAL_SIZE); - canon[MAX_PRINCIPAL_SIZE-1] = '\0'; - return; - } else { - /* Nope, it's part of the realm */ - dot = NULL; - } - } - - /* No such luck */ - end = principal + strlen(principal); - - /* Get the principal name */ - len = MIN(ANAME_SZ, COR(dot, COR(atsign, end)) - principal); - strncpy(canon, principal, len); - canon += len; - - /* Add INST_SEP */ - *canon++ = INST_SEP; - - /* Get the instance, if it exists */ - if(dot != NULL) { - ++dot; - len = MIN(INST_SZ, COR(atsign, end) - dot); - strncpy(canon, dot, len); - canon += len; - } - - /* Add REALM_SEP */ - *canon++ = REALM_SEP; - - /* Get the realm, if it exists */ - /* Otherwise, default to local realm */ - if(atsign != NULL) { - ++atsign; - len = MIN(REALM_SZ, end - atsign); - strncpy(canon, atsign, len); - canon += len; - *canon++ = '\0'; - } else if(krb_get_lrealm(canon, 1) != KSUCCESS) { - strcpy(canon, KRB_REALM); - } -} - -/* Get a lock to modify acl_file */ -/* Return new FILE pointer */ -/* or NULL if file cannot be modified */ -/* REQUIRES WRITE PERMISSION TO CONTAINING DIRECTORY */ -static FILE * -acl_lock_file(acl_file) -char *acl_file; -{ - struct stat s; - char new[LINESIZE]; - int nfd; - FILE *nf; - int mode; - - if(stat(acl_file, &s) < 0) return(NULL); - mode = s.st_mode; - sprintf(new, NEW_FILE, acl_file); - for(;;) { - /* Open the new file */ - if((nfd = open(new, O_WRONLY|O_CREAT|O_EXCL, mode)) < 0) { - if(errno == EEXIST) { - /* Maybe somebody got here already, maybe it's just old */ - if(stat(new, &s) < 0) return(NULL); - if(time(0) - s.st_ctime > WAIT_TIME) { - /* File is stale, kill it */ - unlink(new); - continue; - } else { - /* Wait and try again */ - sleep(1); - continue; - } - } else { - /* Some other error, we lose */ - return(NULL); - } - } - - /* If we got to here, the lock file is ours and ok */ - /* Reopen it under stdio */ - if((nf = fdopen(nfd, "w")) == NULL) { - /* Oops, clean up */ - unlink(new); - } - return(nf); - } -} - -/* Commit changes to acl_file written onto FILE *f */ -/* Returns zero if successful */ -/* Returns > 0 if lock was broken */ -/* Returns < 0 if some other error occurs */ -/* Closes f */ -static int -acl_commit(acl_file, f) -char *acl_file; -FILE *f; -{ - char new[LINESIZE]; - int ret; - struct stat s; - - sprintf(new, NEW_FILE, acl_file); - if(fflush(f) < 0 - || fstat(fileno(f), &s) < 0 - || s.st_nlink == 0) { - acl_abort(acl_file, f); - return(-1); - } - - ret = rename(new, acl_file); - fclose(f); - return(ret); -} - -/* - * Abort changes to acl_file written onto FILE *f - * Returns 0 if successful, < 0 otherwise - * Closes f - */ -static int -acl_abort(acl_file, f) -char *acl_file; -FILE *f; -{ - char new[LINESIZE]; - int ret; - struct stat s; - - /* make sure we aren't nuking someone else's file */ - if(fstat(fileno(f), &s) < 0 || s.st_nlink == 0) { - fclose(f); - return(-1); - } else { - sprintf(new, NEW_FILE, acl_file); - ret = unlink(new); - fclose(f); - return(ret); - } -} - -/* Initialize an acl_file */ -/* Creates the file with permissions perm if it does not exist */ -/* Erases it if it does */ -/* Returns return value of acl_commit */ -int -acl_initialize(acl_file, perm) -char *acl_file; -int perm; -{ - FILE *new; - int fd; - - /* Check if the file exists already */ - if((new = acl_lock_file(acl_file)) != NULL) { - return(acl_commit(acl_file, new)); - } else { - /* File must be readable and writable by owner */ - if((fd = open(acl_file, O_CREAT|O_EXCL, perm|0600)) < 0) { - return(-1); - } else { - close(fd); - return(0); - } - } -} - -/* Eliminate all whitespace character in buf */ -/* Modifies its argument */ -static void -nuke_whitespace(buf) -char *buf; -{ - register char *pin, *pout; - - for(pin = pout = buf; *pin != '\0'; pin++) - if(!isspace(*pin)) *pout++ = *pin; - *pout = '\0'; /* Terminate the string */ -} - -/* Hash table stuff */ - -struct hashtbl { - int size; /* Max number of entries */ - int entries; /* Actual number of entries */ - char **tbl; /* Pointer to start of table */ -}; - -/* Make an empty hash table of size s */ -static struct hashtbl * -make_hash(size) -int size; -{ - struct hashtbl *h; - - if(size < 1) size = 1; - h = (struct hashtbl *) malloc(sizeof(struct hashtbl)); - h->size = size; - h->entries = 0; - h->tbl = (char **) calloc(size, sizeof(char *)); - return(h); -} - -/* Destroy a hash table */ -static void -destroy_hash(h) -struct hashtbl *h; -{ - int i; - - for(i = 0; i < h->size; i++) { - if(h->tbl[i] != NULL) free(h->tbl[i]); - } - free(h->tbl); - free(h); -} - -/* Compute hash value for a string */ -static unsigned -hashval(s) -register char *s; -{ - register unsigned hv; - - for(hv = 0; *s != '\0'; s++) { - hv ^= ((hv << 3) ^ *s); - } - return(hv); -} - -/* Add an element to a hash table */ -static void -add_hash(h, el) -struct hashtbl *h; -char *el; -{ - unsigned hv; - char *s; - char **old; - int i; - - /* Make space if it isn't there already */ - if(h->entries + 1 > (h->size >> 1)) { - old = h->tbl; - h->tbl = (char **) calloc(h->size << 1, sizeof(char *)); - for(i = 0; i < h->size; i++) { - if(old[i] != NULL) { - hv = hashval(old[i]) % (h->size << 1); - while(h->tbl[hv] != NULL) hv = (hv+1) % (h->size << 1); - h->tbl[hv] = old[i]; - } - } - h->size = h->size << 1; - free(old); - } - - hv = hashval(el) % h->size; - while(h->tbl[hv] != NULL && strcmp(h->tbl[hv], el)) hv = (hv+1) % h->size; - s = malloc(strlen(el)+1); - strcpy(s, el); - h->tbl[hv] = s; - h->entries++; -} - -/* Returns nonzero if el is in h */ -static int -check_hash(h, el) -struct hashtbl *h; -char *el; -{ - unsigned hv; - - for(hv = hashval(el) % h->size; - h->tbl[hv] != NULL; - hv = (hv + 1) % h->size) { - if(!strcmp(h->tbl[hv], el)) return(1); - } - return(0); -} - -struct acl { - char filename[LINESIZE]; /* Name of acl file */ - int fd; /* File descriptor for acl file */ - struct stat status; /* File status at last read */ - struct hashtbl *acl; /* Acl entries */ -}; - -static struct acl acl_cache[CACHED_ACLS]; - -static int acl_cache_count = 0; -static int acl_cache_next = 0; - -/* Returns < 0 if unsuccessful in loading acl */ -/* Returns index into acl_cache otherwise */ -/* Note that if acl is already loaded, this is just a lookup */ -static int -acl_load(name) -char *name; -{ - int i; - FILE *f; - struct stat s; - char buf[MAX_PRINCIPAL_SIZE]; - char canon[MAX_PRINCIPAL_SIZE]; - - /* See if it's there already */ - for(i = 0; i < acl_cache_count; i++) { - if(!strcmp(acl_cache[i].filename, name) - && acl_cache[i].fd >= 0) goto got_it; - } - - /* It isn't, load it in */ - /* maybe there's still room */ - if(acl_cache_count < CACHED_ACLS) { - i = acl_cache_count++; - } else { - /* No room, clean one out */ - i = acl_cache_next; - acl_cache_next = (acl_cache_next + 1) % CACHED_ACLS; - close(acl_cache[i].fd); - if(acl_cache[i].acl) { - destroy_hash(acl_cache[i].acl); - acl_cache[i].acl = (struct hashtbl *) 0; - } - } - - /* Set up the acl */ - strcpy(acl_cache[i].filename, name); - if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1); - /* Force reload */ - acl_cache[i].acl = (struct hashtbl *) 0; - - got_it: - /* - * See if the stat matches - * - * Use stat(), not fstat(), as the file may have been re-created by - * acl_add or acl_delete. If this happens, the old inode will have - * no changes in the mod-time and the following test will fail. - */ - if(stat(acl_cache[i].filename, &s) < 0) return(-1); - if(acl_cache[i].acl == (struct hashtbl *) 0 - || s.st_nlink != acl_cache[i].status.st_nlink - || s.st_mtime != acl_cache[i].status.st_mtime - || s.st_ctime != acl_cache[i].status.st_ctime) { - /* Gotta reload */ - if(acl_cache[i].fd >= 0) close(acl_cache[i].fd); - if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1); - if((f = fdopen(acl_cache[i].fd, "r")) == NULL) return(-1); - if(acl_cache[i].acl) destroy_hash(acl_cache[i].acl); - acl_cache[i].acl = make_hash(ACL_LEN); - while(fgets(buf, sizeof(buf), f) != NULL) { - nuke_whitespace(buf); - acl_canonicalize_principal(buf, canon); - add_hash(acl_cache[i].acl, canon); - } - fclose(f); - acl_cache[i].status = s; - } - return(i); -} - -/* Returns nonzero if it can be determined that acl contains principal */ -/* Principal is not canonicalized, and no wildcarding is done */ -int -acl_exact_match(acl, principal) -char *acl; -char *principal; -{ - int idx; - - return((idx = acl_load(acl)) >= 0 - && check_hash(acl_cache[idx].acl, principal)); -} - -/* Returns nonzero if it can be determined that acl contains principal */ -/* Recognizes wildcards in acl of the form - name.*@realm, *.*@realm, and *.*@* */ -int -acl_check(acl, principal) -char *acl; -char *principal; -{ - char buf[MAX_PRINCIPAL_SIZE]; - char canon[MAX_PRINCIPAL_SIZE]; - char *realm; - - acl_canonicalize_principal(principal, canon); - - /* Is it there? */ - if(acl_exact_match(acl, canon)) return(1); - - /* Try the wildcards */ - realm = index(canon, REALM_SEP); - *index(canon, INST_SEP) = '\0'; /* Chuck the instance */ - - sprintf(buf, "%s.*%s", canon, realm); - if(acl_exact_match(acl, buf)) return(1); - - sprintf(buf, "*.*%s", realm); - if(acl_exact_match(acl, buf) || acl_exact_match(acl, "*.*@*")) return(1); - - return(0); -} - -/* Adds principal to acl */ -/* Wildcards are interpreted literally */ -int -acl_add(acl, principal) -char *acl; -char *principal; -{ - int idx; - int i; - FILE *new; - char canon[MAX_PRINCIPAL_SIZE]; - - acl_canonicalize_principal(principal, canon); - - if((new = acl_lock_file(acl)) == NULL) return(-1); - if((acl_exact_match(acl, canon)) - || (idx = acl_load(acl)) < 0) { - acl_abort(acl, new); - return(-1); - } - /* It isn't there yet, copy the file and put it in */ - for(i = 0; i < acl_cache[idx].acl->size; i++) { - if(acl_cache[idx].acl->tbl[i] != NULL) { - if(fputs(acl_cache[idx].acl->tbl[i], new) == NULL - || putc('\n', new) != '\n') { - acl_abort(acl, new); - return(-1); - } - } - } - fputs(canon, new); - putc('\n', new); - return(acl_commit(acl, new)); -} - -/* Removes principal from acl */ -/* Wildcards are interpreted literally */ -int -acl_delete(acl, principal) -char *acl; -char *principal; -{ - int idx; - int i; - FILE *new; - char canon[MAX_PRINCIPAL_SIZE]; - - acl_canonicalize_principal(principal, canon); - - if((new = acl_lock_file(acl)) == NULL) return(-1); - if((!acl_exact_match(acl, canon)) - || (idx = acl_load(acl)) < 0) { - acl_abort(acl, new); - return(-1); - } - /* It isn't there yet, copy the file and put it in */ - for(i = 0; i < acl_cache[idx].acl->size; i++) { - if(acl_cache[idx].acl->tbl[i] != NULL - && strcmp(acl_cache[idx].acl->tbl[i], canon)) { - fputs(acl_cache[idx].acl->tbl[i], new); - putc('\n', new); - } - } - return(acl_commit(acl, new)); -} - diff --git a/eBones/lib/libacl/acl_files.doc b/eBones/lib/libacl/acl_files.doc deleted file mode 100644 index 4096f9bbb3d38..0000000000000 --- a/eBones/lib/libacl/acl_files.doc +++ /dev/null @@ -1,107 +0,0 @@ -PROTOTYPE ACL LIBRARY - -Introduction - -An access control list (ACL) is a list of principals, where each -principal is is represented by a text string which cannot contain -whitespace. The library allows application programs to refer to named -access control lists to test membership and to atomically add and -delete principals using a natural and intuitive interface. At -present, the names of access control lists are required to be Unix -filenames, and refer to human-readable Unix files; in the future, when -a networked ACL server is implemented, the names may refer to a -different namespace specific to the ACL service. - - -Usage - -cc -lacl -lkrb. - - - -Principal Names - -Principal names have the form - -[.][@] - -e.g. - -asp -asp.root -asp@ATHENA.MIT.EDU -asp.@ATHENA.MIT.EDU -asp.root@ATHENA.MIT.EDU - -It is possible for principals to be underspecified. If instance is -missing, it is assumed to be "". If realm is missing, it is assumed -to be local_realm. The canonical form contains all of name, instance, -and realm; the acl_add and acl_delete routines will always -leave the file in that form. Note that the canonical form of -asp@ATHENA.MIT.EDU is actually asp.@ATHENA.MIT.EDU. - - -Routines - -acl_canonicalize_principal(principal, buf) -char *principal; -char *buf; /*RETVAL*/ - -Store the canonical form of principal in buf. Buf must contain enough -space to store a principal, given the limits on the sizes of name, -instance, and realm specified in /usr/include/krb.h. - -acl_check(acl, principal) -char *acl; -char *principal; - -Returns nonzero if principal appears in acl. Returns 0 if principal -does not appear in acl, or if an error occurs. Canonicalizes -principal before checking, and allows the ACL to contain wildcards. - -acl_exact_match(acl, principal) -char *acl; -char *principal; - -Like acl_check, but does no canonicalization or wildcarding. - -acl_add(acl, principal) -char *acl; -char *principal; - -Atomically adds principal to acl. Returns 0 if successful, nonzero -otherwise. It is considered a failure if principal is already in acl. -This routine will canonicalize principal, but will treat wildcards -literally. - -acl_delete(acl, principal) -char *acl; -char *principal; - -Atomically deletes principal from acl. Returns 0 if successful, -nonzero otherwise. It is consider a failure if principal is not -already in acl. This routine will canonicalize principal, but will -treat wildcards literally. - -acl_initialize(acl, mode) -char *acl; -int mode; - -Initialize acl. If acl file does not exist, creates it with mode -mode. If acl exists, removes all members. Returns 0 if successful, -nonzero otherwise. WARNING: Mode argument is likely to change with -the eventual introduction of an ACL service. - - -Known problems - -In the presence of concurrency, there is a very small chance that -acl_add or acl_delete could report success even though it would have -had no effect. This is a necessary side effect of using lock files -for concurrency control rather than flock(2), which is not supported -by NFS. - -The current implementation caches ACLs in memory in a hash-table -format for increased efficiency in checking membership; one effect of -the caching scheme is that one file descriptor will be kept open for -each ACL cached, up to a maximum of 8. diff --git a/eBones/lib/libkadm/EXPORTABLE b/eBones/lib/libkadm/EXPORTABLE deleted file mode 100644 index e478483783301..0000000000000 --- a/eBones/lib/libkadm/EXPORTABLE +++ /dev/null @@ -1,4 +0,0 @@ -The files in this directory are believed to be exportable. - --GAWollman - diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile deleted file mode 100644 index 955cc2ae40c1c..0000000000000 --- a/eBones/lib/libkadm/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.8 1995/09/15 06:20:23 gibbs Exp $ - -LIB= kadm - -SRCS= kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c -CFLAGS+= -I. -I${.CURDIR} -I${KRBOBJDIR} -DPOSIX - -beforeinstall: kadm_err.c - -cd ${.CURDIR}; cmp -s kadm.h \ - ${DESTDIR}/usr/include/kerberosIV/kadm.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm.h \ - ${DESTDIR}/usr/include/kerberosIV - -cd ${.OBJDIR}; cmp -s kadm_err.h \ - ${DESTDIR}/usr/include/kerberosIV/kadm_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm_err.h \ - ${DESTDIR}/usr/include/kerberosIV - -.include - -kadm_err.c: ${KADMOBJDIR}/kadm_err.h - -kadm_cli_wrap.o: ${KRBOBJDIR}/krb_err.h diff --git a/eBones/lib/libkadm/kadm.h b/eBones/lib/libkadm/kadm.h deleted file mode 100644 index 21a23bb8f8d92..0000000000000 --- a/eBones/lib/libkadm/kadm.h +++ /dev/null @@ -1,164 +0,0 @@ -/* - * $Source: /usr/cvs/src/eBones/libkadm/kadm.h,v $ - * $Author: mark $ - * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp - * - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Definitions for Kerberos administration server & client - */ - -#ifndef KADM_DEFS -#define KADM_DEFS - -/* - * kadm.h - * Header file for the fourth attempt at an admin server - * Doug Church, December 28, 1989, MIT Project Athena - */ - -/* for those broken Unixes without this defined... should be in sys/param.h */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif - -#include -#include -#include -#include -#include -#include - -/* The global structures for the client and server */ -typedef struct { - struct sockaddr_in admin_addr; - struct sockaddr_in my_addr; - int my_addr_len; - int admin_fd; /* file descriptor for link to admin server */ - char sname[ANAME_SZ]; /* the service name */ - char sinst[INST_SZ]; /* the services instance */ - char krbrlm[REALM_SZ]; -} Kadm_Client; - -typedef struct { /* status of the server, i.e the parameters */ - int inter; /* Space for command line flags */ - char *sysfile; /* filename of server */ -} admin_params; /* Well... it's the admin's parameters */ - -/* Largest password length to be supported */ -#define MAX_KPW_LEN 128 - -/* Largest packet the admin server will ever allow itself to return */ -#define KADM_RET_MAX 2048 - -/* That's right, versions are 8 byte strings */ -#define KADM_VERSTR "KADM0.0A" -#define KADM_ULOSE "KYOULOSE" /* sent back when server can't - decrypt client's msg */ -#define KADM_VERSIZE strlen(KADM_VERSTR) - -/* the lookups for the server instances */ -#define PWSERV_NAME "changepw" -#define KADM_SNAME "kerberos_master" -#define KADM_SINST "kerberos" - -/* Attributes fields constants and macros */ -#define ALLOC 2 -#define RESERVED 3 -#define DEALLOC 4 -#define DEACTIVATED 5 -#define ACTIVE 6 - -/* Kadm_vals structure for passing db fields into the server routines */ -#define FLDSZ 4 - -typedef struct { - u_char fields[FLDSZ]; /* The active fields in this struct */ - char name[ANAME_SZ]; - char instance[INST_SZ]; - unsigned long key_low; - unsigned long key_high; - unsigned long exp_date; - unsigned short attributes; - unsigned char max_life; -} Kadm_vals; /* The basic values structure in Kadm */ - -/* Kadm_vals structure for passing db fields into the server routines */ -#define FLDSZ 4 - -/* Need to define fields types here */ -#define KADM_NAME 31 -#define KADM_INST 30 -#define KADM_EXPDATE 29 -#define KADM_ATTR 28 -#define KADM_MAXLIFE 27 -#define KADM_DESKEY 26 - -/* To set a field entry f in a fields structure d */ -#define SET_FIELD(f,d) (d[3-(f/8)]|=(1<<(f%8))) - -/* To set a field entry f in a fields structure d */ -#define CLEAR_FIELD(f,d) (d[3-(f/8)]&=(~(1<<(f%8)))) - -/* Is field f in fields structure d */ -#define IS_FIELD(f,d) (d[3-(f/8)]&(1<<(f%8))) - -/* Various return codes */ -#define KADM_SUCCESS 0 - -#define WILDCARD_STR "*" - -enum acl_types { -ADDACL, -GETACL, -MODACL -}; - -/* Various opcodes for the admin server's functions */ -#define CHANGE_PW 2 -#define ADD_ENT 3 -#define MOD_ENT 4 -#define GET_ENT 5 - -/* XXX This doesn't belong here!!! */ -#ifdef POSIX -typedef void sigtype; -#else -typedef int sigtype; -#endif - -int vals_to_stream(Kadm_vals *dt_in, u_char **dt_out); -int stream_to_vals(u_char *dt_in, Kadm_vals *dt_out, int maxlen); - -int build_field_header(u_char *cont, u_char **st); -int check_field_header(u_char *st, u_char *cont, int maxlen); - -int stv_string(u_char *st, char *dat, int loc, int stlen, int maxlen); -int stv_short(u_char *st, u_short *dat, int loc, int maxlen); -int stv_long(u_char *st, u_long *dat, int loc, int maxlen); -int stv_char(u_char *st, u_char *dat, int loc, int maxlen); - -int vts_string(char *dat, u_char **st, int loc); -int vts_short(u_short dat, u_char **st, int loc); -int vts_long(u_long dat, u_char **st, int loc); -int vts_char(u_char dat, u_char **st, int loc); - -int kadm_cli_conn(void); -void kadm_cli_disconn(void); -int kadm_cli_send(u_char *st_dat, int st_siz, u_char **ret_dat, int *ret_siz); -int kadm_cli_out(u_char *dat, int dat_len, u_char **ret_dat, int *ret_siz); -int kadm_cli_keyd(des_cblock s_k, des_key_schedule s_s); - -int kadm_get(Kadm_vals *vals, u_char fl[4]); -int kadm_mod(Kadm_vals *vals1, Kadm_vals *vals2); -int kadm_add(Kadm_vals *vals); -int kadm_change_pw(des_cblock newkey); -int kadm_init_link(char n[], char i[], char r[]); -void prin_vals(Kadm_vals *vals); -void kadm_vals_to_prin(u_char fields[FLDSZ], Principal *new, Kadm_vals *old); -void kadm_prin_to_vals(u_char fields[FLDSZ], Kadm_vals *new, Principal *old); - -#endif KADM_DEFS diff --git a/eBones/lib/libkadm/kadm_cli_wrap.c b/eBones/lib/libkadm/kadm_cli_wrap.c deleted file mode 100644 index 9ca0bdff0f5ff..0000000000000 --- a/eBones/lib/libkadm/kadm_cli_wrap.c +++ /dev/null @@ -1,514 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Kerberos administration server client-side routines - */ - -#if 0 -#ifndef lint -static char rcsid_kadm_cli_wrap_c[] = -"from: Id: kadm_cli_wrap.c,v 4.6 89/12/30 20:09:45 qjb Exp"; -static const char rcsid[] = - "$Id$"; -#endif lint -#endif - -/* - * kadm_cli_wrap.c the client side wrapping of the calls to the admin server - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef NULL -#define NULL 0 -#endif - -static Kadm_Client client_parm; - -/* Macros for use in returning data... used in kadm_cli_send */ -#define RET_N_FREE(r) {clear_secrets(); free((char *)act_st); free((char *)priv_pak); return r;} - -/* Keys for use in the transactions */ -static des_cblock sess_key; /* to be filled in by kadm_cli_keyd */ -static Key_schedule sess_sched; - -static void -clear_secrets() -{ - bzero((char *)sess_key, sizeof(sess_key)); - bzero((char *)sess_sched, sizeof(sess_sched)); -} - -/* - * kadm_init_link - * receives : name, inst, realm - * - * initializes client parm, the Kadm_Client structure which holds the - * data about the connection between the server and client, the services - * used, the locations and other fun things - */ -int -kadm_init_link(n, i, r) -char n[]; -char i[]; -char r[]; -{ - struct servent *sep; /* service we will talk to */ - struct hostent *hop; /* host we will talk to */ - char adm_hostname[MAXHOSTNAMELEN]; - - (void) init_kadm_err_tbl(); - (void) init_krb_err_tbl(); - (void) strcpy(client_parm.sname, n); - (void) strcpy(client_parm.sinst, i); - (void) strcpy(client_parm.krbrlm, r); - client_parm.admin_fd = -1; - - /* set up the admin_addr - fetch name of admin host */ - if (krb_get_admhst(adm_hostname, client_parm.krbrlm, 1) != KSUCCESS) - return KADM_NO_HOST; - if ((hop = gethostbyname(adm_hostname)) == NULL) - return KADM_UNK_HOST; /* couldnt find the admin servers - * address */ - if ((sep = getservbyname(KADM_SNAME, "tcp")) == NULL) - return KADM_NO_SERV; /* couldnt find the admin service */ - bzero((char *) &client_parm.admin_addr, - sizeof(client_parm.admin_addr)); - client_parm.admin_addr.sin_family = hop->h_addrtype; - bcopy((char *) hop->h_addr, (char *) &client_parm.admin_addr.sin_addr, - hop->h_length); - client_parm.admin_addr.sin_port = sep->s_port; - - return KADM_SUCCESS; -} /* procedure kadm_init_link */ - -/* - * kadm_change_pw - * recieves : key - * - * Replaces the password (i.e. des key) of the caller with that specified in - * key. Returns no actual data from the master server, since this is called - * by a user - */ -int -kadm_change_pw(newkey) -des_cblock newkey; /* The DES form of the users key */ -{ - int stsize, retc; /* stream size and return code */ - u_char *send_st; /* send stream */ - u_char *ret_st; - int ret_sz; - u_long keytmp; - - if ((retc = kadm_cli_conn()) != KADM_SUCCESS) - return(retc); - /* possible problem with vts_long on a non-multiple of four boundary */ - - stsize = 0; /* start of our output packet */ - send_st = (u_char *) malloc(1);/* to make it reallocable */ - send_st[stsize++] = (u_char) CHANGE_PW; - - /* change key to stream */ - - bcopy((char *) (((long *) newkey) + 1), (char *) &keytmp, 4); - keytmp = htonl(keytmp); - stsize += vts_long(keytmp, &send_st, stsize); - - bcopy((char *) newkey, (char *) &keytmp, 4); - keytmp = htonl(keytmp); - stsize += vts_long(keytmp, &send_st, stsize); - - retc = kadm_cli_send(send_st, stsize, &ret_st, &ret_sz); - free((char *)send_st); - if (retc == KADM_SUCCESS) { - free((char *)ret_st); - } - kadm_cli_disconn(); - return(retc); -} - -/* - * kadm_add - * receives : vals - * returns : vals - * - * Adds and entry containing values to the database returns the values of the - * entry, so if you leave certain fields blank you will be able to determine - * the default values they are set to - */ -int -kadm_add(vals) -Kadm_vals *vals; -{ - u_char *st, *st2; /* st will hold the stream of values */ - int st_len; /* st2 the final stream with opcode */ - int retc; /* return code from call */ - u_char *ret_st; - int ret_sz; - - if ((retc = kadm_cli_conn()) != KADM_SUCCESS) - return(retc); - st_len = vals_to_stream(vals, &st); - st2 = (u_char *) malloc((unsigned)(1 + st_len)); - *st2 = (u_char) ADD_ENT; /* here's the opcode */ - bcopy((char *) st, (char *) st2 + 1, st_len); /* append st on */ - retc = kadm_cli_send(st2, st_len + 1, &ret_st, &ret_sz); - free((char *)st); - free((char *)st2); - if (retc == KADM_SUCCESS) { - /* ret_st has vals */ - if (stream_to_vals(ret_st, vals, ret_sz) < 0) - retc = KADM_LENGTH_ERROR; - free((char *)ret_st); - } - kadm_cli_disconn(); - return(retc); -} - -/* - * kadm_mod - * receives : KTEXT, {values, values} - * returns : CKSUM, RETCODE, {values} - * acl : su, sms (as register or dealloc) - * - * Modifies all entries corresponding to the first values so they match the - * second values. returns the values for the changed entries in vals2 - */ -int -kadm_mod(vals1, vals2) -Kadm_vals *vals1; -Kadm_vals *vals2; -{ - u_char *st, *st2; /* st will hold the stream of values */ - int st_len, nlen; /* st2 the final stream with opcode */ - u_char *ret_st; - int ret_sz; - - /* nlen is the length of second vals */ - int retc; /* return code from call */ - - if ((retc = kadm_cli_conn()) != KADM_SUCCESS) - return(retc); - - st_len = vals_to_stream(vals1, &st); - st2 = (u_char *) malloc((unsigned)(1 + st_len)); - *st2 = (u_char) MOD_ENT; /* here's the opcode */ - bcopy((char *) st, (char *) st2 + 1, st_len++); /* append st on */ - free((char *)st); - nlen = vals_to_stream(vals2, &st); - st2 = (u_char *) realloc((char *) st2, (unsigned)(st_len + nlen)); - bcopy((char *) st, (char *) st2 + st_len, nlen); /* append st on */ - retc = kadm_cli_send(st2, st_len + nlen, &ret_st, &ret_sz); - free((char *)st); - free((char *)st2); - if (retc == KADM_SUCCESS) { - /* ret_st has vals */ - if (stream_to_vals(ret_st, vals2, ret_sz) < 0) - retc = KADM_LENGTH_ERROR; - free((char *)ret_st); - } - kadm_cli_disconn(); - return(retc); -} - -/* - * kadm_get - * receives : KTEXT, {values, flags} - * returns : CKSUM, RETCODE, {count, values, values, values} - * acl : su - * - * gets the fields requested by flags from all entries matching values returns - * this data for each matching recipient, after a count of how many such - * matches there were - */ -int -kadm_get(vals, fl) -Kadm_vals *vals; -u_char fl[4]; - -{ - int loop; /* for copying the fields data */ - u_char *st, *st2; /* st will hold the stream of values */ - int st_len; /* st2 the final stream with opcode */ - int retc; /* return code from call */ - u_char *ret_st; - int ret_sz; - - if ((retc = kadm_cli_conn()) != KADM_SUCCESS) - return(retc); - st_len = vals_to_stream(vals, &st); - st2 = (u_char *) malloc((unsigned)(1 + st_len + FLDSZ)); - *st2 = (u_char) GET_ENT; /* here's the opcode */ - bcopy((char *) st, (char *) st2 + 1, st_len); /* append st on */ - for (loop = FLDSZ - 1; loop >= 0; loop--) - *(st2 + st_len + FLDSZ - loop) = fl[loop]; /* append the flags */ - retc = kadm_cli_send(st2, st_len + 1 + FLDSZ, &ret_st, &ret_sz); - free((char *)st); - free((char *)st2); - if (retc == KADM_SUCCESS) { - /* ret_st has vals */ - if (stream_to_vals(ret_st, vals, ret_sz) < 0) - retc = KADM_LENGTH_ERROR; - free((char *)ret_st); - } - kadm_cli_disconn(); - return(retc); -} - -/* - * kadm_cli_send - * recieves : opcode, packet, packet length, serv_name, serv_inst - * returns : return code from the packet build, the server, or - * something else - * - * It assembles a packet as follows: - * 8 bytes : VERSION STRING - * 4 bytes : LENGTH OF MESSAGE DATA and OPCODE - * : KTEXT - * : OPCODE \ - * : DATA > Encrypted (with make priv) - * : ...... / - * - * If it builds the packet and it is small enough, then it attempts to open the - * connection to the admin server. If the connection is succesfully open - * then it sends the data and waits for a reply. - */ -int -kadm_cli_send(st_dat, st_siz, ret_dat, ret_siz) -u_char *st_dat; /* the actual data */ -int st_siz; /* length of said data */ -u_char **ret_dat; /* to give return info */ -int *ret_siz; /* length of returned info */ -{ - int act_len, retdat; /* current offset into packet, return - * data */ - KTEXT_ST authent; /* the authenticator we will build */ - u_char *act_st; /* the pointer to the complete packet */ - u_char *priv_pak; /* private version of the packet */ - int priv_len; /* length of private packet */ - u_long cksum; /* checksum of the packet */ - MSG_DAT mdat; - u_char *return_dat; - - act_st = (u_char *) malloc(KADM_VERSIZE); /* verstr stored first */ - (void) strncpy((char *)act_st, KADM_VERSTR, KADM_VERSIZE); - act_len = KADM_VERSIZE; - - if ((retdat = kadm_cli_keyd(sess_key, sess_sched)) != KADM_SUCCESS) { - free((char *)act_st); - return retdat; /* couldnt get key working */ - } - priv_pak = (u_char *) malloc((unsigned)(st_siz + 200)); - /* 200 bytes for extra info case */ - if ((priv_len = krb_mk_priv(st_dat, priv_pak, (u_long)st_siz, - sess_sched, sess_key, &client_parm.my_addr, - &client_parm.admin_addr)) < 0) - RET_N_FREE(KADM_NO_ENCRYPT); /* whoops... we got a lose - * here */ - /* here is the length of priv data. receiver calcs - size of authenticator by subtracting vno size, priv size, and - sizeof(u_long) (for the size indication) from total size */ - - act_len += vts_long((u_long) priv_len, &act_st, act_len); -#ifdef NOENCRYPTION - cksum = 0; -#else - cksum = quad_cksum((des_cblock *)priv_pak, (des_cblock *)0, - (long)priv_len, 0, (des_cblock *)sess_key); -#endif - if ((retdat = krb_mk_req(&authent, client_parm.sname, client_parm.sinst, - client_parm.krbrlm, (long)cksum))) { - /* authenticator? */ - RET_N_FREE(retdat + krb_err_base); - } - - act_st = (u_char *) realloc((char *) act_st, - (unsigned) (act_len + authent.length - + priv_len)); - if (!act_st) { - clear_secrets(); - free((char *)priv_pak); - return(KADM_NOMEM); - } - bcopy((char *) authent.dat, (char *) act_st + act_len, authent.length); - bcopy((char *) priv_pak, (char *) act_st + act_len + authent.length, - priv_len); - free((char *)priv_pak); - if ((retdat = kadm_cli_out(act_st, - act_len + authent.length + priv_len, - ret_dat, ret_siz)) != KADM_SUCCESS) - RET_N_FREE(retdat); - free((char *)act_st); -#define RET_N_FREE2(r) {free((char *)*ret_dat); clear_secrets(); return(r);} - - /* first see if it's a YOULOUSE */ - if ((*ret_siz >= KADM_VERSIZE) && - !strncmp(KADM_ULOSE, (char *)*ret_dat, KADM_VERSIZE)) { - u_long errcode; - /* it's a youlose packet */ - if (*ret_siz < KADM_VERSIZE + sizeof(u_long)) - RET_N_FREE2(KADM_BAD_VER); - bcopy((char *)(*ret_dat) + KADM_VERSIZE, (char *)&errcode, - sizeof(u_long)); - retdat = (int) ntohl(errcode); - RET_N_FREE2(retdat); - } - /* need to decode the ret_dat */ - if ((retdat = krb_rd_priv(*ret_dat, (u_long)*ret_siz, sess_sched, - sess_key, &client_parm.admin_addr, - &client_parm.my_addr, &mdat))) - RET_N_FREE2(retdat+krb_err_base); - if (mdat.app_length < KADM_VERSIZE + 4) - /* too short! */ - RET_N_FREE2(KADM_BAD_VER); - if (strncmp((char *)mdat.app_data, KADM_VERSTR, KADM_VERSIZE)) - /* bad version */ - RET_N_FREE2(KADM_BAD_VER); - bcopy((char *)mdat.app_data+KADM_VERSIZE, - (char *)&retdat, sizeof(u_long)); - retdat = ntohl((u_long)retdat); - if (!(return_dat = (u_char *)malloc((unsigned)(mdat.app_length - - KADM_VERSIZE - sizeof(u_long))))) - RET_N_FREE2(KADM_NOMEM); - bcopy((char *) mdat.app_data + KADM_VERSIZE + sizeof(u_long), - (char *)return_dat, - (int)mdat.app_length - KADM_VERSIZE - sizeof(u_long)); - free((char *)*ret_dat); - clear_secrets(); - *ret_dat = return_dat; - *ret_siz = mdat.app_length - KADM_VERSIZE - sizeof(u_long); - return retdat; -} - -/* takes in the sess_key and key_schedule and sets them appropriately */ -int -kadm_cli_keyd(s_k, s_s) -des_cblock s_k; /* session key */ -des_key_schedule s_s; /* session key schedule */ -{ - CREDENTIALS cred; /* to get key data */ - int stat; - - /* want .sname and .sinst here.... */ - if ((stat = krb_get_cred(client_parm.sname, client_parm.sinst, - client_parm.krbrlm, &cred))) - return stat + krb_err_base; - bcopy((char *) cred.session, (char *) s_k, sizeof(des_cblock)); - bzero((char *) cred.session, sizeof(des_cblock)); -#ifdef NOENCRYPTION - bzero(s_s, sizeof(des_key_schedule)); -#else - if ((stat = key_sched((des_cblock *)s_k,s_s))) - return(stat+krb_err_base); -#endif - return KADM_SUCCESS; -} /* This code "works" */ - -static sigtype (*opipe)(); - -int -kadm_cli_conn() -{ /* this connects and sets my_addr */ - int on = 1; - int kerror; - - if ((client_parm.admin_fd = - socket(client_parm.admin_addr.sin_family, SOCK_STREAM,0)) < 0) - return KADM_NO_SOCK; /* couldnt create the socket */ - client_parm.my_addr_len = sizeof(client_parm.my_addr); - if ((kerror = krb_get_local_addr(&client_parm.my_addr)) != KSUCCESS) { - (void) close(client_parm.admin_fd); - client_parm.admin_fd = -1; - return KADM_NO_HERE; - } - if (bind(client_parm.admin_fd, - (struct sockaddr *) & client_parm.my_addr, - sizeof(client_parm.my_addr))) { - (void) close(client_parm.admin_fd); - client_parm.admin_fd = -1; - return KADM_NO_HERE; - } - if (connect(client_parm.admin_fd, - (struct sockaddr *) & client_parm.admin_addr, - sizeof(client_parm.admin_addr))) { - (void) close(client_parm.admin_fd); - client_parm.admin_fd = -1; - return KADM_NO_CONN; /* couldnt get the connect */ - } - opipe = signal(SIGPIPE, SIG_IGN); - if (setsockopt(client_parm.admin_fd, SOL_SOCKET, SO_KEEPALIVE, &on, - sizeof(on)) < 0) { - (void) close(client_parm.admin_fd); - client_parm.admin_fd = -1; - (void) signal(SIGPIPE, opipe); - return KADM_NO_CONN; /* XXX */ - } - return KADM_SUCCESS; -} - -void -kadm_cli_disconn() -{ - (void) close(client_parm.admin_fd); - (void) signal(SIGPIPE, opipe); -} - -int -kadm_cli_out(dat, dat_len, ret_dat, ret_siz) -u_char *dat; -int dat_len; -u_char **ret_dat; -int *ret_siz; -{ - extern int errno; - u_short dlen; - int retval; - - dlen = (u_short) dat_len; - - if (dat_len != (int)dlen) - return (KADM_NO_ROOM); - - dlen = htons(dlen); - if (krb_net_write(client_parm.admin_fd, (char *) &dlen, - sizeof(u_short)) < 0) - return (errno); /* XXX */ - - if (krb_net_write(client_parm.admin_fd, (char *) dat, dat_len) < 0) - return (errno); /* XXX */ - - if ((retval = krb_net_read(client_parm.admin_fd, (char *) &dlen, - sizeof(u_short)) != sizeof(u_short))) { - if (retval < 0) - return(errno); /* XXX */ - else - return(EPIPE); /* short read ! */ - } - - dlen = ntohs(dlen); - *ret_dat = (u_char *)malloc((unsigned)dlen); - if (!*ret_dat) - return(KADM_NOMEM); - - if ((retval = krb_net_read(client_parm.admin_fd, (char *) *ret_dat, - (int) dlen) != dlen)) { - if (retval < 0) - return(errno); /* XXX */ - else - return(EPIPE); /* short read ! */ - } - *ret_siz = (int) dlen; - return KADM_SUCCESS; -} diff --git a/eBones/lib/libkadm/kadm_err.et b/eBones/lib/libkadm/kadm_err.et deleted file mode 100644 index e45a9c24cb7f6..0000000000000 --- a/eBones/lib/libkadm/kadm_err.et +++ /dev/null @@ -1,53 +0,0 @@ -# $Source: /usr/cvs/src/eBones/libkadm/kadm_err.et,v $ -# $Author: mark $ -# $Header: /usr/cvs/src/eBones/libkadm/kadm_err.et,v 1.1 1995/07/18 16:40:25 mark Exp $ -# Copyright 1988 by the Massachusetts Institute of Technology. -# -# For copying and distribution information, please see the file -# . -# -# Kerberos administration server error table -# - et kadm - -# KADM_SUCCESS, as all success codes should be, is zero - -ec KADM_RCSID, "$Header: /usr/cvs/src/eBones/libkadm/kadm_err.et,v 1.1 1995/07/18 16:40:25 mark Exp $" -# /* Building and unbuilding the packet errors */ -ec KADM_NO_REALM, "Cannot fetch local realm" -ec KADM_NO_CRED, "Unable to fetch credentials" -ec KADM_BAD_KEY, "Bad key supplied" -ec KADM_NO_ENCRYPT, "Can't encrypt data" -ec KADM_NO_AUTH, "Cannot encode/decode authentication info" -ec KADM_WRONG_REALM, "Principal attemping change is in wrong realm" -ec KADM_NO_ROOM, "Packet is too large" -ec KADM_BAD_VER, "Version number is incorrect" -ec KADM_BAD_CHK, "Checksum does not match" -ec KADM_NO_READ, "Unsealing private data failed" -ec KADM_NO_OPCODE, "Unsupported operation" -ec KADM_NO_HOST, "Could not find administrating host" -ec KADM_UNK_HOST, "Administrating host name is unknown" -ec KADM_NO_SERV, "Could not find service name in services database" -ec KADM_NO_SOCK, "Could not create socket" -ec KADM_NO_CONN, "Could not connect to server" -ec KADM_NO_HERE, "Could not fetch local socket address" -ec KADM_NO_MAST, "Could not fetch master key" -ec KADM_NO_VERI, "Could not verify master key" - -# /* From the server side routines */ -ec KADM_INUSE, "Entry already exists in database" -ec KADM_UK_SERROR, "Database store error" -ec KADM_UK_RERROR, "Database read error" -ec KADM_UNAUTH, "Insufficient access to perform requested operation" -# KADM_DATA isn't really an error, but... -ec KADM_DATA, "Data is available for return to client" -ec KADM_NOENTRY, "No such entry in the database" - -ec KADM_NOMEM, "Memory exhausted" -ec KADM_NO_HOSTNAME, "Could not fetch system hostname" -ec KADM_NO_BIND, "Could not bind port" -ec KADM_LENGTH_ERROR, "Length mismatch problem" -ec KADM_ILL_WILDCARD, "Illegal use of wildcard" - -ec KADM_DB_INUSE, "Database is locked or in use--try again later" -end diff --git a/eBones/lib/libkadm/kadm_stream.c b/eBones/lib/libkadm/kadm_stream.c deleted file mode 100644 index 58a625a464b1d..0000000000000 --- a/eBones/lib/libkadm/kadm_stream.c +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Stream conversion functions for Kerberos administration server - */ - -#if 0 -#ifndef lint -static char rcsid_kadm_stream_c[] = -"Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_stream.c,v 4.2 89/09/26 09:20:48 jtkohl Exp "; -static const char rcsid[] = - "$Id: kadm_stream.c,v 1.1 1995/07/18 16:40:27 mark Exp $"; -#endif lint -#endif - -/* - kadm_stream.c - this holds the stream support routines for the kerberos administration server - - vals_to_stream: converts a vals struct to a stream for transmission - internals build_field_header, vts_[string, char, long, short] - stream_to_vals: converts a stream to a vals struct - internals check_field_header, stv_[string, char, long, short] - error: prints out a kadm error message, returns - fatal: prints out a kadm fatal error message, exits -*/ - -#include -#include - -#define min(a,b) (((a) < (b)) ? (a) : (b)) - -/* -vals_to_stream - recieves : kadm_vals *, u_char * - returns : a realloced and filled in u_char * - -this function creates a byte-stream representation of the kadm_vals structure -*/ - -int -vals_to_stream(dt_in, dt_out) -Kadm_vals *dt_in; -u_char **dt_out; -{ - int vsloop, stsize; /* loop counter, stream size */ - - stsize = build_field_header(dt_in->fields, dt_out); - for (vsloop=31; vsloop>=0; vsloop--) - if (IS_FIELD(vsloop,dt_in->fields)) { - switch (vsloop) { - case KADM_NAME: - stsize+=vts_string(dt_in->name, dt_out, stsize); - break; - case KADM_INST: - stsize+=vts_string(dt_in->instance, dt_out, stsize); - break; - case KADM_EXPDATE: - stsize+=vts_long(dt_in->exp_date, dt_out, stsize); - break; - case KADM_ATTR: - stsize+=vts_short(dt_in->attributes, dt_out, stsize); - break; - case KADM_MAXLIFE: - stsize+=vts_char(dt_in->max_life, dt_out, stsize); - break; - case KADM_DESKEY: - stsize+=vts_long(dt_in->key_high, dt_out, stsize); - stsize+=vts_long(dt_in->key_low, dt_out, stsize); - break; - default: - break; - } -} - return(stsize); -} - -int -build_field_header(cont, st) -u_char *cont; /* container for fields data */ -u_char **st; /* stream */ -{ - *st = (u_char *) malloc (4); - bcopy((char *) cont, (char *) *st, 4); - return 4; /* return pointer to current stream location */ -} - -int -vts_string(dat, st, loc) -char *dat; /* a string to put on the stream */ -u_char **st; /* base pointer to the stream */ -int loc; /* offset into the stream for current data */ -{ - *st = (u_char *) realloc ((char *)*st, (unsigned) (loc + strlen(dat) + 1)); - bcopy(dat, (char *)(*st + loc), strlen(dat)+1); - return strlen(dat)+1; -} - -int -vts_short(dat, st, loc) -u_short dat; /* the attributes field */ -u_char **st; /* a base pointer to the stream */ -int loc; /* offset into the stream for current data */ -{ - u_short temp; /* to hold the net order short */ - - temp = htons(dat); /* convert to network order */ - *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(u_short))); - bcopy((char *) &temp, (char *)(*st + loc), sizeof(u_short)); - return sizeof(u_short); -} - -int -vts_long(dat, st, loc) -u_long dat; /* the attributes field */ -u_char **st; /* a base pointer to the stream */ -int loc; /* offset into the stream for current data */ -{ - u_long temp; /* to hold the net order short */ - - temp = htonl(dat); /* convert to network order */ - *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(u_long))); - bcopy((char *) &temp, (char *)(*st + loc), sizeof(u_long)); - return sizeof(u_long); -} - -int -vts_char(dat, st, loc) -u_char dat; /* the attributes field */ -u_char **st; /* a base pointer to the stream */ -int loc; /* offset into the stream for current data */ -{ - *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(u_char))); - (*st)[loc] = (u_char) dat; - return 1; -} - -/* -stream_to_vals - recieves : u_char *, kadm_vals * - returns : a kadm_vals filled in according to u_char * - -this decodes a byte stream represntation of a vals struct into kadm_vals -*/ -int -stream_to_vals(dt_in, dt_out, maxlen) -u_char *dt_in; -Kadm_vals *dt_out; -int maxlen; /* max length to use */ -{ - register int vsloop, stsize; /* loop counter, stream size */ - register int status; - - bzero((char *) dt_out, sizeof(*dt_out)); - - stsize = check_field_header(dt_in, dt_out->fields, maxlen); - if (stsize < 0) - return(-1); - for (vsloop=31; vsloop>=0; vsloop--) - if (IS_FIELD(vsloop,dt_out->fields)) - switch (vsloop) { - case KADM_NAME: - if ((status = stv_string(dt_in, dt_out->name, stsize, - sizeof(dt_out->name), maxlen)) < 0) - return(-1); - stsize += status; - break; - case KADM_INST: - if ((status = stv_string(dt_in, dt_out->instance, stsize, - sizeof(dt_out->instance), maxlen)) < 0) - return(-1); - stsize += status; - break; - case KADM_EXPDATE: - if ((status = stv_long(dt_in, &dt_out->exp_date, stsize, - maxlen)) < 0) - return(-1); - stsize += status; - break; - case KADM_ATTR: - if ((status = stv_short(dt_in, &dt_out->attributes, stsize, - maxlen)) < 0) - return(-1); - stsize += status; - break; - case KADM_MAXLIFE: - if ((status = stv_char(dt_in, &dt_out->max_life, stsize, - maxlen)) < 0) - return(-1); - stsize += status; - break; - case KADM_DESKEY: - if ((status = stv_long(dt_in, &dt_out->key_high, stsize, - maxlen)) < 0) - return(-1); - stsize += status; - if ((status = stv_long(dt_in, &dt_out->key_low, stsize, - maxlen)) < 0) - return(-1); - stsize += status; - break; - default: - break; - } - return stsize; -} - -int -check_field_header(st, cont, maxlen) -u_char *st; /* stream */ -u_char *cont; /* container for fields data */ -int maxlen; -{ - if (4 > maxlen) - return(-1); - bcopy((char *) st, (char *) cont, 4); - return 4; /* return pointer to current stream location */ -} - -int -stv_string(st, dat, loc, stlen, maxlen) -register u_char *st; /* base pointer to the stream */ -char *dat; /* a string to read from the stream */ -register int loc; /* offset into the stream for current data */ -int stlen; /* max length of string to copy in */ -int maxlen; /* max length of input stream */ -{ - int maxcount; /* max count of chars to copy */ - - maxcount = min(maxlen - loc, stlen); - - (void) strncpy(dat, (char *)st + loc, maxcount); - - if (dat[maxcount-1]) /* not null-term --> not enuf room */ - return(-1); - return strlen(dat)+1; -} - -int -stv_short(st, dat, loc, maxlen) -u_char *st; /* a base pointer to the stream */ -u_short *dat; /* the attributes field */ -int loc; /* offset into the stream for current data */ -int maxlen; -{ - u_short temp; /* to hold the net order short */ - - if (loc + sizeof(u_short) > maxlen) - return(-1); - bcopy((char *)((u_long)st+(u_long)loc), (char *) &temp, sizeof(u_short)); - *dat = ntohs(temp); /* convert to network order */ - return sizeof(u_short); -} - -int -stv_long(st, dat, loc, maxlen) -u_char *st; /* a base pointer to the stream */ -u_long *dat; /* the attributes field */ -int loc; /* offset into the stream for current data */ -int maxlen; /* maximum length of st */ -{ - u_long temp; /* to hold the net order short */ - - if (loc + sizeof(u_long) > maxlen) - return(-1); - bcopy((char *)((u_long)st+(u_long)loc), (char *) &temp, sizeof(u_long)); - *dat = ntohl(temp); /* convert to network order */ - return sizeof(u_long); -} - -int -stv_char(st, dat, loc, maxlen) -u_char *st; /* a base pointer to the stream */ -u_char *dat; /* the attributes field */ -int loc; /* offset into the stream for current data */ -int maxlen; -{ - if (loc + 1 > maxlen) - return(-1); - *dat = *(st + loc); - return 1; -} - diff --git a/eBones/lib/libkadm/kadm_supp.c b/eBones/lib/libkadm/kadm_supp.c deleted file mode 100644 index 353fed0ed9b33..0000000000000 --- a/eBones/lib/libkadm/kadm_supp.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Support functions for Kerberos administration server & clients - */ - -#if 0 -#ifndef lint -static char rcsid_kadm_supp_c[] = -"Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_supp.c,v 4.1 89/09/26 09:21:07 jtkohl Exp "; -static const char rcsid[] = - "$Id: kadm_supp.c,v 1.1 1995/07/18 16:40:28 mark Exp $"; -#endif lint -#endif - -/* - kadm_supp.c - this holds the support routines for the kerberos administration server - - error: prints out a kadm error message, returns - fatal: prints out a kadm fatal error message, exits - prin_vals: prints out data associated with a Principal in the vals - structure -*/ - -#include -#include -#include -#include - -/* -prin_vals: - recieves : a vals structure -*/ -void -prin_vals(vals) -Kadm_vals *vals; -{ - printf("Info in Database for %s.%s:\n", vals->name, vals->instance); - printf(" Max Life: %d Exp Date: %s\n",vals->max_life, - asctime(localtime((long *)&vals->exp_date))); - printf(" Attribs: %.2x key: %lu %lu\n",vals->attributes, - vals->key_low, vals->key_high); -} - -#ifdef notdef -nierror(s) -int s; -{ - printf("Kerberos admin server loses..... %s\n",error_message(s)); - return(s); -} -#endif - -/* kadm_prin_to_vals takes a fields arguments, a Kadm_vals and a Principal, - it copies the fields in Principal specified by fields into Kadm_vals, - i.e from old to new */ - -void -kadm_prin_to_vals(fields, new, old) -u_char fields[FLDSZ]; -Kadm_vals *new; -Principal *old; -{ - bzero((char *)new, sizeof(*new)); - if (IS_FIELD(KADM_NAME,fields)) { - (void) strncpy(new->name, old->name, ANAME_SZ); - SET_FIELD(KADM_NAME, new->fields); - } - if (IS_FIELD(KADM_INST,fields)) { - (void) strncpy(new->instance, old->instance, INST_SZ); - SET_FIELD(KADM_INST, new->fields); - } - if (IS_FIELD(KADM_EXPDATE,fields)) { - new->exp_date = old->exp_date; - SET_FIELD(KADM_EXPDATE, new->fields); - } - if (IS_FIELD(KADM_ATTR,fields)) { - new->attributes = old->attributes; - SET_FIELD(KADM_MAXLIFE, new->fields); - } - if (IS_FIELD(KADM_MAXLIFE,fields)) { - new->max_life = old->max_life; - SET_FIELD(KADM_MAXLIFE, new->fields); - } - if (IS_FIELD(KADM_DESKEY,fields)) { - new->key_low = old->key_low; - new->key_high = old->key_high; - SET_FIELD(KADM_DESKEY, new->fields); - } -} - -void -kadm_vals_to_prin(fields, new, old) -u_char fields[FLDSZ]; -Principal *new; -Kadm_vals *old; -{ - - bzero((char *)new, sizeof(*new)); - if (IS_FIELD(KADM_NAME,fields)) - (void) strncpy(new->name, old->name, ANAME_SZ); - if (IS_FIELD(KADM_INST,fields)) - (void) strncpy(new->instance, old->instance, INST_SZ); - if (IS_FIELD(KADM_EXPDATE,fields)) - new->exp_date = old->exp_date; - if (IS_FIELD(KADM_ATTR,fields)) - new->attributes = old->attributes; - if (IS_FIELD(KADM_MAXLIFE,fields)) - new->max_life = old->max_life; - if (IS_FIELD(KADM_DESKEY,fields)) { - new->key_low = old->key_low; - new->key_high = old->key_high; - } -} diff --git a/eBones/lib/libkdb/Makefile b/eBones/lib/libkdb/Makefile deleted file mode 100644 index 29beb2401b309..0000000000000 --- a/eBones/lib/libkdb/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.4 1995/09/13 17:23:53 markm Exp $ - -LIB= kdb -CFLAGS+=-DKERBEROS -DDEBUG -SRCS= krb_cache.c krb_dbm.c krb_kdb_utils.c krb_lib.c print_princ.c - -.include diff --git a/eBones/lib/libkdb/krb_cache.c b/eBones/lib/libkdb/krb_cache.c deleted file mode 100644 index 1c7c9ce3d7f27..0000000000000 --- a/eBones/lib/libkdb/krb_cache.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * This is where a cache would be implemented, if it were necessary. - * - * from: krb_cache.c,v 4.5 89/01/24 18:12:34 jon Exp $ - * $Id: krb_cache.c,v 1.3 1995/07/18 16:37:12 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: krb_cache.c,v 1.3 1995/07/18 16:37:12 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef DEBUG -extern int debug; -extern long kerb_debug; -#endif -static init = 0; - -/* - * initialization routine for cache - */ - -int -kerb_cache_init() -{ - init = 1; - return (0); -} - -/* - * look up a principal in the cache returns number of principals found - */ - -int -kerb_cache_get_principal(serv, inst, principal, max) - char *serv; /* could have wild card */ - char *inst; /* could have wild card */ - Principal *principal; - unsigned int max; /* max number of name structs to return */ - -{ - int found = 0; - - if (!init) - kerb_cache_init(); -#ifdef DEBUG - if (kerb_debug & 2) { - fprintf(stderr, "cache_get_principal for %s %s max = %d\n", - serv, inst, max); - if (found) { - fprintf(stderr, "cache get %s %s found %s %s\n", - serv, inst, principal->name, principal->instance); - } else { - fprintf(stderr, "cache %s %s not found\n", serv, - inst); - } - } -#endif - return (found); -} - -/* - * insert/replace a principal in the cache returns number of principals - * inserted - */ - -int -kerb_cache_put_principal(principal, max) - Principal *principal; - unsigned int max; /* max number of principal structs to - * insert */ - -{ - u_long i; - int count = 0; - - if (!init) - kerb_cache_init(); - -#ifdef DEBUG - if (kerb_debug & 2) { - fprintf(stderr, "kerb_cache_put_principal max = %d", - max); - } -#endif - - for (i = 0; i < max; i++) { -#ifdef DEBUG - if (kerb_debug & 2) - fprintf(stderr, "\n %s %s", - principal->name, principal->instance); -#endif - /* DO IT */ - count++; - principal++; - } - return count; -} - -/* - * look up a dba in the cache returns number of dbas found - */ - -int -kerb_cache_get_dba(serv, inst, dba, max) - char *serv; /* could have wild card */ - char *inst; /* could have wild card */ - Dba *dba; - unsigned int max; /* max number of name structs to return */ - -{ - int found = 0; - - if (!init) - kerb_cache_init(); - -#ifdef DEBUG - if (kerb_debug & 2) { - fprintf(stderr, "cache_get_dba for %s %s max = %d\n", - serv, inst, max); - if (found) { - fprintf(stderr, "cache get %s %s found %s %s\n", - serv, inst, dba->name, dba->instance); - } else { - fprintf(stderr, "cache %s %s not found\n", serv, inst); - } - } -#endif - return (found); -} - -/* - * insert/replace a dba in the cache returns number of dbas inserted - */ - -int -kerb_cache_put_dba(dba, max) - Dba *dba; - unsigned int max; /* max number of dba structs to insert */ - -{ - u_long i; - int count = 0; - - if (!init) - kerb_cache_init(); -#ifdef DEBUG - if (kerb_debug & 2) { - fprintf(stderr, "kerb_cache_put_dba max = %d", max); - } -#endif - for (i = 0; i < max; i++) { -#ifdef DEBUG - if (kerb_debug & 2) - fprintf(stderr, "\n %s %s", - dba->name, dba->instance); -#endif - /* DO IT */ - count++; - dba++; - } - return count; -} - diff --git a/eBones/lib/libkdb/krb_dbl.c b/eBones/lib/libkdb/krb_dbl.c deleted file mode 100644 index 7776298457c00..0000000000000 --- a/eBones/lib/libkdb/krb_dbl.c +++ /dev/null @@ -1 +0,0 @@ -This file is now obsolete. diff --git a/eBones/lib/libkdb/krb_dbm.c b/eBones/lib/libkdb/krb_dbm.c deleted file mode 100644 index 760bd6f6bd37d..0000000000000 --- a/eBones/lib/libkdb/krb_dbm.c +++ /dev/null @@ -1,789 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: krb_dbm.c,v 4.9 89/04/18 16:15:13 wesommer Exp $ - * $Id: krb_dbm.c,v 1.4 1995/08/03 17:15:42 mark Exp $ -*/ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: krb_dbm.c,v 1.4 1995/08/03 17:15:42 mark Exp $"; -#endif lint -#endif - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#define _NDBM_ -#endif - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#define _DBM_ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef _NDBM_ -#include -#else /*_NDBM_*/ -#include -#endif /*_NDBM_*/ -/* before krb_db.h */ -#include -#include - -#ifdef dbm_pagfno -#define DB -#endif - -#define KERB_DB_MAX_RETRY 5 - -#ifdef DEBUG -extern int debug; -extern long kerb_debug; -extern char *progname; -#endif - -static init = 0; -static char default_db_name[] = DBM_FILE; -static char *current_db_name = default_db_name; -static void encode_princ_key(datum *key, char *name, char *instance); -static void decode_princ_key(datum *key, char *name, char *instance); -static void encode_princ_contents(datum *contents, Principal *principal); -static void decode_princ_contents(datum *contents, Principal *principal); -static void kerb_dbl_fini(void); -static int kerb_dbl_lock(int mode); -static void kerb_dbl_unlock(void); -static long kerb_start_update(char *db_name); -static long kerb_end_update(char *db_name, long age); - -static struct timeval timestamp;/* current time of request */ -static int non_blocking = 0; - -/* - * This module contains all of the code which directly interfaces to - * the underlying representation of the Kerberos database; this - * implementation uses a DBM or NDBM indexed "file" (actually - * implemented as two separate files) to store the relations, plus a - * third file as a semaphore to allow the database to be replaced out - * from underneath the KDC server. - */ - -/* - * Locking: - * - * There are two distinct locking protocols used. One is designed to - * lock against processes (the admin_server, for one) which make - * incremental changes to the database; the other is designed to lock - * against utilities (kdb_util, kpropd) which replace the entire - * database in one fell swoop. - * - * The first locking protocol is implemented using flock() in the - * krb_dbl_lock() and krb_dbl_unlock routines. - * - * The second locking protocol is necessary because DBM "files" are - * actually implemented as two separate files, and it is impossible to - * atomically rename two files simultaneously. It assumes that the - * database is replaced only very infrequently in comparison to the time - * needed to do a database read operation. - * - * A third file is used as a "version" semaphore; the modification - * time of this file is the "version number" of the database. - * At the start of a read operation, the reader checks the version - * number; at the end of the read operation, it checks again. If the - * version number changed, or if the semaphore was nonexistant at - * either time, the reader sleeps for a second to let things - * stabilize, and then tries again; if it does not succeed after - * KERB_DB_MAX_RETRY attempts, it gives up. - * - * On update, the semaphore file is deleted (if it exists) before any - * update takes place; at the end of the update, it is replaced, with - * a version number strictly greater than the version number which - * existed at the start of the update. - * - * If the system crashes in the middle of an update, the semaphore - * file is not automatically created on reboot; this is a feature, not - * a bug, since the database may be inconsistant. Note that the - * absence of a semaphore file does not prevent another _update_ from - * taking place later. Database replacements take place automatically - * only on slave servers; a crash in the middle of an update will be - * fixed by the next slave propagation. A crash in the middle of an - * update on the master would be somewhat more serious, but this would - * likely be noticed by an administrator, who could fix the problem and - * retry the operation. - */ - -/* Macros to convert ndbm names to dbm names. - * Note that dbm_nextkey() cannot be simply converted using a macro, since - * it is invoked giving the database, and nextkey() needs the previous key. - * - * Instead, all routines call "dbm_next" instead. - */ - -#ifndef _NDBM_ -typedef char DBM; - -#define dbm_open(file, flags, mode) ((dbminit(file) == 0)?"":((char *)0)) -#define dbm_fetch(db, key) fetch(key) -#define dbm_store(db, key, content, flag) store(key, content) -#define dbm_firstkey(db) firstkey() -#define dbm_next(db,key) nextkey(key) -#define dbm_close(db) dbmclose() -#else -#define dbm_next(db,key) dbm_nextkey(db) -#endif - -/* - * Utility routine: generate name of database file. - */ - -static char *gen_dbsuffix(db_name, sfx) - char *db_name; - char *sfx; -{ - char *dbsuffix; - - if (sfx == NULL) - sfx = ".ok"; - - dbsuffix = malloc (strlen(db_name) + strlen(sfx) + 1); - strcpy(dbsuffix, db_name); - strcat(dbsuffix, sfx); - return dbsuffix; -} - -/* - * initialization for data base routines. - */ - -int -kerb_db_init() -{ - init = 1; - return (0); -} - -/* - * gracefully shut down database--must be called by ANY program that does - * a kerb_db_init - */ - -void -kerb_db_fini() -{ -} - -/* - * Set the "name" of the current database to some alternate value. - * - * Passing a null pointer as "name" will set back to the default. - * If the alternate database doesn't exist, nothing is changed. - */ - -int -kerb_db_set_name(name) - char *name; -{ - DBM *db; - - if (name == NULL) - name = default_db_name; - db = dbm_open(name, 0, 0); - if (db == NULL) - return errno; - dbm_close(db); - kerb_dbl_fini(); - current_db_name = name; - return 0; -} - -/* - * Return the last modification time of the database. - */ - -long -kerb_get_db_age() -{ - struct stat st; - char *okname; - long age; - - okname = gen_dbsuffix(current_db_name, ".ok"); - - if (stat (okname, &st) < 0) - age = 0; - else - age = st.st_mtime; - - free (okname); - return age; -} - -/* - * Remove the semaphore file; indicates that database is currently - * under renovation. - * - * This is only for use when moving the database out from underneath - * the server (for example, during slave updates). - */ - -static long -kerb_start_update(db_name) - char *db_name; -{ - char *okname = gen_dbsuffix(db_name, ".ok"); - long age = kerb_get_db_age(); - - if (unlink(okname) < 0 - && errno != ENOENT) { - age = -1; - } - free (okname); - return age; -} - -static long -kerb_end_update(db_name, age) - char *db_name; - long age; -{ - int fd; - int retval = 0; - char *new_okname = gen_dbsuffix(db_name, ".ok#"); - char *okname = gen_dbsuffix(db_name, ".ok"); - - fd = open (new_okname, O_CREAT|O_RDWR|O_TRUNC, 0600); - if (fd < 0) - retval = errno; - else { - struct stat st; - struct timeval tv[2]; - /* make sure that semaphore is "after" previous value. */ - if (fstat (fd, &st) == 0 - && st.st_mtime <= age) { - tv[0].tv_sec = st.st_atime; - tv[0].tv_usec = 0; - tv[1].tv_sec = age; - tv[1].tv_usec = 0; - /* set times.. */ - utimes (new_okname, tv); - fsync(fd); - } - close(fd); - if (rename (new_okname, okname) < 0) - retval = errno; - } - - free (new_okname); - free (okname); - - return retval; -} - -static long -kerb_start_read() -{ - return kerb_get_db_age(); -} - -static long -kerb_end_read(age) - u_long age; -{ - if (kerb_get_db_age() != age || age == -1) { - return -1; - } - return 0; -} - -/* - * Create the database, assuming it's not there. - */ - -int -kerb_db_create(db_name) - char *db_name; -{ - char *okname = gen_dbsuffix(db_name, ".ok"); - int fd; - register int ret = 0; -#ifdef _NDBM_ - DBM *db; - - db = dbm_open(db_name, O_RDWR|O_CREAT|O_EXCL, 0600); - if (db == NULL) - ret = errno; - else - dbm_close(db); -#else - char *dirname = gen_dbsuffix(db_name, ".dir"); - char *pagname = gen_dbsuffix(db_name, ".pag"); - - fd = open(dirname, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd < 0) - ret = errno; - else { - close(fd); - fd = open (pagname, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd < 0) - ret = errno; - else - close(fd); - } - if (dbminit(db_name) < 0) - ret = errno; -#endif - if (ret == 0) { - fd = open (okname, O_CREAT|O_RDWR|O_TRUNC, 0600); - if (fd < 0) - ret = errno; - close(fd); - } - return ret; -} - -/* - * "Atomically" rename the database in a way that locks out read - * access in the middle of the rename. - * - * Not perfect; if we crash in the middle of an update, we don't - * necessarily know to complete the transaction the rename, but... - */ - -int -kerb_db_rename(from, to) - char *from; - char *to; -{ -#ifdef _DBM_ - char *fromdb = gen_dbsuffix (from, ".db"); - char *todb = gen_dbsuffix (to, ".db"); -#else - char *fromdir = gen_dbsuffix (from, ".dir"); - char *todir = gen_dbsuffix (to, ".dir"); - char *frompag = gen_dbsuffix (from , ".pag"); - char *topag = gen_dbsuffix (to, ".pag"); -#endif - char *fromok = gen_dbsuffix(from, ".ok"); - long trans = kerb_start_update(to); - int ok = 0; - -#ifdef _DBM_ - if (rename (fromdb, todb) == 0) { -#else - if ((rename (fromdir, todir) == 0) - && (rename (frompag, topag) == 0)) { -#endif - (void) unlink (fromok); - ok = 1; - } - - free (fromok); -#ifdef _DBM_ - free (fromdb); - free (todb); -#else - free (fromdir); - free (todir); - free (frompag); - free (topag); -#endif - if (ok) - return kerb_end_update(to, trans); - else - return -1; -} - -/* - * look up a principal in the data base returns number of principals - * found , and whether there were more than requested. - */ - -int -kerb_db_get_principal(name, inst, principal, max, more) - char *name; /* could have wild card */ - char *inst; /* could have wild card */ - Principal *principal; - unsigned int max; /* max number of name structs to return */ - int *more; /* where there more than 'max' tuples? */ - -{ - int found = 0, code; - extern int errorproc(); - int wildp, wildi; - datum key, contents; - char testname[ANAME_SZ], testinst[INST_SZ]; - u_long trans; - int try; - DBM *db; - - if (!init) - kerb_db_init(); /* initialize database routines */ - - for (try = 0; try < KERB_DB_MAX_RETRY; try++) { - trans = kerb_start_read(); - - if ((code = kerb_dbl_lock(KERB_DBL_SHARED)) != 0) - return -1; - - db = dbm_open(current_db_name, O_RDONLY, 0600); - - *more = 0; - -#ifdef DEBUG - if (kerb_debug & 2) - fprintf(stderr, - "%s: db_get_principal for %s %s max = %d", - progname, name, inst, max); -#endif - - wildp = !strcmp(name, "*"); - wildi = !strcmp(inst, "*"); - - if (!wildi && !wildp) { /* nothing's wild */ - encode_princ_key(&key, name, inst); - contents = dbm_fetch(db, key); - if (contents.dptr == NULL) { - found = 0; - goto done; - } - decode_princ_contents(&contents, principal); -#ifdef DEBUG - if (kerb_debug & 1) { - fprintf(stderr, "\t found %s %s p_n length %d t_n length %d\n", - principal->name, principal->instance, - strlen(principal->name), - strlen(principal->instance)); - } -#endif - found = 1; - goto done; - } - /* process wild cards by looping through entire database */ - - for (key = dbm_firstkey(db); key.dptr != NULL; - key = dbm_next(db, key)) { - decode_princ_key(&key, testname, testinst); - if ((wildp || !strcmp(testname, name)) && - (wildi || !strcmp(testinst, inst))) { /* have a match */ - if (found >= max) { - *more = 1; - goto done; - } else { - found++; - contents = dbm_fetch(db, key); - decode_princ_contents(&contents, principal); -#ifdef DEBUG - if (kerb_debug & 1) { - fprintf(stderr, - "\tfound %s %s p_n length %d t_n length %d\n", - principal->name, principal->instance, - strlen(principal->name), - strlen(principal->instance)); - } -#endif - principal++; /* point to next */ - } - } - } - - done: - kerb_dbl_unlock(); /* unlock read lock */ - dbm_close(db); - if (kerb_end_read(trans) == 0) - break; - found = -1; - if (!non_blocking) - sleep(1); - } - return (found); -} - -/* - * Update a name in the data base. Returns number of names - * successfully updated. - */ - -int -kerb_db_put_principal(principal, max) - Principal *principal; - unsigned int max; /* number of principal structs to - * update */ - -{ - int found = 0, code; - u_long i; - extern int errorproc(); - datum key, contents; - DBM *db; - - gettimeofday(×tamp, NULL); - - if (!init) - kerb_db_init(); - - if ((code = kerb_dbl_lock(KERB_DBL_EXCLUSIVE)) != 0) - return -1; - - db = dbm_open(current_db_name, O_RDWR, 0600); - -#ifdef DEBUG - if (kerb_debug & 2) - fprintf(stderr, "%s: kerb_db_put_principal max = %d", - progname, max); -#endif - - /* for each one, stuff temps, and do replace/append */ - for (i = 0; i < max; i++) { - encode_princ_contents(&contents, principal); - encode_princ_key(&key, principal->name, principal->instance); - dbm_store(db, key, contents, DBM_REPLACE); -#ifdef DEBUG - if (kerb_debug & 1) { - fprintf(stderr, "\n put %s %s\n", - principal->name, principal->instance); - } -#endif - found++; - principal++; /* bump to next struct */ - } - - dbm_close(db); - kerb_dbl_unlock(); /* unlock database */ - return (found); -} - -static void -encode_princ_key(key, name, instance) - datum *key; - char *name, *instance; -{ - static char keystring[ANAME_SZ + INST_SZ]; - - bzero(keystring, ANAME_SZ + INST_SZ); - strncpy(keystring, name, ANAME_SZ); - strncpy(&keystring[ANAME_SZ], instance, INST_SZ); - key->dptr = keystring; - key->dsize = ANAME_SZ + INST_SZ; -} - -static void -decode_princ_key(key, name, instance) - datum *key; - char *name, *instance; -{ - strncpy(name, key->dptr, ANAME_SZ); - strncpy(instance, key->dptr + ANAME_SZ, INST_SZ); - name[ANAME_SZ - 1] = '\0'; - instance[INST_SZ - 1] = '\0'; -} - -static void -encode_princ_contents(contents, principal) - datum *contents; - Principal *principal; -{ - contents->dsize = sizeof(*principal); - contents->dptr = (char *) principal; -} - -static void -decode_princ_contents(contents, principal) - datum *contents; - Principal *principal; -{ - bcopy(contents->dptr, (char *) principal, sizeof(*principal)); -} - -void -kerb_db_get_stat(s) - DB_stat *s; -{ - gettimeofday(×tamp, NULL); - - - s->cpu = 0; - s->elapsed = 0; - s->dio = 0; - s->pfault = 0; - s->t_stamp = timestamp.tv_sec; - s->n_retrieve = 0; - s->n_replace = 0; - s->n_append = 0; - s->n_get_stat = 0; - s->n_put_stat = 0; - /* update local copy too */ -} - -void -kerb_db_put_stat(s) - DB_stat *s; -{ -} - -void -delta_stat(a, b, c) - DB_stat *a, *b, *c; -{ - /* c = a - b then b = a for the next time */ - - c->cpu = a->cpu - b->cpu; - c->elapsed = a->elapsed - b->elapsed; - c->dio = a->dio - b->dio; - c->pfault = a->pfault - b->pfault; - c->t_stamp = a->t_stamp - b->t_stamp; - c->n_retrieve = a->n_retrieve - b->n_retrieve; - c->n_replace = a->n_replace - b->n_replace; - c->n_append = a->n_append - b->n_append; - c->n_get_stat = a->n_get_stat - b->n_get_stat; - c->n_put_stat = a->n_put_stat - b->n_put_stat; - - bcopy(a, b, sizeof(DB_stat)); -} - -/* - * look up a dba in the data base returns number of dbas found , and - * whether there were more than requested. - */ - -int -kerb_db_get_dba(dba_name, dba_inst, dba, max, more) - char *dba_name; /* could have wild card */ - char *dba_inst; /* could have wild card */ - Dba *dba; - unsigned int max; /* max number of name structs to return */ - int *more; /* where there more than 'max' tuples? */ - -{ - *more = 0; - return (0); -} - -int -kerb_db_iterate (func, arg) - int (*func)(); - char *arg; /* void *, really */ -{ - datum key, contents; - Principal *principal; - int code; - DBM *db; - - kerb_db_init(); /* initialize and open the database */ - if ((code = kerb_dbl_lock(KERB_DBL_SHARED)) != 0) - return code; - - db = dbm_open(current_db_name, O_RDONLY, 0600); - - for (key = dbm_firstkey (db); key.dptr != NULL; key = dbm_next(db, key)) { - contents = dbm_fetch (db, key); - /* XXX may not be properly aligned */ - principal = (Principal *) contents.dptr; - if ((code = (*func)(arg, principal)) != 0) - return code; - } - dbm_close(db); - kerb_dbl_unlock(); - return 0; -} - -static int dblfd = -1; -static int mylock = 0; -static int inited = 0; - -static void -kerb_dbl_init() -{ - if (!inited) { - char *filename = gen_dbsuffix (current_db_name, ".ok"); - if ((dblfd = open(filename, 0)) < 0) { - fprintf(stderr, "kerb_dbl_init: couldn't open %s\n", filename); - fflush(stderr); - perror("open"); - exit(1); - } - free(filename); - inited++; - } -} - -static void -kerb_dbl_fini() -{ - close(dblfd); - dblfd = -1; - inited = 0; - mylock = 0; -} - -static int -kerb_dbl_lock(mode) - int mode; -{ - int flock_mode; - - if (!inited) - kerb_dbl_init(); - if (mylock) { /* Detect lock call when lock already - * locked */ - fprintf(stderr, "Kerberos locking error (mylock)\n"); - fflush(stderr); - exit(1); - } - switch (mode) { - case KERB_DBL_EXCLUSIVE: - flock_mode = LOCK_EX; - break; - case KERB_DBL_SHARED: - flock_mode = LOCK_SH; - break; - default: - fprintf(stderr, "invalid lock mode %d\n", mode); - abort(); - } - if (non_blocking) - flock_mode |= LOCK_NB; - - if (flock(dblfd, flock_mode) < 0) - return errno; - mylock++; - return 0; -} - -static void -kerb_dbl_unlock() -{ - if (!mylock) { /* lock already unlocked */ - fprintf(stderr, "Kerberos database lock not locked when unlocking.\n"); - fflush(stderr); - exit(1); - } - if (flock(dblfd, LOCK_UN) < 0) { - fprintf(stderr, "Kerberos database lock error. (unlocking)\n"); - fflush(stderr); - perror("flock"); - exit(1); - } - mylock = 0; -} - -int -kerb_db_set_lockmode(mode) - int mode; -{ - int old = non_blocking; - non_blocking = mode; - return old; -} diff --git a/eBones/lib/libkdb/krb_kdb_utils.c b/eBones/lib/libkdb/krb_kdb_utils.c deleted file mode 100644 index 0256348e2b77b..0000000000000 --- a/eBones/lib/libkdb/krb_kdb_utils.c +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Utility routines for Kerberos programs which directly access - * the database. This code was duplicated in too many places - * before I gathered it here. - * - * Jon Rochlis, MIT Telecom, March 1988 - * - * from: krb_kdb_utils.c,v 4.1 89/07/26 11:01:12 jtkohl Exp $ - * $Id: krb_kdb_utils.c,v 1.3 1995/07/18 16:37:15 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: krb_kdb_utils.c,v 1.3 1995/07/18 16:37:15 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -long -kdb_get_master_key(prompt, master_key, master_key_sched) - int prompt; - C_Block master_key; - Key_schedule master_key_sched; -{ - int kfile; - - if (prompt) { -#ifdef NOENCRYPTION - placebo_read_password(master_key, - "\nEnter Kerberos master key: ", 0); -#else - des_read_password((des_cblock *)master_key, - "\nEnter Kerberos master key: ", 0); -#endif - printf ("\n"); - } - else { - kfile = open(MKEYFILE, O_RDONLY, 0600); - if (kfile < 0) { - /* oh, for com_err_ */ - return (-1); - } - if (read(kfile, (char *) master_key, 8) != 8) { - return (-1); - } - close(kfile); - } - -#ifndef NOENCRYPTION - key_sched((des_cblock *)master_key,master_key_sched); -#endif - return (0); -} - -/* The caller is reasponsible for cleaning up the master key and sched, - even if we can't verify the master key */ - -/* Returns master key version if successful, otherwise -1 */ - -long -kdb_verify_master_key (master_key, master_key_sched, out) - C_Block master_key; - Key_schedule master_key_sched; - FILE *out; /* setting this to non-null be do output */ -{ - C_Block key_from_db; - Principal principal_data[1]; - int n, more = 0; - long master_key_version; - - /* lookup the master key version */ - n = kerb_get_principal(KERB_M_NAME, KERB_M_INST, principal_data, - 1 /* only one please */, &more); - if ((n != 1) || more) { - if (out != (FILE *) NULL) - fprintf(out, - "verify_master_key: %s, %d found.\n", - "Kerberos error on master key version lookup", - n); - return (-1); - } - - master_key_version = (long) principal_data[0].key_version; - - /* set up the master key */ - if (out != (FILE *) NULL) /* should we punt this? */ - fprintf(out, "Current Kerberos master key version is %d.\n", - principal_data[0].kdc_key_ver); - - /* - * now use the master key to decrypt the key in the db, had better - * be the same! - */ - bcopy(&principal_data[0].key_low, key_from_db, 4); - bcopy(&principal_data[0].key_high, ((long *) key_from_db) + 1, 4); - kdb_encrypt_key (key_from_db, key_from_db, - master_key, master_key_sched, DECRYPT); - - /* the decrypted database key had better equal the master key */ - n = bcmp((char *) master_key, (char *) key_from_db, - sizeof(master_key)); - /* this used to zero the master key here! */ - bzero(key_from_db, sizeof(key_from_db)); - bzero(principal_data, sizeof (principal_data)); - - if (n && (out != (FILE *) NULL)) { - fprintf(out, "\n\07\07verify_master_key: Invalid master key; "); - fprintf(out, "does not match database.\n"); - return (-1); - } - if (out != (FILE *) NULL) { - fprintf(out, "\nMaster key entered. BEWARE!\07\07\n"); - fflush(out); - } - - return (master_key_version); -} - -/* The old algorithm used the key schedule as the initial vector which - was byte order depedent ... */ - -void -kdb_encrypt_key (in, out, master_key, master_key_sched, e_d_flag) - C_Block in, out, master_key; - Key_schedule master_key_sched; - int e_d_flag; -{ - -#ifdef NOENCRYPTION - bcopy(in, out, sizeof(C_Block)); -#else - pcbc_encrypt((des_cblock*)in,(des_cblock*)out,(long)sizeof(C_Block), - master_key_sched,(des_cblock*)master_key,e_d_flag); -#endif -} diff --git a/eBones/lib/libkdb/krb_lib.c b/eBones/lib/libkdb/krb_lib.c deleted file mode 100644 index 2cf4fb8723d6e..0000000000000 --- a/eBones/lib/libkdb/krb_lib.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * $Source: /usr/cvs/src/eBones/kdb/krb_lib.c,v $ - * $Author: mark $ - * - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * . - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: krb_lib.c,v 1.3 1995/07/18 16:37:17 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef DEBUG -extern int debug; -extern char *progname; -long kerb_debug; -#endif - -static init = 0; - -/* - * initialization routine for data base - */ - -int -kerb_init() -{ -#ifdef DEBUG - if (!init) { - char *dbg = getenv("KERB_DBG"); - if (dbg) - sscanf(dbg, "%ld", &kerb_debug); - init = 1; - } -#endif - kerb_db_init(); - -#ifdef CACHE - kerb_cache_init(); -#endif - - /* successful init, return 0, else errcode */ - return (0); -} - -/* - * finalization routine for database -- NOTE: MUST be called by any - * program using kerb_init. ALSO will have to be modified to finalize - * caches, if they're ever really implemented. - */ - -void -kerb_fini() -{ - kerb_db_fini(); -} - -/* - * look up a principal in the cache or data base returns number of - * principals found - */ - -int -kerb_get_principal(name, inst, principal, max, more) - char *name; /* could have wild card */ - char *inst; /* could have wild card */ - Principal *principal; - unsigned int max; /* max number of name structs to return */ - int *more; /* more tuples than room for */ - -{ - int found = 0; -#ifdef CACHE - static int wild = 0; -#endif - if (!init) - kerb_init(); - -#ifdef DEBUG - if (kerb_debug & 1) - fprintf(stderr, "\n%s: kerb_get_principal for %s %s max = %d\n", - progname, name, inst, max); -#endif - - /* - * if this is a request including a wild card, have to go to db - * since the cache may not be exhaustive. - */ - - /* clear the principal area */ - bzero((char *) principal, max * sizeof(Principal)); - -#ifdef CACHE - /* - * so check to see if the name contains a wildcard "*" or "?", not - * preceeded by a backslash. - */ - wild = 0; - if (index(name, '*') || index(name, '?') || - index(inst, '*') || index(inst, '?')) - wild = 1; - - if (!wild) { - /* try the cache first */ - found = kerb_cache_get_principal(name, inst, principal, max, more); - if (found) - return (found); - } -#endif - /* If we didn't try cache, or it wasn't there, try db */ - found = kerb_db_get_principal(name, inst, principal, max, more); - /* try to insert principal(s) into cache if it was found */ -#ifdef CACHE - if (found) { - kerb_cache_put_principal(principal, found); - } -#endif - return (found); -} - -/* principals */ -int -kerb_put_principal(principal, n) - Principal *principal; - unsigned int n; /* number of principal structs to write */ -{ - long time(); - struct tm *tp, *localtime(); - - /* set mod date */ - principal->mod_date = time((long *)0); - /* and mod date string */ - - tp = localtime(&principal->mod_date); - (void) sprintf(principal->mod_date_txt, "%4d-%2d-%2d", - tp->tm_year > 1900 ? tp->tm_year : tp->tm_year + 1900, - tp->tm_mon + 1, tp->tm_mday); /* January is 0, not 1 */ -#ifdef DEBUG - if (kerb_debug & 1) { - int i; - fprintf(stderr, "\nkerb_put_principal..."); - for (i = 0; i < n; i++) { - krb_print_principal(&principal[i]); - } - } -#endif - /* write database */ - if (kerb_db_put_principal(principal, n) < 0) { -#ifdef DEBUG - if (kerb_debug & 1) - fprintf(stderr, "\n%s: kerb_db_put_principal err", progname); - /* watch out for cache */ -#endif - return -1; - } -#ifdef CACHE - /* write cache */ - if (!kerb_cache_put_principal(principal, n)) { -#ifdef DEBUG - if (kerb_debug & 1) - fprintf(stderr, "\n%s: kerb_cache_put_principal err", progname); -#endif - return -1; - } -#endif - return 0; -} - -int -kerb_get_dba(name, inst, dba, max, more) - char *name; /* could have wild card */ - char *inst; /* could have wild card */ - Dba *dba; - unsigned int max; /* max number of name structs to return */ - int *more; /* more tuples than room for */ - -{ - int found = 0; -#ifdef CACHE - static int wild = 0; -#endif - if (!init) - kerb_init(); - -#ifdef DEBUG - if (kerb_debug & 1) - fprintf(stderr, "\n%s: kerb_get_dba for %s %s max = %d\n", - progname, name, inst, max); -#endif - /* - * if this is a request including a wild card, have to go to db - * since the cache may not be exhaustive. - */ - - /* clear the dba area */ - bzero((char *) dba, max * sizeof(Dba)); - -#ifdef CACHE - /* - * so check to see if the name contains a wildcard "*" or "?", not - * preceeded by a backslash. - */ - - wild = 0; - if (index(name, '*') || index(name, '?') || - index(inst, '*') || index(inst, '?')) - wild = 1; - - if (!wild) { - /* try the cache first */ - found = kerb_cache_get_dba(name, inst, dba, max, more); - if (found) - return (found); - } -#endif - /* If we didn't try cache, or it wasn't there, try db */ - found = kerb_db_get_dba(name, inst, dba, max, more); -#ifdef CACHE - /* try to insert dba(s) into cache if it was found */ - if (found) { - kerb_cache_put_dba(dba, found); - } -#endif - return (found); -} diff --git a/eBones/lib/libkdb/print_princ.c b/eBones/lib/libkdb/print_princ.c deleted file mode 100644 index 64e910660e22c..0000000000000 --- a/eBones/lib/libkdb/print_princ.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: $Header: /usr/cvs/src/eBones/kdb/print_princ.c,v 1.3 1995/07/18 16:37:19 mark Exp $ - * $Id: print_princ.c,v 1.3 1995/07/18 16:37:19 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: print_princ.c,v 1.3 1995/07/18 16:37:19 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include - -extern int debug; - -long kerb_debug; -static struct tm *time_p; - -void -krb_print_principal(a_n) - Principal *a_n; -{ - /* run-time database does not contain string versions */ - time_p = localtime(&(a_n->exp_date)); - - fprintf(stderr, - "\n%s %s expires %4d-%2d-%2d %2d:%2d, max_life %d*5 = %d min attr 0x%02x", - a_n->name, a_n->instance, - time_p->tm_year > 1900 ? time_p->tm_year : time_p->tm_year + 1900, - time_p->tm_mon + 1, time_p->tm_mday, - time_p->tm_hour, time_p->tm_min, - a_n->max_life, 5 * a_n->max_life, a_n->attributes); - - fprintf(stderr, - "\n\tkey_ver %d k_low 0x%08lx k_high 0x%08lx akv %d exists %d\n", - a_n->key_version, a_n->key_low, a_n->key_high, - a_n->kdc_key_ver, (int)a_n->old); - - fflush(stderr); -} diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile deleted file mode 100644 index 211307b251a02..0000000000000 --- a/eBones/lib/libkrb/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -LIB= krb -SHLIB_MINOR= 1 -CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -DBSD42 -SRCS= krb_err.c create_auth_reply.c create_ciph.c \ - create_death_packet.c create_ticket.c debug_decl.c decomp_ticket.c \ - des_rw.c dest_tkt.c extract_ticket.c fgetst.c get_ad_tkt.c \ - get_admhst.c get_cred.c get_in_tkt.c get_krbhst.c get_krbrlm.c \ - get_phost.c get_pw_tkt.c get_request.c get_svc_in_tkt.c \ - get_tf_fullname.c get_tf_realm.c getrealm.c getst.c in_tkt.c \ - k_gethostname.c klog.c kname_parse.c kntoln.c kparse.c \ - krb_err_txt.c krb_get_in_tkt.c kuserok.c log.c mk_err.c \ - mk_priv.c mk_req.c mk_safe.c month_sname.c \ - netread.c netwrite.c one.c pkt_cipher.c pkt_clen.c rd_err.c \ - rd_priv.c rd_req.c rd_safe.c read_service_key.c recvauth.c \ - save_credentials.c send_to_kdc.c sendauth.c stime.c tf_util.c \ - tkt_string.c util.c - -LDADD+= -lcom_err - -beforeinstall: krb_err.c - -cd ${.OBJDIR}; cmp -s krb_err.h \ - ${DESTDIR}/usr/include/kerberosIV/krb_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 krb_err.h \ - ${DESTDIR}/usr/include/kerberosIV - -MAN3= krb.3 krb_realmofhost.3 krb_sendauth.3 krb_set_tkt_string.3 \ - kuserok.3 tf_util.3 - -MLINKS= krb.3 krb_mk_req.3 krb.3 krb_rd_req.3 krb.3 krb_kntoln.3 \ - krb.3 krb_set_key.3 krb.3 krb_get_cred.3 krb.3 krb_mk_priv.3 \ - krb.3 krb_rd_priv.3 krb.3 krb_mk_safe.3 krb.3 krb_rd_safe.3 \ - krb.3 krb_mk_err.3 krb.3 krb_rd_err.3 krb.3 krb_ck_repl.3 \ - krb.3 krb_get_local_addr.3 krb.3 krb_bind_local_addr.3 - -MLINKS+=krb_realmofhost.3 krb_get_phost.3 krb_realmofhost.3 krb_get_krbhst.3 \ - krb_realmofhost.3 krb_get_admhst.3 krb_realmofhost.3 krb_get_lrealm.3 - -MLINKS+=krb_realmofhost.3 realm.3 - -MLINKS+=krb_sendauth.3 krb_recvauth.3 krb_sendauth.3 krb_net_write.3 \ - krb_sendauth.3 krb_net_read.3 - -MLINKS+=krb_sendauth.3 ksend.3 - -MLINKS+=tf_util.3 tf_init.3 tf_util.3 tf_get_pname.3 \ - tf_util.3 tf_get_pinst.3 tf_util.3 tf_get_cred.3 \ - tf_util.3 tf_close.3 - -.include - -krb_err.c: ${KRBOBJDIR}/krb_err.h - diff --git a/eBones/lib/libkrb/add_ticket.c b/eBones/lib/libkrb/add_ticket.c deleted file mode 100644 index 14ef47c46a0bd..0000000000000 --- a/eBones/lib/libkrb/add_ticket.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: add_ticket.c,v 4.7 88/10/07 06:06:26 shanzer Exp $ - * $Id: add_ticket.c,v 1.3 1995/07/18 16:38:04 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: add_ticket.c,v 1.3 1995/07/18 16:38:04 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This routine is now obsolete. It used to be possible to request - * more than one ticket at a time from the authentication server, and - * it looks like this routine was used by the server to package the - * tickets to be returned to the client. - */ - -/* - * This routine adds a new ticket to the ciphertext to be returned to - * the client. The routine takes the ciphertext (which doesn't get - * encrypted till later), the number of the ticket (i.e. 1st, 2nd, - * etc) the session key which goes in the ticket and is sent back to - * the user, the lifetime for the ticket, the service name, the - * instance, the realm, the key version number, and the ticket itself. - * - * This routine returns 0 (KSUCCESS) on success, and 1 (KFAILURE) on - * failure. On failure, which occurs when there isn't enough room - * for the ticket, a 0 length ticket is added. - * - * Notes: This routine must be called with successive values of n. - * i.e. the ticket must be added in order. The corresponding routine - * on the client side is extract ticket. - */ - -/* XXX they aren't all used; to avoid incompatible changes we will - * fool lint for the moment */ -/*ARGSUSED */ -int -add_ticket(cipher,n,session,lifetime,sname,instance,realm,kvno,ticket) - KTEXT cipher; /* Ciphertext info for ticket */ - char *sname; /* Service name */ - char *instance; /* Instance */ - int n; /* Relative position of this ticket */ - char *session; /* Session key for this tkt */ - int lifetime; /* Lifetime of this ticket */ - char *realm; /* Realm in which ticket is valid */ - int kvno; /* Key version number of service key */ - KTEXT ticket; /* The ticket itself */ -{ - - /* Note, the 42 is a temporary hack; it will have to be changed. */ - - /* Begin check of ticket length */ - if ((cipher->length + ticket->length + 4 + 42 + - (*(cipher->dat)+1-n)*(11+strlen(realm))) > - MAX_KTXT_LEN) { - bcopy(session,(char *)(cipher->dat+cipher->length),8); - *(cipher->dat+cipher->length+8) = (char) lifetime; - *(cipher->dat+cipher->length+9) = (char) kvno; - (void) strcpy((char *)(cipher->dat+cipher->length+10),realm); - cipher->length += 11 + strlen(realm); - *(cipher->dat+n) = 0; - return(KFAILURE); - } - /* End check of ticket length */ - - /* Add the session key, lifetime, kvno, ticket to the ciphertext */ - bcopy(session,(char *)(cipher->dat+cipher->length),8); - *(cipher->dat+cipher->length+8) = (char) lifetime; - *(cipher->dat+cipher->length+9) = (char) kvno; - (void) strcpy((char *)(cipher->dat+cipher->length+10),realm); - cipher->length += 11 + strlen(realm); - bcopy((char *)(ticket->dat),(char *)(cipher->dat+cipher->length), - ticket->length); - cipher->length += ticket->length; - - /* Set the ticket length at beginning of ciphertext */ - *(cipher->dat+n) = ticket->length; - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/create_auth_reply.c b/eBones/lib/libkrb/create_auth_reply.c deleted file mode 100644 index e304b173628db..0000000000000 --- a/eBones/lib/libkrb/create_auth_reply.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: create_auth_reply.c,v 4.10 89/01/13 17:47:38 steiner Exp $ - * $Id: create_auth_reply.c,v 1.3 1995/07/18 16:38:06 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: create_auth_reply.c,v 1.3 1995/07/18 16:38:06 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This routine is called by the Kerberos authentication server - * to create a reply to an authentication request. The routine - * takes the user's name, instance, and realm, the client's - * timestamp, the number of tickets, the user's key version - * number and the ciphertext containing the tickets themselves. - * It constructs a packet and returns a pointer to it. - * - * Notes: The packet returned by this routine is static. Thus, if you - * intend to keep the result beyond the next call to this routine, you - * must copy it elsewhere. - * - * The packet is built in the following format: - * - * variable - * type or constant data - * ---- ----------- ---- - * - * unsigned char KRB_PROT_VERSION protocol version number - * - * unsigned char AUTH_MSG_KDC_REPLY protocol message type - * - * [least significant HOST_BYTE_ORDER sender's (server's) byte - * bit of above field] order - * - * string pname principal's name - * - * string pinst principal's instance - * - * string prealm principal's realm - * - * unsigned long time_ws client's timestamp - * - * unsigned char n number of tickets - * - * unsigned long x_date expiration date - * - * unsigned char kvno master key version - * - * short w_1 cipher length - * - * --- cipher->dat cipher data - */ - -KTEXT -create_auth_reply(pname,pinst,prealm,time_ws,n,x_date,kvno,cipher) - char *pname; /* Principal's name */ - char *pinst; /* Principal's instance */ - char *prealm; /* Principal's authentication domain */ - long time_ws; /* Workstation time */ - int n; /* Number of tickets */ - unsigned long x_date; /* Principal's expiration date */ - int kvno; /* Principal's key version number */ - KTEXT cipher; /* Cipher text with tickets and - * session keys */ -{ - static KTEXT_ST pkt_st; - KTEXT pkt = &pkt_st; - unsigned char *v = pkt->dat; /* Prot vers number */ - unsigned char *t = (pkt->dat+1); /* Prot message type */ - short w_l; /* Cipher length */ - - /* Create fixed part of packet */ - *v = (unsigned char) KRB_PROT_VERSION; - *t = (unsigned char) AUTH_MSG_KDC_REPLY; - *t |= HOST_BYTE_ORDER; - - if (n != 0) - *v = 3; - - /* Add the basic info */ - (void) strcpy((char *) (pkt->dat+2), pname); - pkt->length = 3 + strlen(pname); - (void) strcpy((char *) (pkt->dat+pkt->length),pinst); - pkt->length += 1 + strlen(pinst); - (void) strcpy((char *) (pkt->dat+pkt->length),prealm); - pkt->length += 1 + strlen(prealm); - /* Workstation timestamp */ - bcopy((char *) &time_ws, (char *) (pkt->dat+pkt->length), 4); - pkt->length += 4; - *(pkt->dat+(pkt->length)++) = (unsigned char) n; - /* Expiration date */ - bcopy((char *) &x_date, (char *) (pkt->dat+pkt->length),4); - pkt->length += 4; - - /* Now send the ciphertext and info to help decode it */ - *(pkt->dat+(pkt->length)++) = (unsigned char) kvno; - w_l = (short) cipher->length; - bcopy((char *) &w_l,(char *) (pkt->dat+pkt->length),2); - pkt->length += 2; - bcopy((char *) (cipher->dat), (char *) (pkt->dat+pkt->length), - cipher->length); - pkt->length += cipher->length; - - /* And return the packet */ - return pkt; -} diff --git a/eBones/lib/libkrb/create_ciph.c b/eBones/lib/libkrb/create_ciph.c deleted file mode 100644 index 7fb93e337d1c5..0000000000000 --- a/eBones/lib/libkrb/create_ciph.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: create_ciph.c,v 4.8 89/05/18 21:24:26 jis Exp $ - * $Id: create_ciph.c,v 1.3 1995/07/18 16:38:07 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: create_ciph.c,v 1.3 1995/07/18 16:38:07 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This routine is used by the authentication server to create - * a packet for its client, containing a ticket for the requested - * service (given in "tkt"), and some information about the ticket, - * - * Returns KSUCCESS no matter what. - * - * The length of the cipher is stored in c->length; the format of - * c->dat is as follows: - * - * variable - * type or constant data - * ---- ----------- ---- - * - * - * 8 bytes session session key for client, service - * - * string service service name - * - * string instance service instance - * - * string realm KDC realm - * - * unsigned char life ticket lifetime - * - * unsigned char kvno service key version number - * - * unsigned char tkt->length length of following ticket - * - * data tkt->dat ticket for service - * - * 4 bytes kdc_time KDC's timestamp - * - * <=7 bytes null null pad to 8 byte multiple - * - */ - -int -create_ciph(c, session, service, instance, realm, life, kvno, tkt, - kdc_time, key) - KTEXT c; /* Text block to hold ciphertext */ - C_Block session; /* Session key to send to user */ - char *service; /* Service name on ticket */ - char *instance; /* Instance name on ticket */ - char *realm; /* Realm of this KDC */ - unsigned long life; /* Lifetime of the ticket */ - int kvno; /* Key version number for service */ - KTEXT tkt; /* The ticket for the service */ - unsigned long kdc_time; /* KDC time */ - C_Block key; /* Key to encrypt ciphertext with */ -{ - char *ptr; - Key_schedule key_s; - - ptr = (char *) c->dat; - - bcopy((char *) session, ptr, 8); - ptr += 8; - - (void) strcpy(ptr,service); - ptr += strlen(service) + 1; - - (void) strcpy(ptr,instance); - ptr += strlen(instance) + 1; - - (void) strcpy(ptr,realm); - ptr += strlen(realm) + 1; - - *(ptr++) = (unsigned char) life; - *(ptr++) = (unsigned char) kvno; - *(ptr++) = (unsigned char) tkt->length; - - bcopy((char *)(tkt->dat),ptr,tkt->length); - ptr += tkt->length; - - bcopy((char *) &kdc_time,ptr,4); - ptr += 4; - - /* guarantee null padded encrypted data to multiple of 8 bytes */ - bzero(ptr, 7); - - c->length = (((ptr - (char *) c->dat) + 7) / 8) * 8; - -#ifndef NOENCRYPTION - key_sched((C_Block *)key,key_s); - pcbc_encrypt((C_Block *)c->dat,(C_Block *)c->dat,(long) c->length,key_s, - (C_Block *)key,ENCRYPT); -#endif /* NOENCRYPTION */ - - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/create_death_packet.c b/eBones/lib/libkrb/create_death_packet.c deleted file mode 100644 index bdc0e347bf15c..0000000000000 --- a/eBones/lib/libkrb/create_death_packet.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: create_death_packet.c,v 4.9 89/01/17 16:05:59 rfrench Exp $ - * $Id: create_death_packet.c,v 1.3 1995/07/18 16:38:09 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: create_death_packet.c,v 1.3 1995/07/18 16:38:09 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This routine creates a packet to type AUTH_MSG_DIE which is sent to - * the Kerberos server to make it shut down. It is used only in the - * development environment. - * - * It takes a string "a_name" which is sent in the packet. A pointer - * to the packet is returned. - * - * The format of the killer packet is: - * - * type variable data - * or constant - * ---- ----------- ---- - * - * unsigned char KRB_PROT_VERSION protocol version number - * - * unsigned char AUTH_MSG_DIE message type - * - * [least significant HOST_BYTE_ORDER byte order of sender - * bit of above field] - * - * string a_name presumably, name of - * principal sending killer - * packet - */ - -#ifdef DEBUG -KTEXT -krb_create_death_packet(a_name) - char *a_name; -{ - static KTEXT_ST pkt_st; - KTEXT pkt = &pkt_st; - - unsigned char *v = pkt->dat; - unsigned char *t = (pkt->dat+1); - *v = (unsigned char) KRB_PROT_VERSION; - *t = (unsigned char) AUTH_MSG_DIE; - *t |= HOST_BYTE_ORDER; - (void) strcpy((char *) (pkt->dat+2),a_name); - pkt->length = 3 + strlen(a_name); - return pkt; -} -#endif /* DEBUG */ diff --git a/eBones/lib/libkrb/create_ticket.c b/eBones/lib/libkrb/create_ticket.c deleted file mode 100644 index e1d697419e1bc..0000000000000 --- a/eBones/lib/libkrb/create_ticket.c +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: create_ticket.c,v 4.11 89/03/22 14:43:23 jtkohl Exp $ - * $Id: create_ticket.c,v 1.3 1995/07/18 16:38:12 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: create_ticket.c,v 1.3 1995/07/18 16:38:12 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include - -/* - * Create ticket takes as arguments information that should be in a - * ticket, and the KTEXT object in which the ticket should be - * constructed. It then constructs a ticket and returns, leaving the - * newly created ticket in tkt. - * The length of the ticket is a multiple of - * eight bytes and is in tkt->length. - * - * If the ticket is too long, the ticket will contain nulls. - * The return value of the routine is undefined. - * - * The corresponding routine to extract information from a ticket it - * decomp_ticket. When changes are made to this routine, the - * corresponding changes should also be made to that file. - * - * The packet is built in the following format: - * - * variable - * type or constant data - * ---- ----------- ---- - * - * tkt->length length of ticket (multiple of 8 bytes) - * - * tkt->dat: - * - * unsigned char flags namely, HOST_BYTE_ORDER - * - * string pname client's name - * - * string pinstance client's instance - * - * string prealm client's realm - * - * 4 bytes paddress client's address - * - * 8 bytes session session key - * - * 1 byte life ticket lifetime - * - * 4 bytes time_sec KDC timestamp - * - * string sname service's name - * - * string sinstance service's instance - * - * <=7 bytes null null pad to 8 byte multiple - * - */ - -int krb_create_ticket(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, key) - KTEXT tkt; /* Gets filled in by the ticket */ - unsigned char flags; /* Various Kerberos flags */ - char *pname; /* Principal's name */ - char *pinstance; /* Principal's instance */ - char *prealm; /* Principal's authentication domain */ - long paddress; /* Net address of requesting entity */ - char *session; /* Session key inserted in ticket */ - short life; /* Lifetime of the ticket */ - long time_sec; /* Issue time and date */ - char *sname; /* Service Name */ - char *sinstance; /* Instance Name */ - C_Block key; /* Service's secret key */ -{ - Key_schedule key_s; - register char *data; /* running index into ticket */ - - tkt->length = 0; /* Clear previous data */ - flags |= HOST_BYTE_ORDER; /* ticket byte order */ - bcopy((char *) &flags,(char *) (tkt->dat),sizeof(flags)); - data = ((char *)tkt->dat) + sizeof(flags); - (void) strcpy(data, pname); - data += 1 + strlen(pname); - (void) strcpy(data, pinstance); - data += 1 + strlen(pinstance); - (void) strcpy(data, prealm); - data += 1 + strlen(prealm); - bcopy((char *) &paddress, data, 4); - data += 4; - - bcopy((char *) session, data, 8); - data += 8; - *(data++) = (char) life; - /* issue time */ - bcopy((char *) &time_sec, data, 4); - data += 4; - (void) strcpy(data, sname); - data += 1 + strlen(sname); - (void) strcpy(data, sinstance); - data += 1 + strlen(sinstance); - - /* guarantee null padded ticket to multiple of 8 bytes */ - bzero(data, 7); - tkt->length = ((data - ((char *)tkt->dat) + 7)/8)*8; - - /* Check length of ticket */ - if (tkt->length > (sizeof(KTEXT_ST) - 7)) { - bzero(tkt->dat, tkt->length); - tkt->length = 0; - return KFAILURE /* XXX */; - } - -#ifndef NOENCRYPTION - key_sched((C_Block *)key,key_s); - pcbc_encrypt((C_Block *)tkt->dat,(C_Block *)tkt->dat,(long)tkt->length, - key_s,(C_Block *)key,ENCRYPT); -#endif - return 0; -} diff --git a/eBones/lib/libkrb/debug_decl.c b/eBones/lib/libkrb/debug_decl.c deleted file mode 100644 index f548e2a0bfa97..0000000000000 --- a/eBones/lib/libkrb/debug_decl.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: debug_decl.c,v 4.5 88/10/07 06:07:49 shanzer Exp $ - * $Id: debug_decl.c,v 1.3 1995/07/18 16:38:14 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: debug_decl.c,v 1.3 1995/07/18 16:38:14 mark Exp $"; -#endif lint -#endif - -/* Declare global debugging variables. */ - -int krb_ap_req_debug = 0; -int krb_debug = 0; diff --git a/eBones/lib/libkrb/decomp_ticket.c b/eBones/lib/libkrb/decomp_ticket.c deleted file mode 100644 index 04316ad405770..0000000000000 --- a/eBones/lib/libkrb/decomp_ticket.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: decomp_ticket.c,v 4.12 89/05/16 18:44:46 jtkohl Exp $ - * $Id: decomp_ticket.c,v 1.3 1995/07/18 16:38:15 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: decomp_ticket.c,v 1.3 1995/07/18 16:38:15 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include - -/* - * This routine takes a ticket and pointers to the variables that - * should be filled in based on the information in the ticket. It - * fills in values for its arguments. - * - * Note: if the client realm field in the ticket is the null string, - * then the "prealm" variable is filled in with the local realm (as - * defined by KRB_REALM). - * - * If the ticket byte order is different than the host's byte order - * (as indicated by the byte order bit of the "flags" field), then - * the KDC timestamp "time_sec" is byte-swapped. The other fields - * potentially affected by byte order, "paddress" and "session" are - * not byte-swapped. - * - * The routine returns KFAILURE if any of the "pname", "pinstance", - * or "prealm" fields is too big, otherwise it returns KSUCCESS. - * - * The corresponding routine to generate tickets is create_ticket. - * When changes are made to this routine, the corresponding changes - * should also be made to that file. - * - * See create_ticket.c for the format of the ticket packet. - */ - -int -decomp_ticket(tkt, flags, pname, pinstance, prealm, paddress, session, - life, time_sec, sname, sinstance, key, key_s) - KTEXT tkt; /* The ticket to be decoded */ - unsigned char *flags; /* Kerberos ticket flags */ - char *pname; /* Authentication name */ - char *pinstance; /* Principal's instance */ - char *prealm; /* Principal's authentication domain */ - unsigned long *paddress; /* Net address of entity - * requesting ticket */ - C_Block session; /* Session key inserted in ticket */ - int *life; /* Lifetime of the ticket */ - unsigned long *time_sec; /* Issue time and date */ - char *sname; /* Service name */ - char *sinstance; /* Service instance */ - C_Block key; /* Service's secret key - * (to decrypt the ticket) */ - Key_schedule key_s; /* The precomputed key schedule */ -{ - static int tkt_swap_bytes; - unsigned char *uptr; - char *ptr = (char *)tkt->dat; - -#ifndef NOENCRYPTION - pcbc_encrypt((C_Block *)tkt->dat,(C_Block *)tkt->dat,(long)tkt->length, - key_s,(C_Block *)key,DECRYPT); -#endif /* ! NOENCRYPTION */ - - *flags = *ptr; /* get flags byte */ - ptr += sizeof(*flags); - tkt_swap_bytes = 0; - if (HOST_BYTE_ORDER != ((*flags >> K_FLAG_ORDER)& 1)) - tkt_swap_bytes++; - - if (strlen(ptr) > ANAME_SZ) - return(KFAILURE); - (void) strcpy(pname,ptr); /* pname */ - ptr += strlen(pname) + 1; - - if (strlen(ptr) > INST_SZ) - return(KFAILURE); - (void) strcpy(pinstance,ptr); /* instance */ - ptr += strlen(pinstance) + 1; - - if (strlen(ptr) > REALM_SZ) - return(KFAILURE); - (void) strcpy(prealm,ptr); /* realm */ - ptr += strlen(prealm) + 1; - /* temporary hack until realms are dealt with properly */ - if (*prealm == 0) - (void) strcpy(prealm,KRB_REALM); - - bcopy(ptr,(char *)paddress,4); /* net address */ - ptr += 4; - - bcopy(ptr,(char *)session,8); /* session key */ - ptr+= 8; -#ifdef notdef /* DONT SWAP SESSION KEY spm 10/22/86 */ - if (tkt_swap_bytes) - swap_C_Block(session); -#endif - - /* get lifetime, being certain we don't get negative lifetimes */ - uptr = (unsigned char *) ptr++; - *life = (int) *uptr; - - bcopy(ptr,(char *) time_sec,4); /* issue time */ - ptr += 4; - if (tkt_swap_bytes) - swap_u_long(*time_sec); - - (void) strcpy(sname,ptr); /* service name */ - ptr += 1 + strlen(sname); - - (void) strcpy(sinstance,ptr); /* instance */ - ptr += 1 + strlen(sinstance); - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/des_rw.c b/eBones/lib/libkrb/des_rw.c deleted file mode 100644 index e2ac183494498..0000000000000 --- a/eBones/lib/libkrb/des_rw.c +++ /dev/null @@ -1,263 +0,0 @@ -/* - * Copyright (c) 1994 Geoffrey M. Rehmet, Rhodes University - * All rights reserved. - * - * This code is derived from a specification based on software - * which forms part of the 4.4BSD-Lite distribution, which was developed - * by the University of California and its contributors. - * - * 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 entire comment, - * including the above copyright notice, this list of conditions - * and the following disclaimer, verbatim, at the beginning of - * the source file. - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Geoffrey M. Rehmet - * 4. Neither the name of Geoffrey M. Rehmet nor that of Rhodes University - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``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 GEOFFREY M. REHMET OR RHODES UNIVERSITY 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. - * - * $Id$ - */ - -/* - * - * NB: THESE ROUTINES WILL FAIL IF NON-BLOCKING I/O IS USED. - * - */ - -/* - * Routines for reading and writing DES encrypted messages onto sockets. - * (These routines will fail if non-blocking I/O is used.) - * - * When a message is written, its length is first transmitted as an int, - * in network byte order. The encrypted message is then transmitted, - * to a multiple of 8 bytes. Messages shorter than 8 bytes are right - * justified into a buffer of length 8 bytes, and the remainder of the - * buffer is filled with random garbage (before encryption): - * - * DDD -------->--+--------+ - * | | - * +--+--+--+--+--+--+--+--+ - * |x |x |x |x |x |D |D |D | - * +--+--+--+--+--+--+--+--+ - * | garbage | data | - * | | - * +-----------------------+----> des_pcbc_encrypt() --> - * - * (Note that the length field sent before the actual message specifies - * the number of data bytes, not the length of the entire padded message. - * - * When data is read, if the message received is longer than the number - * of bytes requested, then the remaining bytes are stored until the - * following call to des_read(). If the number of bytes received is - * less then the number of bytes received, then only the number of bytes - * actually received is returned. - * - * This interface corresponds with the original des_rw.c, except for the - * bugs in des_read() in the original 4.4BSD version. (One bug is - * normally not visible, due to undocumented behaviour of - * des_pcbc_encrypt() in the original MIT libdes.) - * - * XXX Todo: - * 1) Give better error returns on writes - * 2) Improve error checking on reads - * 3) Get rid of need for extern decl. of krb_net_read() - * 4) Tidy garbage generation a bit - * 5) Make the above comment more readable - */ - -#ifdef CRYPT -#ifdef KERBEROS - -#ifndef BUFFER_LEN -#define BUFFER_LEN 10240 -#endif - -#include -#include -#include -#include - -#include -#include - -#include -#include - -static des_cblock des_key; -static des_key_schedule key_schedule; - -/* - * Buffer for storing extra data when more data is received, then was - * actually requested in des_read(). - */ -static u_char des_buff[BUFFER_LEN]; -static u_char buffer[BUFFER_LEN]; -static unsigned stored = 0; -static u_char *buff_ptr = buffer; - -/* - * Set the encryption key for des_read() and des_write(). - * inkey is the initial vector for the DES encryption, while insched is - * the DES key, in unwrapped form. - */ - -int -des_set_key_krb(inkey, insched) - des_cblock *inkey; - des_key_schedule insched; -{ - bcopy(inkey, des_key, sizeof(des_cblock)); - bcopy(insched, &key_schedule, sizeof(des_key_schedule)); - return 0; -} - -/* - * Clear the key schedule, and initial vector, which were previously - * stored in static vars by des_set_key(). - */ -void -des_clear_key_krb() -{ - bzero(&des_key, sizeof(des_cblock)); - bzero(&key_schedule, sizeof(des_key_schedule)); -} - -int -des_read(fd, buf, len) - int fd; - register char * buf; - int len; -{ - int msg_length; /* length of actual message data */ - int pad_length; /* length of padded message */ - int nread; /* number of bytes actually read */ - int nreturned = 0; - - if(stored >= len) { - bcopy(buff_ptr, buf, len); - stored -= len; - buff_ptr += len; - return(len); - } else { - if (stored) { - bcopy(buff_ptr, buf, stored); - nreturned = stored; - len -= stored; - stored = 0; - buff_ptr = buffer; - } else { - nreturned = 0; - buff_ptr = buffer; - } - } - - nread = krb_net_read(fd, (char *)&msg_length, sizeof(msg_length)); - if(nread != (int)(sizeof(msg_length))) - return(0); - - msg_length = ntohl(msg_length); - pad_length = roundup(msg_length, 8); - - nread = krb_net_read(fd, des_buff, pad_length); - if(nread != pad_length) - return(0); - - des_pcbc_encrypt((des_cblock*) des_buff, (des_cblock*) buff_ptr, - (msg_length < 8 ? 8 : msg_length), - key_schedule, (des_cblock*) &des_key, DES_DECRYPT); - - - if(msg_length < 8) - buff_ptr += (8 - msg_length); - stored = msg_length; - - if(stored >= len) { - bcopy(buff_ptr, buf, len); - stored -= len; - buff_ptr += len; - nreturned += len; - } else { - bcopy(buff_ptr, buf, stored); - nreturned += stored; - stored = 0; - } - - return(nreturned); -} - - -/* - * Write a message onto a file descriptor (generally a socket), using - * DES to encrypt the message. - */ -int -des_write(fd, buf, len) - int fd; - char * buf; - int len; -{ - static int seeded = 0; - char garbage[8]; - long rnd; - int pad_len; - int write_len; - int i; - char *data; - - if(len < 8) { - /* - * Right justify the message in 8 bytes of random garbage. - */ - if(!seeded) { - seeded = 1; - srandom((unsigned)time(NULL)); - } - - for(i = 0 ; i < 8 ; i+= sizeof(long)) { - rnd = random(); - bcopy(&rnd, garbage+i, - (i <= (8 - sizeof(long)))?sizeof(long):(8-i)); - } - bcopy(buf, garbage + 8 - len, len); - data = garbage; - pad_len = 8; - } else { - data = buf; - pad_len = roundup(len, 8); - } - - des_pcbc_encrypt((des_cblock*) data, (des_cblock*) des_buff, - (len < 8)?8:len, key_schedule, (des_cblock*) &des_key, DES_ENCRYPT); - - - write_len = htonl(len); - if(write(fd, &write_len, sizeof(write_len)) != sizeof(write_len)) - return(-1); - if(write(fd, des_buff, pad_len) != pad_len) - return(-1); - - return(len); -} - -#endif /* KERBEROS */ -#endif /* CRYPT */ diff --git a/eBones/lib/libkrb/dest_tkt.c b/eBones/lib/libkrb/dest_tkt.c deleted file mode 100644 index df04be0d08bd5..0000000000000 --- a/eBones/lib/libkrb/dest_tkt.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: dest_tkt.c,v 4.9 89/10/02 16:23:07 jtkohl Exp $ - * $Id: dest_tkt.c,v 1.3 1995/07/18 16:38:19 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: dest_tkt.c,v 1.3 1995/07/18 16:38:19 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#ifdef TKT_SHMEM -#include -#endif -#include - -/* - * dest_tkt() is used to destroy the ticket store upon logout. - * If the ticket file does not exist, dest_tkt() returns RET_TKFIL. - * Otherwise the function returns RET_OK on success, KFAILURE on - * failure. - * - * The ticket file (TKT_FILE) is defined in "krb.h". - */ - -int -dest_tkt() -{ - char *file = TKT_FILE; - int i,fd; - extern int errno; - struct stat statb; - char buf[BUFSIZ]; -#ifdef TKT_SHMEM - char shmidname[MAXPATHLEN]; -#endif /* TKT_SHMEM */ - - errno = 0; - if (lstat(file,&statb) < 0) - goto out; - - if (!(statb.st_mode & S_IFREG) -#ifdef notdef - || statb.st_mode & 077 -#endif - ) - goto out; - - if ((fd = open(file, O_RDWR, 0)) < 0) - goto out; - - bzero(buf, BUFSIZ); - - for (i = 0; i < statb.st_size; i += BUFSIZ) - if (write(fd, buf, BUFSIZ) != BUFSIZ) { - (void) fsync(fd); - (void) close(fd); - goto out; - } - - (void) fsync(fd); - (void) close(fd); - - (void) unlink(file); - -out: - if (errno == ENOENT) return RET_TKFIL; - else if (errno != 0) return KFAILURE; -#ifdef TKT_SHMEM - /* - * handle the shared memory case - */ - (void) strcpy(shmidname, file); - (void) strcat(shmidname, ".shm"); - if ((i = krb_shm_dest(shmidname)) != KSUCCESS) - return(i); -#endif /* TKT_SHMEM */ - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/extract_ticket.c b/eBones/lib/libkrb/extract_ticket.c deleted file mode 100644 index 8ad3097ee9292..0000000000000 --- a/eBones/lib/libkrb/extract_ticket.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: extract_ticket.c,v 4.6 88/10/07 06:08:15 shanzer Exp $ - * $Id: extract_ticket.c,v 1.3 1995/07/18 16:38:21 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: extract_ticket.c,v 1.3 1995/07/18 16:38:21 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This routine is obsolete. - * - * This routine accepts the ciphertext returned by kerberos and - * extracts the nth ticket. It also fills in the variables passed as - * session, liftime and kvno. - */ - -void -extract_ticket(cipher,n,session,lifetime,kvno,realm,ticket) - KTEXT cipher; /* The ciphertext */ - int n; /* Which ticket */ - char *session; /* The session key for this tkt */ - int *lifetime; /* The life of this ticket */ - int *kvno; /* The kvno for the service */ - char *realm; /* Realm in which tkt issued */ - KTEXT ticket; /* The ticket itself */ -{ - char *ptr; - int i; - - /* Start after the ticket lengths */ - ptr = (char *) cipher->dat; - ptr = ptr + 1 + (int) *(cipher->dat); - - /* Step through earlier tickets */ - for (i = 1; i < n; i++) - ptr = ptr + 11 + strlen(ptr+10) + (int) *(cipher->dat+i); - bcopy(ptr, (char *) session, 8); /* Save the session key */ - ptr += 8; - *lifetime = *(ptr++); /* Save the life of the ticket */ - *kvno = *(ptr++); /* Save the kvno */ - (void) strcpy(realm,ptr); /* instance */ - ptr += strlen(realm) + 1; - - /* Save the ticket if its length is non zero */ - ticket->length = *(cipher->dat+n); - if (ticket->length) - bcopy(ptr, (char *) (ticket->dat), ticket->length); -} diff --git a/eBones/lib/libkrb/fgetst.c b/eBones/lib/libkrb/fgetst.c deleted file mode 100644 index 796caca7ff746..0000000000000 --- a/eBones/lib/libkrb/fgetst.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: fgetst.c,v 4.0 89/01/23 10:08:31 jtkohl Exp $ - * $Id: fgetst.c,v 1.3 1995/07/18 16:38:23 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: fgetst.c,v 1.3 1995/07/18 16:38:23 mark Exp $"; -#endif /* lint */ -#endif - -#include - -/* - * fgetst takes a file descriptor, a character pointer, and a count. - * It reads from the file it has either read "count" characters, or - * until it reads a null byte. When finished, what has been read exists - * in "s". If "count" characters were actually read, the last is changed - * to a null, so the returned string is always null-terminated. fgetst - * returns the number of characters read, including the null terminator. - */ - -int -fgetst(f, s, n) - FILE *f; - register char *s; - int n; -{ - register int count = n; - int ch; /* NOT char; otherwise you don't see EOF */ - - while ((ch = getc(f)) != EOF && ch && --count) { - *s++ = ch; - } - *s = '\0'; - return (n - count); -} diff --git a/eBones/lib/libkrb/get_ad_tkt.c b/eBones/lib/libkrb/get_ad_tkt.c deleted file mode 100644 index f96644a0a8179..0000000000000 --- a/eBones/lib/libkrb/get_ad_tkt.c +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_ad_tkt.c,v 4.15 89/07/07 15:18:51 jtkohl Exp $ - * $Id: get_ad_tkt.c,v 1.3 1995/07/18 16:38:25 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_ad_tkt.c,v 1.3 1995/07/18 16:38:25 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include - -#include -#include - -/* use the bsd time.h struct defs for PC too! */ -#include -#include - -extern int krb_debug; - -struct timeval tt_local = { 0, 0 }; - -int swap_bytes; -unsigned long rep_err_code; - -/* - * get_ad_tkt obtains a new service ticket from Kerberos, using - * the ticket-granting ticket which must be in the ticket file. - * It is typically called by krb_mk_req() when the client side - * of an application is creating authentication information to be - * sent to the server side. - * - * get_ad_tkt takes four arguments: three pointers to strings which - * contain the name, instance, and realm of the service for which the - * ticket is to be obtained; and an integer indicating the desired - * lifetime of the ticket. - * - * It returns an error status if the ticket couldn't be obtained, - * or AD_OK if all went well. The ticket is stored in the ticket - * cache. - * - * The request sent to the Kerberos ticket-granting service looks - * like this: - * - * pkt->dat - * - * TEXT original contents of authenticator+ticket - * pkt->dat built in krb_mk_req call - * - * 4 bytes time_ws always 0 (?) - * char lifetime lifetime argument passed - * string service service name argument - * string sinstance service instance arg. - * - * See "prot.h" for the reply packet layout and definitions of the - * extraction macros like pkt_version(), pkt_msg_type(), etc. - */ - -int -get_ad_tkt(service,sinstance,realm,lifetime) - char *service; - char *sinstance; - char *realm; - int lifetime; -{ - static KTEXT_ST pkt_st; - KTEXT pkt = & pkt_st; /* Packet to KDC */ - static KTEXT_ST rpkt_st; - KTEXT rpkt = &rpkt_st; /* Returned packet */ - static KTEXT_ST cip_st; - KTEXT cip = &cip_st; /* Returned Ciphertext */ - static KTEXT_ST tkt_st; - KTEXT tkt = &tkt_st; /* Current ticket */ - C_Block ses; /* Session key for tkt */ - CREDENTIALS cr; - int kvno; /* Kvno for session key */ - char lrealm[REALM_SZ]; - C_Block key; /* Key for decrypting cipher */ - Key_schedule key_s; - long time_ws = 0; - - char s_name[SNAME_SZ]; - char s_instance[INST_SZ]; - int msg_byte_order; - int kerror; - char rlm[REALM_SZ]; - char *ptr; - - unsigned long kdc_time; /* KDC time */ - - if ((kerror = krb_get_tf_realm(TKT_FILE, lrealm)) != KSUCCESS) - return(kerror); - - /* Create skeleton of packet to be sent */ - (void) gettimeofday(&tt_local,(struct timezone *) 0); - - pkt->length = 0; - - /* - * Look for the session key (and other stuff we don't need) - * in the ticket file for krbtgt.realm@lrealm where "realm" - * is the service's realm (passed in "realm" argument) and - * lrealm is the realm of our initial ticket. If we don't - * have this, we will try to get it. - */ - - if ((kerror = krb_get_cred("krbtgt",realm,lrealm,&cr)) != KSUCCESS) { - /* - * If realm == lrealm, we have no hope, so let's not even try. - */ - if ((strncmp(realm, lrealm, REALM_SZ)) == 0) - return(AD_NOTGT); - else{ - if ((kerror = - get_ad_tkt("krbtgt",realm,lrealm,lifetime)) != KSUCCESS) - return(kerror); - if ((kerror = krb_get_cred("krbtgt",realm,lrealm,&cr)) != KSUCCESS) - return(kerror); - } - } - - /* - * Make up a request packet to the "krbtgt.realm@lrealm". - * Start by calling krb_mk_req() which puts ticket+authenticator - * into "pkt". Then tack other stuff on the end. - */ - - kerror = krb_mk_req(pkt,"krbtgt",realm,lrealm,0L); - - if (kerror) - return(AD_NOTGT); - - /* timestamp */ - bcopy((char *) &time_ws,(char *) (pkt->dat+pkt->length),4); - pkt->length += 4; - *(pkt->dat+(pkt->length)++) = (char) lifetime; - (void) strcpy((char *) (pkt->dat+pkt->length),service); - pkt->length += 1 + strlen(service); - (void) strcpy((char *)(pkt->dat+pkt->length),sinstance); - pkt->length += 1 + strlen(sinstance); - - rpkt->length = 0; - - /* Send the request to the local ticket-granting server */ - if ((kerror = send_to_kdc(pkt, rpkt, realm))) return(kerror); - - /* check packet version of the returned packet */ - if (pkt_version(rpkt) != KRB_PROT_VERSION ) - return(INTK_PROT); - - /* Check byte order */ - msg_byte_order = pkt_msg_type(rpkt) & 1; - swap_bytes = 0; - if (msg_byte_order != HOST_BYTE_ORDER) - swap_bytes++; - - switch (pkt_msg_type(rpkt) & ~1) { - case AUTH_MSG_KDC_REPLY: - break; - case AUTH_MSG_ERR_REPLY: - bcopy(pkt_err_code(rpkt), (char *) &rep_err_code, 4); - if (swap_bytes) - swap_u_long(rep_err_code); - return(rep_err_code); - - default: - return(INTK_PROT); - } - - /* Extract the ciphertext */ - cip->length = pkt_clen(rpkt); /* let clen do the swap */ - - bcopy((char *) pkt_cipher(rpkt),(char *) (cip->dat),cip->length); - -#ifndef NOENCRYPTION - key_sched((C_Block *)cr.session,key_s); - pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat,(long)cip->length, - key_s,(C_Block *)cr.session,DECRYPT); -#endif - /* Get rid of all traces of key */ - bzero((char *) cr.session, sizeof(key)); - bzero((char *) key_s, sizeof(key_s)); - - ptr = (char *) cip->dat; - - bcopy(ptr,(char *)ses,8); - ptr += 8; - - (void) strcpy(s_name,ptr); - ptr += strlen(s_name) + 1; - - (void) strcpy(s_instance,ptr); - ptr += strlen(s_instance) + 1; - - (void) strcpy(rlm,ptr); - ptr += strlen(rlm) + 1; - - lifetime = (unsigned long) ptr[0]; - kvno = (unsigned long) ptr[1]; - tkt->length = (int) ptr[2]; - ptr += 3; - bcopy(ptr,(char *)(tkt->dat),tkt->length); - ptr += tkt->length; - - if (strcmp(s_name, service) || strcmp(s_instance, sinstance) || - strcmp(rlm, realm)) /* not what we asked for */ - return(INTK_ERR); /* we need a better code here XXX */ - - /* check KDC time stamp */ - bcopy(ptr,(char *)&kdc_time,4); /* Time (coarse) */ - if (swap_bytes) swap_u_long(kdc_time); - - ptr += 4; - - (void) gettimeofday(&tt_local,(struct timezone *) 0); - if (abs((int)(tt_local.tv_sec - kdc_time)) > CLOCK_SKEW) { - return(RD_AP_TIME); /* XXX should probably be better - code */ - } - - if ((kerror = save_credentials(s_name,s_instance,rlm,ses,lifetime, - kvno,tkt,tt_local.tv_sec))) - return(kerror); - - return(AD_OK); -} diff --git a/eBones/lib/libkrb/get_admhst.c b/eBones/lib/libkrb/get_admhst.c deleted file mode 100644 index a01a40ff3ea5d..0000000000000 --- a/eBones/lib/libkrb/get_admhst.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_admhst.c,v 4.0 89/01/23 10:08:55 jtkohl Exp $ - * $Id: get_admhst.c,v 1.3 1995/07/18 16:38:27 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_admhst.c,v 1.3 1995/07/18 16:38:27 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * Given a Kerberos realm, find a host on which the Kerberos database - * administration server can be found. - * - * krb_get_admhst takes a pointer to be filled in, a pointer to the name - * of the realm for which a server is desired, and an integer n, and - * returns (in h) the nth administrative host entry from the configuration - * file (KRB_CONF, defined in "krb.h") associated with the specified realm. - * - * On error, get_admhst returns KFAILURE. If all goes well, the routine - * returns KSUCCESS. - * - * For the format of the KRB_CONF file, see comments describing the routine - * krb_get_krbhst(). - * - * This is a temporary hack to allow us to find the nearest system running - * a Kerberos admin server. In the long run, this functionality will be - * provided by a nameserver. - */ - -int -krb_get_admhst(h, r, n) - char *h; - char *r; - int n; -{ - FILE *cnffile; - char tr[REALM_SZ]; - char linebuf[BUFSIZ]; - char scratch[64]; - register int i; - - if ((cnffile = fopen(KRB_CONF,"r")) == NULL) { - return(KFAILURE); - } - if (fgets(linebuf, BUFSIZ, cnffile) == NULL) { - /* error reading */ - (void) fclose(cnffile); - return(KFAILURE); - } - if (!index(linebuf, '\n')) { - /* didn't all fit into buffer, punt */ - (void) fclose(cnffile); - return(KFAILURE); - } - for (i = 0; i < n; ) { - /* run through the file, looking for admin host */ - if (fgets(linebuf, BUFSIZ, cnffile) == NULL) { - (void) fclose(cnffile); - return(KFAILURE); - } - /* need to scan for a token after 'admin' to make sure that - admin matched correctly */ - if (sscanf(linebuf, "%s %s admin %s", tr, h, scratch) != 3) - continue; - if (!strcmp(tr,r)) - i++; - } - (void) fclose(cnffile); - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/get_cred.c b/eBones/lib/libkrb/get_cred.c deleted file mode 100644 index 60233867ebd5e..0000000000000 --- a/eBones/lib/libkrb/get_cred.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_cred.c,v 4.10 89/05/31 17:46:22 jtkohl Exp $ - * $Id: get_cred.c,v 1.3 1995/07/18 16:38:28 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_cred.c,v 1.3 1995/07/18 16:38:28 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -/* - * krb_get_cred takes a service name, instance, and realm, and a - * structure of type CREDENTIALS to be filled in with ticket - * information. It then searches the ticket file for the appropriate - * ticket and fills in the structure with the corresponding - * information from the file. If successful, it returns KSUCCESS. - * On failure it returns a Kerberos error code. - */ - -int -krb_get_cred(service,instance,realm,c) - char *service; /* Service name */ - char *instance; /* Instance */ - char *realm; /* Auth domain */ - CREDENTIALS *c; /* Credentials struct */ -{ - int tf_status; /* return value of tf function calls */ - - /* Open ticket file and lock it for shared reading */ - if ((tf_status = tf_init(TKT_FILE, R_TKT_FIL)) != KSUCCESS) - return(tf_status); - - /* Copy principal's name and instance into the CREDENTIALS struc c */ - - if ( (tf_status = tf_get_pname(c->pname)) != KSUCCESS || - (tf_status = tf_get_pinst(c->pinst)) != KSUCCESS ) - return (tf_status); - - /* Search for requested service credentials and copy into c */ - - while ((tf_status = tf_get_cred(c)) == KSUCCESS) { - /* Is this the right ticket? */ - if ((strcmp(c->service,service) == 0) && - (strcmp(c->instance,instance) == 0) && - (strcmp(c->realm,realm) == 0)) - break; - } - (void) tf_close(); - - if (tf_status == EOF) - return (GC_NOTKT); - return(tf_status); -} diff --git a/eBones/lib/libkrb/get_in_tkt.c b/eBones/lib/libkrb/get_in_tkt.c deleted file mode 100644 index b95f073280487..0000000000000 --- a/eBones/lib/libkrb/get_in_tkt.c +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_in_tkt.c,v 4.12 89/07/18 16:32:56 jtkohl Exp $ - * $Id: get_in_tkt.c,v 1.3 1995/07/18 16:38:30 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_in_tkt.c,v 1.3 1995/07/18 16:38:30 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -#ifndef NULL -#define NULL 0 -#endif - -/* - * This file contains two routines: passwd_to_key() converts - * a password into a DES key (prompting for the password if - * not supplied), and krb_get_pw_in_tkt() gets an initial ticket for - * a user. - */ - -/* - * passwd_to_key(): given a password, return a DES key. - * There are extra arguments here which (used to be?) - * used by srvtab_to_key(). - * - * If the "passwd" argument is not null, generate a DES - * key from it, using string_to_key(). - * - * If the "passwd" argument is null, call des_read_password() - * to prompt for a password and then convert it into a DES key. - * - * In either case, the resulting key is put in the "key" argument, - * and 0 is returned. - */ - -/*ARGSUSED */ -static int passwd_to_key(user,instance,realm,passwd,key) - char *user, *instance, *realm, *passwd; - C_Block *key; -{ -#ifdef NOENCRYPTION - if (!passwd) - placebo_read_password(key, "Password: ", 0); -#else - if (passwd) - string_to_key(passwd,key); - else - des_read_password(key,"Password: ",0); -#endif - return (0); -} - -/* - * krb_get_pw_in_tkt() takes the name of the server for which the initial - * ticket is to be obtained, the name of the principal the ticket is - * for, the desired lifetime of the ticket, and the user's password. - * It passes its arguments on to krb_get_in_tkt(), which contacts - * Kerberos to get the ticket, decrypts it using the password provided, - * and stores it away for future use. - * - * krb_get_pw_in_tkt() passes two additional arguments to krb_get_in_tkt(): - * the name of a routine (passwd_to_key()) to be used to get the - * password in case the "password" argument is null and NULL for the - * decryption procedure indicating that krb_get_in_tkt should use the - * default method of decrypting the response from the KDC. - * - * The result of the call to krb_get_in_tkt() is returned. - */ - -int -krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password) - char *user, *instance, *realm, *service, *sinstance; - int life; - char *password; -{ - return(krb_get_in_tkt(user,instance,realm,service,sinstance,life, - passwd_to_key, NULL, password)); -} - -#ifdef NOENCRYPTION -/* - * $Source: /usr/cvs/src/eBones/krb/get_in_tkt.c,v $ - * $Author: mark $ - * - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * - * For copying and distribution information, please see the file - * . - * - * This routine prints the supplied string to standard - * output as a prompt, and reads a password string without - * echoing. - */ - -#include -#include "conf.h" - -#include -#ifdef BSDUNIX -#include -#include -#include -#include -#else -/* char *strcpy(); -int strcmp(); */ -#endif - -#ifdef BSDUNIX -static jmp_buf env; -#endif - -#ifdef BSDUNIX -static void sig_restore(); -static push_signals(), pop_signals(); -int placebo_read_pw_string(); -#endif - -/*** Routines ****************************************************** */ -int -placebo_read_password(k,prompt,verify) - des_cblock *k; - char *prompt; - int verify; -{ - int ok; - char key_string[BUFSIZ]; - -#ifdef BSDUNIX - if (setjmp(env)) { - ok = -1; - goto lose; - } -#endif - - ok = placebo_read_pw_string(key_string, BUFSIZ, prompt, verify); - if (ok == 0) - bzero(k, sizeof(C_Block)); - -lose: - bzero(key_string, sizeof (key_string)); - return ok; -} - -/* - * This version just returns the string, doesn't map to key. - * - * Returns 0 on success, non-zero on failure. - */ - -int -placebo_read_pw_string(s,max,prompt,verify) - char *s; - int max; - char *prompt; - int verify; -{ - int ok = 0; - char *ptr; - -#ifdef BSDUNIX - jmp_buf old_env; - struct sgttyb tty_state; -#endif - char key_string[BUFSIZ]; - - if (max > BUFSIZ) { - return -1; - } - -#ifdef BSDUNIX - bcopy(old_env, env, sizeof(env)); - if (setjmp(env)) - goto lose; - - /* save terminal state*/ - if (ioctl(0,TIOCGETP,&tty_state) == -1) - return -1; - - push_signals(); - /* Turn off echo */ - tty_state.sg_flags &= ~ECHO; - if (ioctl(0,TIOCSETP,&tty_state) == -1) - return -1; -#endif - while (!ok) { - printf(prompt); - fflush(stdout); -#ifdef CROSSMSDOS - h19line(s,sizeof(s),0); - if (!strlen(s)) - continue; -#else - if (!fgets(s, max, stdin)) { - clearerr(stdin); - continue; - } - if ((ptr = index(s, '\n'))) - *ptr = '\0'; -#endif - if (verify) { - printf("\nVerifying, please re-enter %s",prompt); - fflush(stdout); -#ifdef CROSSMSDOS - h19line(key_string,sizeof(key_string),0); - if (!strlen(key_string)) - continue; -#else - if (!fgets(key_string, sizeof(key_string), stdin)) { - clearerr(stdin); - continue; - } - if ((ptr = index(key_string, '\n'))) - *ptr = '\0'; -#endif - if (strcmp(s,key_string)) { - printf("\n\07\07Mismatch - try again\n"); - fflush(stdout); - continue; - } - } - ok = 1; - } - -#ifdef BSDUNIX -lose: - if (!ok) - bzero(s, max); - printf("\n"); - /* turn echo back on */ - tty_state.sg_flags |= ECHO; - if (ioctl(0,TIOCSETP,&tty_state)) - ok = 0; - pop_signals(); - bcopy(env, old_env, sizeof(env)); -#endif - if (verify) - bzero(key_string, sizeof (key_string)); - s[max-1] = 0; /* force termination */ - return !ok; /* return nonzero if not okay */ -} - -#ifdef BSDUNIX -/* - * this can be static since we should never have more than - * one set saved.... - */ -#ifdef POSIX -static void (*old_sigfunc[NSIG])(); -#else -static int (*old_sigfunc[NSIG])(); -#endif POSIX - -static push_signals() -{ - register i; - for (i = 0; i < NSIG; i++) - old_sigfunc[i] = signal(i,sig_restore); -} - -static pop_signals() -{ - register i; - for (i = 0; i < NSIG; i++) - signal(i,old_sigfunc[i]); -} - -static void sig_restore(sig,code,scp) - int sig,code; - struct sigcontext *scp; -{ - longjmp(env,1); -} -#endif -#endif /* NOENCRYPTION */ diff --git a/eBones/lib/libkrb/get_krbhst.c b/eBones/lib/libkrb/get_krbhst.c deleted file mode 100644 index cfc6e1cb70727..0000000000000 --- a/eBones/lib/libkrb/get_krbhst.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_krbhst.c,v 4.8 89/01/22 20:00:29 rfrench Exp $ - * $Id: get_krbhst.c,v 1.3 1995/07/18 16:38:32 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_krbhst.c,v 1.3 1995/07/18 16:38:32 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * Given a Kerberos realm, find a host on which the Kerberos authenti- - * cation server can be found. - * - * krb_get_krbhst takes a pointer to be filled in, a pointer to the name - * of the realm for which a server is desired, and an integer, n, and - * returns (in h) the nth entry from the configuration file (KRB_CONF, - * defined in "krb.h") associated with the specified realm. - * - * On end-of-file, krb_get_krbhst returns KFAILURE. If n=1 and the - * configuration file does not exist, krb_get_krbhst will return KRB_HOST - * (also defined in "krb.h"). If all goes well, the routine returnes - * KSUCCESS. - * - * The KRB_CONF file contains the name of the local realm in the first - * line (not used by this routine), followed by lines indicating realm/host - * entries. The words "admin server" following the hostname indicate that - * the host provides an administrative database server. - * - * For example: - * - * ATHENA.MIT.EDU - * ATHENA.MIT.EDU kerberos-1.mit.edu admin server - * ATHENA.MIT.EDU kerberos-2.mit.edu - * LCS.MIT.EDU kerberos.lcs.mit.edu admin server - * - * This is a temporary hack to allow us to find the nearest system running - * kerberos. In the long run, this functionality will be provided by a - * nameserver. - */ - -int -krb_get_krbhst(h,r,n) - char *h; - char *r; - int n; -{ - FILE *cnffile; - char tr[REALM_SZ]; - char linebuf[BUFSIZ]; - register int i; - - if ((cnffile = fopen(KRB_CONF,"r")) == NULL) { - if (n==1) { - (void) strcpy(h,KRB_HOST); - return(KSUCCESS); - } - else - return(KFAILURE); - } - if (fscanf(cnffile,"%s",tr) == EOF) - return(KFAILURE); - /* run through the file, looking for the nth server for this realm */ - for (i = 1; i <= n;) { - if (fgets(linebuf, BUFSIZ, cnffile) == NULL) { - (void) fclose(cnffile); - return(KFAILURE); - } - if (sscanf(linebuf, "%s %s", tr, h) != 2) - continue; - if (!strcmp(tr,r)) - i++; - } - (void) fclose(cnffile); - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/get_krbrlm.c b/eBones/lib/libkrb/get_krbrlm.c deleted file mode 100644 index a4803e5a20179..0000000000000 --- a/eBones/lib/libkrb/get_krbrlm.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_krbrlm.c,v 4.8 89/01/22 20:02:54 rfrench Exp $ - * $Id: get_krbrlm.c,v 1.3 1995/07/18 16:38:34 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_krbrlm.c,v 1.3 1995/07/18 16:38:34 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * krb_get_lrealm takes a pointer to a string, and a number, n. It fills - * in the string, r, with the name of the nth realm specified on the - * first line of the kerberos config file (KRB_CONF, defined in "krb.h"). - * It returns 0 (KSUCCESS) on success, and KFAILURE on failure. If the - * config file does not exist, and if n=1, a successful return will occur - * with r = KRB_REALM (also defined in "krb.h"). - * - * NOTE: for archaic & compatibility reasons, this routine will only return - * valid results when n = 1. - * - * For the format of the KRB_CONF file, see comments describing the routine - * krb_get_krbhst(). - */ - -int -krb_get_lrealm(r,n) - char *r; - int n; -{ - FILE *cnffile, *fopen(); - - if (n > 1) - return(KFAILURE); /* Temporary restriction */ - - if ((cnffile = fopen(KRB_CONF, "r")) == NULL) { - if (n == 1) { - (void) strcpy(r, KRB_REALM); - return(KSUCCESS); - } - else - return(KFAILURE); - } - - if (fscanf(cnffile,"%s",r) != 1) { - (void) fclose(cnffile); - return(KFAILURE); - } - (void) fclose(cnffile); - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/get_phost.c b/eBones/lib/libkrb/get_phost.c deleted file mode 100644 index cd83b2d2a1202..0000000000000 --- a/eBones/lib/libkrb/get_phost.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_phost.c,v 4.6 89/01/23 09:25:40 jtkohl Exp $ - * $Id: get_phost.c,v 1.3 1995/07/18 16:38:35 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_phost.c,v 1.3 1995/07/18 16:38:35 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -char *index(); - -/* - * This routine takes an alias for a host name and returns the first - * field, lower case, of its domain name. For example, if "menel" is - * an alias for host officially named "menelaus" (in /etc/hosts), for - * the host whose official name is "MENELAUS.MIT.EDU", the name "menelaus" - * is returned. - * - * This is done for historical Athena reasons: the Kerberos name of - * rcmd servers (rlogin, rsh, rcp) is of the form "rcmd.host@realm" - * where "host"is the lowercase for of the host name ("menelaus"). - * This should go away: the instance should be the domain name - * (MENELAUS.MIT.EDU). But for now we need this routine... - * - * A pointer to the name is returned, if found, otherwise a pointer - * to the original "alias" argument is returned. - */ - -char * krb_get_phost(alias) - char *alias; -{ - struct hostent *h; - char *phost = alias; - if ((h=gethostbyname(alias)) != (struct hostent *)NULL ) { - char *p = index( h->h_name, '.' ); - if (p) - *p = NULL; - p = phost = h->h_name; - do { - if (isupper(*p)) *p=tolower(*p); - } while (*p++); - } - return(phost); -} diff --git a/eBones/lib/libkrb/get_pw_tkt.c b/eBones/lib/libkrb/get_pw_tkt.c deleted file mode 100644 index 48b6126432f74..0000000000000 --- a/eBones/lib/libkrb/get_pw_tkt.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_pw_tkt.c,v 4.6 89/01/13 18:19:11 steiner Exp $ - * $Id: get_pw_tkt.c,v 1.3 1995/07/18 16:38:37 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_pw_tkt.c,v 1.3 1995/07/18 16:38:37 mark Exp $"; -#endif /* lint */ -#endif - - -#include - -/* - * Get a ticket for the password-changing server ("changepw.KRB_MASTER"). - * - * Given the name, instance, realm, and current password of the - * principal for which the user wants a password-changing-ticket, - * return either: - * - * GT_PW_BADPW if current password was wrong, - * GT_PW_NULL if principal had a NULL password, - * or the result of the krb_get_pw_in_tkt() call. - * - * First, try to get a ticket for "user.instance@realm" to use the - * "changepw.KRB_MASTER" server (KRB_MASTER is defined in "krb.h"). - * The requested lifetime for the ticket is "1", and the current - * password is the "cpw" argument given. - * - * If the password was bad, give up. - * - * If the principal had a NULL password in the Kerberos database - * (indicating that the principal is known to Kerberos, but hasn't - * got a password yet), try instead to get a ticket for the principal - * "default.changepw@realm" to use the "changepw.KRB_MASTER" server. - * Use the password "changepwkrb" instead of "cpw". Return GT_PW_NULL - * if all goes well, otherwise the error. - * - * If this routine succeeds, a ticket and session key for either the - * principal "user.instance@realm" or "default.changepw@realm" to use - * the password-changing server will be in the user's ticket file. - */ - -int -get_pw_tkt(user,instance,realm,cpw) - char *user; - char *instance; - char *realm; - char *cpw; -{ - int kerror; - - kerror = krb_get_pw_in_tkt(user, instance, realm, "changepw", - KRB_MASTER, 1, cpw); - - if (kerror == INTK_BADPW) - return(GT_PW_BADPW); - - if (kerror == KDC_NULL_KEY) { - kerror = krb_get_pw_in_tkt("default","changepw",realm,"changepw", - KRB_MASTER,1,"changepwkrb"); - if (kerror) - return(kerror); - return(GT_PW_NULL); - } - - return(kerror); -} diff --git a/eBones/lib/libkrb/get_request.c b/eBones/lib/libkrb/get_request.c deleted file mode 100644 index c4982bf3283ce..0000000000000 --- a/eBones/lib/libkrb/get_request.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_request.c,v 4.7 88/12/01 14:00:11 jtkohl Exp $ - * $Id: get_request.c,v 1.3 1995/07/18 16:38:39 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: get_request.c,v 1.3 1995/07/18 16:38:39 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -/* - * This procedure is obsolete. It is used in the kerberos_slave - * code for Version 3 tickets. - * - * This procedure sets s_name, and instance to point to - * the corresponding fields from tne nth request in the packet. - * it returns the lifetime requested. Garbage will be returned - * if there are less than n requests in the packet. - */ - -int -get_request(pkt, n, s_name, instance) - KTEXT pkt; /* The packet itself */ - int n; /* Which request do we want */ - char **s_name; /* Service name to be filled in */ - char **instance; /* Instance name to be filled in */ -{ - /* Go to the beginning of the request list */ - char *ptr = (char *) pkt_a_realm(pkt) + 6 + - strlen((char *)pkt_a_realm(pkt)); - - /* Read requests until we hit the right one */ - while (n-- > 1) { - ptr++; - ptr += 1 + strlen(ptr); - ptr += 1 + strlen(ptr); - } - - /* Set the arguments to point to the right place */ - *s_name = 1 + ptr; - *instance = 2 + ptr + strlen(*s_name); - - /* Return the requested lifetime */ - return((int) *ptr); -} diff --git a/eBones/lib/libkrb/get_svc_in_tkt.c b/eBones/lib/libkrb/get_svc_in_tkt.c deleted file mode 100644 index f5680db91d8b3..0000000000000 --- a/eBones/lib/libkrb/get_svc_in_tkt.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_svc_in_tkt.c,v 4.9 89/07/18 16:33:34 jtkohl Exp $ - * $Id: get_svc_in_tkt.c,v 1.3 1995/07/18 16:38:41 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_svc_in_tkt.c,v 1.3 1995/07/18 16:38:41 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -#ifndef NULL -#define NULL 0 -#endif - -/* - * This file contains two routines: srvtab_to_key(), which gets - * a server's key from a srvtab file, and krb_get_svc_in_tkt() which - * gets an initial ticket for a server. - */ - -/* - * srvtab_to_key(): given a "srvtab" file (where the keys for the - * service on a host are stored), return the private key of the - * given service (user.instance@realm). - * - * srvtab_to_key() passes its arguments on to read_service_key(), - * plus one additional argument, the key version number. - * (Currently, the key version number is always 0; this value - * is treated as a wildcard by read_service_key().) - * - * If the "srvtab" argument is null, KEYFILE (defined in "krb.h") - * is passed in its place. - * - * It returns the return value of the read_service_key() call. - * The service key is placed in "key". - */ - -static int -srvtab_to_key(user, instance, realm, srvtab, key) - char *user, *instance, *realm, *srvtab; - C_Block key; -{ - if (!srvtab) - srvtab = KEYFILE; - - return(read_service_key(user, instance, realm, 0, srvtab, - (char *)key)); -} - -/* - * krb_get_svc_in_tkt() passes its arguments on to krb_get_in_tkt(), - * plus two additional arguments: a pointer to the srvtab_to_key() - * function to be used to get the key from the key file and a NULL - * for the decryption procedure indicating that krb_get_in_tkt should - * use the default method of decrypting the response from the KDC. - * - * It returns the return value of the krb_get_in_tkt() call. - */ - -int -krb_get_svc_in_tkt(user, instance, realm, service, sinstance, life, srvtab) - char *user, *instance, *realm, *service, *sinstance; - int life; - char *srvtab; -{ - return(krb_get_in_tkt(user, instance, realm, service, sinstance, - life, srvtab_to_key, NULL, srvtab)); -} diff --git a/eBones/lib/libkrb/get_tf_fullname.c b/eBones/lib/libkrb/get_tf_fullname.c deleted file mode 100644 index 8d7639992e890..0000000000000 --- a/eBones/lib/libkrb/get_tf_fullname.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_tf_fullname.c,v 4.3 90/03/10 22:40:20 jon Exp $ - * $Id: get_tf_fullname.c,v 1.3 1995/07/18 16:38:42 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_tf_fullname.c,v 1.3 1995/07/18 16:38:42 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* - * This file contains a routine to extract the fullname of a user - * from the ticket file. - */ - -/* - * krb_get_tf_fullname() takes four arguments: the name of the - * ticket file, and variables for name, instance, and realm to be - * returned in. Since the realm of a ticket file is not really fully - * supported, the realm used will be that of the the first ticket in - * the file as this is the one that was obtained with a password by - * krb_get_in_tkt(). - */ - -int -krb_get_tf_fullname(ticket_file, name, instance, realm) - char *ticket_file; - char *name; - char *instance; - char *realm; -{ - int tf_status; - CREDENTIALS c; - - if ((tf_status = tf_init(ticket_file, R_TKT_FIL)) != KSUCCESS) - return(tf_status); - - if (((tf_status = tf_get_pname(c.pname)) != KSUCCESS) || - ((tf_status = tf_get_pinst(c.pinst)) != KSUCCESS)) - return (tf_status); - - if (name) - strcpy(name, c.pname); - if (instance) - strcpy(instance, c.pinst); - if ((tf_status = tf_get_cred(&c)) == KSUCCESS) { - if (realm) - strcpy(realm, c.realm); - } - else { - if (tf_status == EOF) - return(KFAILURE); - else - return(tf_status); - } - (void) tf_close(); - - return(tf_status); -} diff --git a/eBones/lib/libkrb/get_tf_realm.c b/eBones/lib/libkrb/get_tf_realm.c deleted file mode 100644 index 8d75a9df82951..0000000000000 --- a/eBones/lib/libkrb/get_tf_realm.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: get_tf_realm.c,v 4.2 90/01/02 13:40:19 jtkohl Exp $ - * $Id: get_tf_realm.c,v 1.3 1995/07/18 16:38:44 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: get_tf_realm.c,v 1.3 1995/07/18 16:38:44 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -/* - * This file contains a routine to extract the realm of a kerberos - * ticket file. - */ - -/* - * krb_get_tf_realm() takes two arguments: the name of a ticket - * and a variable to store the name of the realm in. - * - */ - -int -krb_get_tf_realm(ticket_file, realm) - char *ticket_file; - char *realm; -{ - return(krb_get_tf_fullname(ticket_file, 0, 0, realm)); -} diff --git a/eBones/lib/libkrb/getrealm.c b/eBones/lib/libkrb/getrealm.c deleted file mode 100644 index dcd4d28a91990..0000000000000 --- a/eBones/lib/libkrb/getrealm.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * routine to convert hostname into realm name. - * - * from: getrealm.c,v 4.6 90/01/02 13:35:56 jtkohl Exp $ - * $Id: getrealm.c,v 1.3 1995/07/18 16:38:46 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: getrealm.c,v 1.3 1995/07/18 16:38:46 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include - -/* for Ultrix and friends ... */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif - -/* - * krb_realmofhost. - * Given a fully-qualified domain-style primary host name, - * return the name of the Kerberos realm for the host. - * If the hostname contains no discernable domain, or an error occurs, - * return the local realm name, as supplied by get_krbrlm(). - * If the hostname contains a domain, but no translation is found, - * the hostname's domain is converted to upper-case and returned. - * - * The format of each line of the translation file is: - * domain_name kerberos_realm - * -or- - * host_name kerberos_realm - * - * domain_name should be of the form .XXX.YYY (e.g. .LCS.MIT.EDU) - * host names should be in the usual form (e.g. FOO.BAR.BAZ) - */ - -static char ret_realm[REALM_SZ+1]; - -char * -krb_realmofhost(host) -char *host; -{ - char *domain; - FILE *trans_file; - char trans_host[MAXHOSTNAMELEN+1]; - char trans_realm[REALM_SZ+1]; - int retval; - - domain = index(host, '.'); - - /* prepare default */ - if (domain) { - char *cp; - - strncpy(ret_realm, &domain[1], REALM_SZ); - ret_realm[REALM_SZ] = '\0'; - /* Upper-case realm */ - for (cp = ret_realm; *cp; cp++) - if (islower(*cp)) - *cp = toupper(*cp); - } else { - krb_get_lrealm(ret_realm, 1); - } - - if ((trans_file = fopen(KRB_RLM_TRANS, "r")) == (FILE *) 0) { - /* krb_errno = KRB_NO_TRANS */ - return(ret_realm); - } - while (1) { - if ((retval = fscanf(trans_file, "%s %s", - trans_host, trans_realm)) != 2) { - if (retval == EOF) { - fclose(trans_file); - return(ret_realm); - } - continue; /* ignore broken lines */ - } - trans_host[MAXHOSTNAMELEN] = '\0'; - trans_realm[REALM_SZ] = '\0'; - if (!strcasecmp(trans_host, host)) { - /* exact match of hostname, so return the realm */ - (void) strcpy(ret_realm, trans_realm); - fclose(trans_file); - return(ret_realm); - } - if ((trans_host[0] == '.') && domain) { - /* this is a domain match */ - if (!strcasecmp(trans_host, domain)) { - /* domain match, save for later */ - (void) strcpy(ret_realm, trans_realm); - continue; - } - } - } -} diff --git a/eBones/lib/libkrb/getst.c b/eBones/lib/libkrb/getst.c deleted file mode 100644 index e50e4bb51e19b..0000000000000 --- a/eBones/lib/libkrb/getst.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * form: getst.c,v 4.5 88/11/15 16:31:39 jtkohl Exp $ - * $Id: getst.c,v 1.3 1995/07/18 16:38:47 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: getst.c,v 1.3 1995/07/18 16:38:47 mark Exp $"; -#endif /* lint */ -#endif - -#include - -/* - * getst() takes a file descriptor, a string and a count. It reads - * from the file until either it has read "count" characters, or until - * it reads a null byte. When finished, what has been read exists in - * the given string "s". If "count" characters were actually read, the - * last is changed to a null, so the returned string is always null- - * terminated. getst() returns the number of characters read, including - * the null terminator. - */ - -int -getst(fd, s, n) - int fd; - register char *s; - int n; -{ - register count = n; - while (read(fd, s, 1) > 0 && --count) - if (*s++ == '\0') - return (n - count); - *s = '\0'; - return (n - count); -} diff --git a/eBones/lib/libkrb/in_tkt.c b/eBones/lib/libkrb/in_tkt.c deleted file mode 100644 index 1f6ee8aa60783..0000000000000 --- a/eBones/lib/libkrb/in_tkt.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: kt.c,v 4.9 89/10/25 19:03:35 qjb Exp $ - * $Id: in_tkt.c,v 1.6 1995/07/18 16:38:49 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: in_tkt.c,v 1.6 1995/07/18 16:38:49 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef TKT_SHMEM -#include -#endif - -extern int krb_debug; - -/* - * in_tkt() is used to initialize the ticket store. It creates the - * file to contain the tickets and writes the given user's name "pname" - * and instance "pinst" in the file. in_tkt() returns KSUCCESS on - * success, or KFAILURE if something goes wrong. - */ - -int -in_tkt(pname,pinst) - char *pname; - char *pinst; -{ - int tktfile; - uid_t me, metoo; - struct stat buf; - int count; - char *file = TKT_FILE; - int fd; - register int i; - char charbuf[BUFSIZ]; -#ifdef TKT_SHMEM - char shmidname[MAXPATHLEN]; -#endif /* TKT_SHMEM */ - - me = getuid (); - metoo = geteuid(); - if (lstat(file,&buf) == 0) { - if (buf.st_uid != me && me == 0) { - unlink(file); - } else { - if (buf.st_uid != me || !(buf.st_mode & S_IFREG) || - buf.st_mode & 077) { - if (krb_debug) - fprintf(stderr,"Error initializing %s",file); - return(KFAILURE); - } - /* file already exists, and permissions appear ok, so nuke it */ - if ((fd = open(file, O_RDWR, 0)) < 0) - goto out; /* can't zero it, but we can still try truncating it */ - - bzero(charbuf, sizeof(charbuf)); - - for (i = 0; i < buf.st_size; i += sizeof(charbuf)) - if (write(fd, charbuf, sizeof(charbuf)) != sizeof(charbuf)) { - (void) fsync(fd); - (void) close(fd); - goto out; - } - - (void) fsync(fd); - (void) close(fd); - } - } - out: - /* arrange so the file is owned by the ruid - (swap real & effective uid if necessary). - This isn't a security problem, since the ticket file, if it already - exists, has the right uid (== ruid) and mode. */ - if (me != metoo) { - if (setreuid(metoo, me) < 0) { - /* can't switch??? barf! */ - if (krb_debug) - perror("in_tkt: setreuid"); - return(KFAILURE); - } else - if (krb_debug) - printf("swapped UID's %ld and %ld\n",metoo,me); - } - if ((tktfile = open(file,O_CREAT | O_TRUNC | O_WRONLY,0600)) < 0) { - if (krb_debug) - fprintf(stderr,"Error initializing %s",TKT_FILE); - return(KFAILURE); - } - if (me != metoo) { - if (setreuid(me, metoo) < 0) { - /* can't switch??? barf! */ - if (krb_debug) - perror("in_tkt: setreuid2"); - return(KFAILURE); - } else - if (krb_debug) - printf("swapped UID's %ld and %ld\n",me,metoo); - } - if (lstat(file,&buf) < 0) { - if (krb_debug) - fprintf(stderr,"Error initializing %s",TKT_FILE); - return(KFAILURE); - } - - if (buf.st_uid != me || !(buf.st_mode & S_IFREG) || - buf.st_mode & 077) { - if (krb_debug) - fprintf(stderr,"Error initializing %s",TKT_FILE); - return(KFAILURE); - } - - count = strlen(pname)+1; - if (write(tktfile,pname,count) != count) { - (void) close(tktfile); - return(KFAILURE); - } - count = strlen(pinst)+1; - if (write(tktfile,pinst,count) != count) { - (void) close(tktfile); - return(KFAILURE); - } - (void) close(tktfile); -#ifdef TKT_SHMEM - (void) strcpy(shmidname, file); - (void) strcat(shmidname, ".shm"); - return(krb_shm_create(shmidname)); -#else /* !TKT_SHMEM */ - return(KSUCCESS); -#endif /* TKT_SHMEM */ -} diff --git a/eBones/lib/libkrb/k_gethostname.c b/eBones/lib/libkrb/k_gethostname.c deleted file mode 100644 index cfb4f922a6df7..0000000000000 --- a/eBones/lib/libkrb/k_gethostname.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: k_gethostname.c,v 4.1 88/12/01 14:04:42 jtkohl Exp $ - * $Id: k_gethostname.c,v 1.3 1995/07/18 16:38:51 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: k_gethostname.c,v 1.3 1995/07/18 16:38:51 mark Exp $"; -#endif /* lint */ -#endif - -#include - -#ifndef PC -#ifndef BSD42 -/* teach me how to k_gethostname for your system here */ -#endif -#endif - -#ifdef PC -#include -typedef long in_name; -#include "custom.h" /* where is this file? */ -extern get_custom(); -#define LEN 64 /* just a guess */ -#endif /* PC */ - -/* - * Return the local host's name in "name", up to "namelen" characters. - * "name" will be null-terminated if "namelen" is big enough. - * The return code is 0 on success, -1 on failure. (The calling - * interface is identical to gethostname(2).) - * - * Currently defined for BSD 4.2 and PC. The BSD version just calls - * gethostname(); the PC code was taken from "kinit.c", and may or may - * not work. - */ - -int -k_gethostname(name, namelen) - char *name; - int namelen; -{ -#ifdef BSD42 - return gethostname(name, namelen); -#endif - -#ifdef PC - char buf[LEN]; - char b1, b2, b3, b4; - register char *ptr; - - get_custom(); /* should check for errors, - * return -1 on failure */ - ptr = (char *) &(custom.c_me); - b1 = *ptr++; - b2 = *ptr++; - b3 = *ptr++; - b4 = *ptr; - (void) sprintf(buf,"PC address %d.%d.%d.%d",b1,b2,b3,b4); - if (strlen(buf) > namelen) - fprintf(stderr, "gethostname: namelen too small; truncating"); - strnpcy(name, buf, namelen); - return 0; -#endif -} diff --git a/eBones/lib/libkrb/klog.c b/eBones/lib/libkrb/klog.c deleted file mode 100644 index 7fdc774af3d5e..0000000000000 --- a/eBones/lib/libkrb/klog.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: klog.c,v 4.6 88/12/01 14:06:05 jtkohl Exp $ - * $Id: klog.c,v 1.3 1995/07/18 16:38:52 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: klog.c,v 1.3 1995/07/18 16:38:52 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -#include -#include - -static char *log_name = KRBLOG; -static int is_open; -static char logtxt[1000]; - -/* - * This file contains two logging routines: kset_logfile() - * to determine the file to which log entries should be written; - * and klog() to write log entries to the file. - */ - -/* - * klog() is used to add entries to the logfile (see kset_logfile() - * below). Note that it is probably not portable since it makes - * assumptions about what the compiler will do when it is called - * with less than the correct number of arguments which is the - * way it is usually called. - * - * The log entry consists of a timestamp and the given arguments - * printed according to the given "format" string. - * - * The log file is opened and closed for each log entry. - * - * If the given log type "type" is unknown, or if the log file - * cannot be opened, no entry is made to the log file. - * - * The return value is always a pointer to the formatted log - * text string "logtxt". - */ - -char * klog(type,format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0) - int type; - char *format; - int a1,a2,a3,a4,a5,a6,a7,a8,a9,a0; -{ - FILE *logfile; - long now; - struct tm *tm; - static int logtype_array[NLOGTYPE] = {0,0}; - static int array_initialized; - - if (!(array_initialized++)) { - logtype_array[L_NET_ERR] = 1; - logtype_array[L_KRB_PERR] = 1; - logtype_array[L_KRB_PWARN] = 1; - logtype_array[L_APPL_REQ] = 1; - logtype_array[L_INI_REQ] = 1; - logtype_array[L_DEATH_REQ] = 1; - logtype_array[L_NTGT_INTK] = 1; - logtype_array[L_ERR_SEXP] = 1; - logtype_array[L_ERR_MKV] = 1; - logtype_array[L_ERR_NKY] = 1; - logtype_array[L_ERR_NUN] = 1; - logtype_array[L_ERR_UNK] = 1; - } - - (void) sprintf(logtxt,format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0); - - if (!logtype_array[type]) - return(logtxt); - - if ((logfile = fopen(log_name,"a")) == NULL) - return(logtxt); - - (void) time(&now); - tm = localtime(&now); - - fprintf(logfile,"%2d-%s-%02d %02d:%02d:%02d ",tm->tm_mday, - month_sname(tm->tm_mon + 1),tm->tm_year, - tm->tm_hour, tm->tm_min, tm->tm_sec); - fprintf(logfile,"%s\n",logtxt); - (void) fclose(logfile); - return(logtxt); -} - -/* - * kset_logfile() changes the name of the file to which - * messages are logged. If kset_logfile() is not called, - * the logfile defaults to KRBLOG, defined in "krb.h". - */ - -void -kset_logfile(filename) - char *filename; -{ - log_name = filename; - is_open = 0; -} diff --git a/eBones/lib/libkrb/kname_parse.c b/eBones/lib/libkrb/kname_parse.c deleted file mode 100644 index da7ec9393c6b8..0000000000000 --- a/eBones/lib/libkrb/kname_parse.c +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: kname_parse.c,v 4.4 88/12/01 14:07:29 jtkohl Exp $ - * $Id: kname_parse.c,v 1.3 1995/07/18 16:38:54 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kname_parse.c,v 1.3 1995/07/18 16:38:54 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -/* max size of full name */ -#define FULL_SZ (ANAME_SZ + INST_SZ + REALM_SZ) - -#define NAME 0 /* which field are we in? */ -#define INST 1 -#define REALM 2 - -extern char *krb_err_txt[]; - -/* - * This file contains four routines for handling Kerberos names. - * - * kname_parse() breaks a Kerberos name into its name, instance, - * and realm components. - * - * k_isname(), k_isinst(), and k_isrealm() check a given string to see if - * it's a syntactically legitimate respective part of a Kerberos name, - * returning 1 if it is, 0 if it isn't. - * - * Definition of "syntactically legitimate" names is according to - * the Project Athena Technical Plan Section E.2.1, page 7 "Specifying - * names", version dated 21 Dec 1987. - */ - -/* - * kname_parse() takes a Kerberos name "fullname" of the form: - * - * username[.instance][@realm] - * - * and returns the three components ("name", "instance", and "realm" - * in the example above) in the given arguments "np", "ip", and "rp". - * - * If successful, it returns KSUCCESS. If there was an error, - * KNAME_FMT is returned. - */ - -int -kname_parse(np, ip, rp, fullname) - char *np, *ip, *rp, *fullname; -{ - static char buf[FULL_SZ]; - char *rnext, *wnext; /* next char to read, write */ - register char c; - int backslash; - int field; - - backslash = 0; - rnext = buf; - wnext = np; - field = NAME; - - if (strlen(fullname) > FULL_SZ) - return KNAME_FMT; - (void) strcpy(buf, fullname); - - while ((c = *rnext++)) { - if (backslash) { - *wnext++ = c; - backslash = 0; - continue; - } - switch (c) { - case '\\': - backslash++; - break; - case '.': - switch (field) { - case NAME: - if (wnext == np) - return KNAME_FMT; - *wnext = '\0'; - field = INST; - wnext = ip; - break; - case INST: - return KNAME_FMT; - /* break; */ - case REALM: - *wnext++ = c; - break; - default: - fprintf(stderr, "unknown field value\n"); - exit(1); - } - break; - case '@': - switch (field) { - case NAME: - if (wnext == np) - return KNAME_FMT; - *ip = '\0'; - /* fall through */ - case INST: - *wnext = '\0'; - field = REALM; - wnext = rp; - break; - case REALM: - return KNAME_FMT; - default: - fprintf(stderr, "unknown field value\n"); - exit(1); - } - break; - default: - *wnext++ = c; - } - } - *wnext = '\0'; - if ((strlen(np) > ANAME_SZ - 1) || - (strlen(ip) > INST_SZ - 1) || - (strlen(rp) > REALM_SZ - 1)) - return KNAME_FMT; - return KSUCCESS; -} - -/* - * k_isname() returns 1 if the given name is a syntactically legitimate - * Kerberos name; returns 0 if it's not. - */ - -int -k_isname(s) - char *s; -{ - register char c; - int backslash = 0; - - if (!*s) - return 0; - if (strlen(s) > ANAME_SZ - 1) - return 0; - while((c = *s++)) { - if (backslash) { - backslash = 0; - continue; - } - switch(c) { - case '\\': - backslash = 1; - break; - case '.': - return 0; - /* break; */ - case '@': - return 0; - /* break; */ - } - } - return 1; -} - - -/* - * k_isinst() returns 1 if the given name is a syntactically legitimate - * Kerberos instance; returns 0 if it's not. - */ - -int -k_isinst(s) - char *s; -{ - register char c; - int backslash = 0; - - if (strlen(s) > INST_SZ - 1) - return 0; - while((c = *s++)) { - if (backslash) { - backslash = 0; - continue; - } - switch(c) { - case '\\': - backslash = 1; - break; - case '.': - return 0; - /* break; */ - case '@': - return 0; - /* break; */ - } - } - return 1; -} - -/* - * k_isrealm() returns 1 if the given name is a syntactically legitimate - * Kerberos realm; returns 0 if it's not. - */ - -int -k_isrealm(s) - char *s; -{ - register char c; - int backslash = 0; - - if (!*s) - return 0; - if (strlen(s) > REALM_SZ - 1) - return 0; - while((c = *s++)) { - if (backslash) { - backslash = 0; - continue; - } - switch(c) { - case '\\': - backslash = 1; - break; - case '@': - return 0; - /* break; */ - } - } - return 1; -} diff --git a/eBones/lib/libkrb/kntoln.c b/eBones/lib/libkrb/kntoln.c deleted file mode 100644 index 388704c09ff39..0000000000000 --- a/eBones/lib/libkrb/kntoln.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: kntoln.c,v 4.7 89/01/23 09:25:15 jtkohl Exp $ - * $Id: kntoln.c,v 1.3 1995/07/18 16:38:56 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: kntoln.c,v 1.3 1995/07/18 16:38:56 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -/* - * krb_kntoln converts an auth name into a local name by looking up - * the auth name in the /etc/aname file. The format of the aname - * file is: - * - * +-----+-----+-----+-----+------+----------+-------+-------+ - * | anl | inl | rll | lnl | name | instance | realm | lname | - * +-----+-----+-----+-----+------+----------+-------+-------+ - * | 1by | 1by | 1by | 1by | name | instance | realm | lname | - * +-----+-----+-----+-----+------+----------+-------+-------+ - * - * If the /etc/aname file can not be opened it will set the - * local name to the auth name. Thus, in this case it performs as - * the identity function. - * - * The name instance and realm are passed to krb_kntoln through - * the AUTH_DAT structure (ad). - * - * Now here's what it *really* does: - * - * Given a Kerberos name in an AUTH_DAT structure, check that the - * instance is null, and that the realm is the same as the local - * realm, and return the principal's name in "lname". Return - * KSUCCESS if all goes well, otherwise KFAILURE. - */ - -int -krb_kntoln(ad,lname) - AUTH_DAT *ad; - char *lname; -{ - static char lrealm[REALM_SZ] = ""; - - if (!(*lrealm) && (krb_get_lrealm(lrealm,1) == KFAILURE)) - return(KFAILURE); - - if (strcmp(ad->pinst,"")) - return(KFAILURE); - if (strcmp(ad->prealm,lrealm)) - return(KFAILURE); - (void) strcpy(lname,ad->pname); - return(KSUCCESS); -} diff --git a/eBones/lib/libkrb/kparse.c b/eBones/lib/libkrb/kparse.c deleted file mode 100644 index 5b25ac7264362..0000000000000 --- a/eBones/lib/libkrb/kparse.c +++ /dev/null @@ -1,776 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Purpose: - * This module was developed to parse the "~/.klogin" files for - * Kerberos-authenticated rlogin/rcp/rsh services. However, it is - * general purpose and can be used to parse any such parameter file. - * - * The parameter file should consist of one or more entries, with each - * entry on a separate line and consisting of zero or more - * "keyword=value" combinations. The keyword is case insensitive, but - * the value is not. Any string may be enclosed in quotes, and - * c-style "\" literals are supported. A comma may be used to - * separate the k/v combinations, and multiple commas are ignored. - * Whitespace (blank or tab) may be used freely and is ignored. - * - * Full error processing is available. When PS_BAD_KEYWORD or - * PS_SYNTAX is returned from fGetParameterSet(), the string ErrorMsg - * contains a meaningful error message. - * - * Keywords and their default values are programmed by an external - * table. - * - * Routines: - * fGetParameterSet() parse one line of the parameter file - * fGetKeywordValue() parse one "keyword=value" combo - * fGetToken() parse one token - * - * - * from: kparse.c,v 4.5 89/01/21 17:20:39 jtkohl Exp $ - * $Id: kparse.c,v 1.3 1995/07/18 16:38:58 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kparse.c,v 1.3 1995/07/18 16:38:58 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include - -#ifndef FALSE -#define FALSE 0 -#define TRUE 1 -#endif - -#define MAXKEY 80 -#define MAXVALUE 80 - -int fUngetChar(int ch, FILE *fp); -int fGetChar(FILE *fp); -int fGetLiteral(FILE *fp); - -int LineNbr=1; /* current line nbr in parameter file */ -char ErrorMsg[80]; /* meaningful only when KV_SYNTAX, PS_SYNTAX, - * or PS_BAD_KEYWORD is returned by - * fGetKeywordValue or fGetParameterSet */ - -int -fGetParameterSet( fp,parm,parmcount ) - FILE *fp; - parmtable parm[]; - int parmcount; -{ - int rc,i; - char keyword[MAXKEY]; - char value[MAXVALUE]; - - while (TRUE) { - rc=fGetKeywordValue(fp,keyword,MAXKEY,value,MAXVALUE); - - switch (rc) { - - case KV_EOF: - return(PS_EOF); - - case KV_EOL: - return(PS_OKAY); - - case KV_SYNTAX: - return(PS_SYNTAX); - - case KV_OKAY: - /* - * got a reasonable keyword/value pair. Search the - * parameter table to see if we recognize the keyword; if - * not, return an error. If we DO recognize it, make sure - * it has not already been given. If not already given, - * save the value. - */ - for (i=0; i= parmcount) { - sprintf(ErrorMsg, "unrecognized keyword \"%s\" found", - keyword); - return(PS_BAD_KEYWORD); - } - break; - - default: - sprintf(ErrorMsg, - "panic: bad return (%d) from fGetToken()",rc); - break; - } - } -} - -/* - * Routine: ParmCompare - * - * Purpose: - * ParmCompare checks a specified value for a particular keyword. - * fails if keyword not found or keyword found but the value was - * different. Like strcmp, ParmCompare returns 0 for a match found, -1 - * otherwise - */ -int -ParmCompare( parm, parmcount, keyword, value ) - parmtable parm[]; - int parmcount; - char *keyword; - char *value; -{ - int i; - - for (i=0; i\n"); - exit(1); - } - - if (!(fp=fopen(*++argv,"r"))) { - fprintf(stderr,"can\'t open input file \"%s\"\n",filename); - exit(1); - } - filename = *argv; - - while ((rc=fGetKeywordValue(fp,key,MAXKEY,valu,MAXVALUE))!=KV_EOF){ - - switch (rc) { - - case KV_EOL: - printf("%s, line %d: nada mas.\n",filename,LineNbr-1); - break; - - case KV_SYNTAX: - printf("%s, line %d: syntax error: %s\n", - filename,LineNbr,ErrorMsg); - while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') ); - break; - - case KV_OKAY: - printf("%s, line %d: okay, %s=\"%s\"\n", - filename,LineNbr,key,valu); - break; - - default: - printf("panic: bad return (%d) from fGetKeywordValue\n",rc); - break; - } - } - printf("EOF"); - fclose(fp); - exit(0); -} -#endif - -#ifdef PSTEST - -parmtable kparm[] = { - /* keyword, default, found value */ - { "user", "", (char *)NULL }, - { "realm", "Athena", (char *)NULL }, - { "instance", "", (char *)NULL } -}; - -main(argc,argv) - int argc; - char **argv; -{ - int rc,i,ch; - FILE *fp; - char *filename; - - if (argc != 2) { - fprintf(stderr,"usage: test \n"); - exit(1); - } - - if (!(fp=fopen(*++argv,"r"))) { - fprintf(stderr,"can\'t open input file \"%s\"\n",filename); - exit(1); - } - filename = *argv; - - while ((rc=fGetParameterSet(fp,kparm,PARMCOUNT(kparm))) != PS_EOF) { - - switch (rc) { - - case PS_BAD_KEYWORD: - printf("%s, line %d: %s\n",filename,LineNbr,ErrorMsg); - while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') ); - break; - - case PS_SYNTAX: - printf("%s, line %d: syntax error: %s\n", - filename,LineNbr,ErrorMsg); - while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') ); - break; - - case PS_OKAY: - printf("%s, line %d: valid parameter set found:\n", - filename,LineNbr-1); - for (i=0; i. -.\" -.TH KERBEROS 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -Kerberos authentication library -.PP -krb_mk_req, krb_rd_req, krb_kntoln, krb_set_key, -krb_get_cred, krb_mk_priv, krb_rd_priv, krb_mk_safe, -krb_rd_safe, krb_mk_err, krb_rd_err, krb_ck_repl -krb_get_local_addr, krb_bind_local_addr -.SH SYNOPSIS -.nf -.nj -.ft B -#include -#include -.PP -.ft B -extern char *krb_err_txt[]; -.PP -.ft B -int krb_mk_req(authent,service,instance,realm,checksum) -KTEXT authent; -char *service; -char *instance; -char *realm; -u_long checksum; -.PP -.ft B -int krb_rd_req(authent,service,instance,from_addr,ad,fn) -KTEXT authent; -char *service; -char *instance; -u_long from_addr; -AUTH_DAT *ad; -char *fn; -.PP -.ft B -int krb_kntoln(ad,lname) -AUTH_DAT *ad; -char *lname; -.PP -.ft B -int krb_set_key(key,cvt) -char *key; -int cvt; -.PP -.ft B -int krb_get_cred(service,instance,realm,c) -char *service; -char *instance; -char *realm; -CREDENTIALS *c; -.PP -.ft B -long krb_mk_priv(in,out,in_length,schedule,key,sender,receiver) -u_char *in; -u_char *out; -u_long in_length; -des_cblock key; -des_key_schedule schedule; -struct sockaddr_in *sender; -struct sockaddr_in *receiver; -.PP -.ft B -long krb_rd_priv(in,in_length,schedule,key,sender,receiver,msg_data) -u_char *in; -u_long in_length; -Key_schedule schedule; -des_cblock key; -struct sockaddr_in *sender; -struct sockaddr_in *receiver; -MSG_DAT *msg_data; -.PP -.ft B -long krb_mk_safe(in,out,in_length,key,sender,receiver) -u_char *in; -u_char *out; -u_long in_length; -des_cblock key; -struct sockaddr_in *sender; -struct sockaddr_in *receiver; -.PP -.ft B -long krb_rd_safe(in,length,key,sender,receiver,msg_data) -u_char *in; -u_long length; -des_cblock key; -struct sockaddr_in *sender; -struct sockaddr_in *receiver; -MSG_DAT *msg_data; -.PP -.ft B -long krb_mk_err(out,code,string) -u_char *out; -long code; -char *string; -.PP -.ft B -long krb_rd_err(in,length,code,msg_data) -u_char *in; -u_long length; -long code; -MSG_DAT *msg_data; -.PP -.ft B -int krb_get_local_addr(address) -struct sockaddr_in *address; -.PP -.ft B -int krb_bind_local_addr(socket) -int socket; -.fi -.ft R -.SH DESCRIPTION -This library supports network authentication and various related -operations. The library contains many routines beyond those described -in this man page, but they are not intended to be used directly. -Instead, they are called by the routines that are described, the -authentication server and the login program. -.PP -The original MIT implementation of the krb library could fail when used on -multi-homed client machines. Two functions, -.I krb_get_local_addr -and -.I krb_bind_local_addr, -are provided to overcome this limitation. Any -application expected to function in a multi-homed environment (clients -with more than one network interface) that opens sockets to perform -authenticated or encrypted transactions must use one of these functions -to bind its sockets to the local address used and authenticated by Kerberos. -.PP -.I krb_err_txt[] -contains text string descriptions of various Kerberos error codes returned -by some of the routines below. -.PP -.I krb_mk_req -takes a pointer to a text structure in which an authenticator is to be -built. It also takes the name, instance, and realm of the service to be -used and an optional checksum. It is up to the application to decide -how to generate the checksum. -.I krb_mk_req -then retrieves a ticket for the desired service and creates an -authenticator. The authenticator is built in -.I authent -and is accessible -to the calling procedure. -.PP -It is up to the application to get the authenticator to the service -where it will be read by -.I krb_rd_req. -Unless an attacker posesses the session key contained in the ticket, it -will be unable to modify the authenticator. Thus, the checksum can be -used to verify the authenticity of the other data that will pass through -a connection. -.PP -.I krb_rd_req -takes an authenticator of type -.B KTEXT, -a service name, an instance, the address of the -host originating the request, and a pointer to a structure of type -.B AUTH_DAT -which is filled in with information obtained from the authenticator. -It also optionally takes the name of the file in which it will find the -secret key(s) for the service. -If the supplied -.I instance -contains "*", then the first service key with the same service name -found in the service key file will be used, and the -.I instance -argument will be filled in with the chosen instance. This means that -the caller must provide space for such an instance name. -.PP -It is used to find out information about the principal when a request -has been made to a service. It is up to the application protocol to get -the authenticator from the client to the service. The authenticator is -then passed to -.I krb_rd_req -to extract the desired information. -.PP -.I krb_rd_req -returns zero (RD_AP_OK) upon successful authentication. If a packet was -forged, modified, or replayed, authentication will fail. If the -authentication fails, a non-zero value is returned indicating the -particular problem encountered. See -.I krb.h -for the list of error codes. -.PP -If the last argument is the null string (""), krb_rd_req will use the -file /etc/kerberosIV/srvtab to find its keys. If the last argument is -NULL, it will assume that the key has been set by -.I krb_set_key -and will not bother looking further. -.PP -.I krb_kntoln -converts a Kerberos name to a local name. It takes a structure -of type AUTH_DAT and uses the name and instance to look in the database -/etc/kerberosIV/aname to find the corresponding local name. The local name is -returned and can be used by an application to change uids, directories, -or other parameters. It is not an integral part of Kerberos, but is -instead provided to support the use of Kerberos in existing utilities. -.PP -.I krb_set_key -takes as an argument a des key. It then creates -a key schedule from it and saves the original key to be used as an -initialization vector. -It is used to set the server's key which -must be used to decrypt tickets. -.PP -If called with a non-zero second argument, -.I krb_set_key -will first convert the input from a string of arbitrary length to a DES -key by encrypting it with a one-way function. -.PP -In most cases it should not be necessary to call -.I krb_set_key. -The necessary keys will usually be obtained and set inside -.I krb_rd_req. krb_set_key -is provided for those applications that do not wish to place the -application keys on disk. -.PP -.I krb_get_cred -searches the caller's ticket file for a ticket for the given service, instance, -and realm; and, if a ticket is found, fills in the given CREDENTIALS structure -with the ticket information. -.PP -If the ticket was found, -.I krb_get_cred -returns GC_OK. -If the ticket file can't be found, can't be read, doesn't belong to -the user (other than root), isn't a regular file, or is in the wrong -mode, the error GC_TKFIL is returned. -.PP -.I krb_mk_priv -creates an encrypted, authenticated -message from any arbitrary application data, pointed to by -.I in -and -.I in_length -bytes long. -The private session key, pointed to by -.I key -and the key schedule, -.I schedule, -are used to encrypt the data and some header information using -.I pcbc_encrypt. -.I sender -and -.I receiver -point to the Internet address of the two parties. -In addition to providing privacy, this protocol message protects -against modifications, insertions or replays. The encapsulated message and -header are placed in the area pointed to by -.I out -and the routine returns the length of the output, or -1 indicating -an error. -.PP -.I krb_rd_priv -decrypts and authenticates a received -.I krb_mk_priv -message. -.I in -points to the beginning of the received message, whose length -is specified in -.I in_length. -The private session key, pointed to by -.I key, -and the key schedule, -.I schedule, -are used to decrypt and verify the received message. -.I msg_data -is a pointer to a -.I MSG_DAT -struct, defined in -.I krb.h. -The routine fills in the -.I app_data -field with a pointer to the decrypted application data, -.I app_length -with the length of the -.I app_data -field, -.I time_sec -and -.I time_5ms -with the timestamps in the message, and -.I swap -with a 1 if the byte order of the receiver is different than that of -the sender. (The application must still determine if it is appropriate -to byte-swap application data; the Kerberos protocol fields are already taken -care of). The -.I hash -field returns a value useful as input to the -.I krb_ck_repl -routine. - -The routine returns zero if ok, or a Kerberos error code. Modified messages -and old messages cause errors, but it is up to the caller to -check the time sequence of messages, and to check against recently replayed -messages using -.I krb_ck_repl -if so desired. -.PP -.I krb_mk_safe -creates an authenticated, but unencrypted message from any arbitrary -application data, -pointed to by -.I in -and -.I in_length -bytes long. -The private session key, pointed to by -.I key, -is used to seed the -.I quad_cksum() -checksum algorithm used as part of the authentication. -.I sender -and -.I receiver -point to the Internet address of the two parties. -This message does not provide privacy, but does protect (via detection) -against modifications, insertions or replays. The encapsulated message and -header are placed in the area pointed to by -.I out -and the routine returns the length of the output, or -1 indicating -an error. -The authentication provided by this routine is not as strong as that -provided by -.I krb_mk_priv -or by computing the checksum using -.I cbc_cksum -instead, both of which authenticate via DES. -.PP - -.I krb_rd_safe -authenticates a received -.I krb_mk_safe -message. -.I in -points to the beginning of the received message, whose length -is specified in -.I in_length. -The private session key, pointed to by -.I key, -is used to seed the quad_cksum() routine as part of the authentication. -.I msg_data -is a pointer to a -.I MSG_DAT -struct, defined in -.I krb.h . -The routine fills in these -.I MSG_DAT -fields: -the -.I app_data -field with a pointer to the application data, -.I app_length -with the length of the -.I app_data -field, -.I time_sec -and -.I time_5ms -with the timestamps in the message, and -.I swap -with a 1 if the byte order of the receiver is different than that of -the sender. -(The application must still determine if it is appropriate -to byte-swap application data; the Kerberos protocol fields are already taken -care of). The -.I hash -field returns a value useful as input to the -.I krb_ck_repl -routine. - -The routine returns zero if ok, or a Kerberos error code. Modified messages -and old messages cause errors, but it is up to the caller to -check the time sequence of messages, and to check against recently replayed -messages using -.I krb_ck_repl -if so desired. -.PP -.I krb_mk_err -constructs an application level error message that may be used along -with -.I krb_mk_priv -or -.I krb_mk_safe. -.I out -is a pointer to the output buffer, -.I code -is an application specific error code, and -.I string -is an application specific error string. - -.PP -.I krb_rd_err -unpacks a received -.I krb_mk_err -message. -.I in -points to the beginning of the received message, whose length -is specified in -.I in_length. -.I code -is a pointer to a value to be filled in with the error -value provided by the application. -.I msg_data -is a pointer to a -.I MSG_DAT -struct, defined in -.I krb.h . -The routine fills in these -.I MSG_DAT -fields: the -.I app_data -field with a pointer to the application error text, -.I app_length -with the length of the -.I app_data -field, and -.I swap -with a 1 if the byte order of the receiver is different than that of -the sender. (The application must still determine if it is appropriate -to byte-swap application data; the Kerberos protocol fields are already taken -care of). - -The routine returns zero if the error message has been successfully received, -or a Kerberos error code. -.PP -.I krb_get_local_addr -retrieves the address of the local interface used for -all kerberos transactions and copies it to the sockaddr_in pointed to -by -.I address. -This information is usually used to bind additional sockets in client -programs to the kerberos authenticated local address so transactions -to kerberos services on remote machines succeed. This routine may be called -at any time and the address returned will not change during the lifetime of -the program. - -The routine returns zero on success or a Kerberos error code. -.PP -.I krb_bind_local_addr -binds -.I socket -to the address of the local interface used for all kerberos -transactions. The bind allows the system to assign a port for the socket, -so programs wishing to specify an explicit port should use -.I krb_get_local_addr -and perform the bind manually. - -The routine returns zero on success or a Kerberos error code. -.PP -The -.I KTEXT -structure is used to pass around text of varying lengths. It consists -of a buffer for the data, and a length. krb_rd_req takes an argument of this -type containing the authenticator, and krb_mk_req returns the -authenticator in a structure of this type. KTEXT itself is really a -pointer to the structure. The actual structure is of type KTEXT_ST. -.PP -The -.I AUTH_DAT -structure is filled in by krb_rd_req. It must be allocated before -calling krb_rd_req, and a pointer to it is passed. The structure is -filled in with data obtained from Kerberos. -.I MSG_DAT -structure is filled in by either krb_rd_priv, krb_rd_safe, or -krb_rd_err. It must be allocated before the call and a pointer to it -is passed. The structure is -filled in with data obtained from Kerberos. -.PP -.SH FILES -/usr/include/kerberosIV/krb.h -.br -/usr/lib/libkrb.a -.br -/usr/include/des.h -.br -/usr/lib/libdes.a -.br -/etc/kerberosIV/aname -.br -/etc/kerberosIV/srvtab -.br -/tmp/tkt[uid] -.SH "SEE ALSO" -kerberos(1), des_crypt(3) -.SH DIAGNOSTICS -.SH BUGS -The caller of -.I krb_rd_req, krb_rd_priv, and krb_rd_safe -must check time order and for replay attempts. -.I krb_ck_repl -is not implemented yet. -.SH AUTHORS -Clifford Neuman, MIT Project Athena -.br -Steve Miller, MIT Project Athena/Digital Equipment Corporation -.SH RESTRICTIONS -COPYRIGHT 1985,1986,1989 Massachusetts Institute of Technology diff --git a/eBones/lib/libkrb/krb_err.et b/eBones/lib/libkrb/krb_err.et deleted file mode 100644 index 8fedf9fe9491f..0000000000000 --- a/eBones/lib/libkrb/krb_err.et +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1987,1988 Massachusetts Institute of Technology -# For copying and distribution information, see the file -# "Copyright.MIT". -# -# from: krb_err.et,v 4.1 89/09/26 09:24:20 jtkohl Exp $ -# $Id$ -# - error_table krb - - ec KRBET_KSUCCESS, - "Kerberos successful" - - ec KRBET_KDC_NAME_EXP, - "Kerberos principal expired" - - ec KRBET_KDC_SERVICE_EXP, - "Kerberos service expired" - - ec KRBET_KDC_AUTH_EXP, - "Kerberos auth expired" - - ec KRBET_KDC_PKT_VER, - "Incorrect kerberos master key version" - - ec KRBET_KDC_P_MKEY_VER, - "Incorrect kerberos master key version" - - ec KRBET_KDC_S_MKEY_VER, - "Incorrect kerberos master key version" - - ec KRBET_KDC_BYTE_ORDER, - "Kerberos error: byte order unknown" - - ec KRBET_KDC_PR_UNKNOWN, - "Kerberos principal unknown" - - ec KRBET_KDC_PR_N_UNIQUE, - "Kerberos principal not unique" - - ec KRBET_KDC_NULL_KEY, - "Kerberos principal has null key" - - ec KRBET_KRB_RES11, - "Reserved 11" - - ec KRBET_KRB_RES12, - "Reserved 12" - - ec KRBET_KRB_RES13, - "Reserved 13" - - ec KRBET_KRB_RES14, - "Reserved 14" - - ec KRBET_KRB_RES15, - "Reserved 15" - - ec KRBET_KRB_RES16, - "Reserved 16" - - ec KRBET_KRB_RES17, - "Reserved 17" - - ec KRBET_KRB_RES18, - "Reserved 18" - - ec KRBET_KRB_RES19, - "Reserved 19" - - ec KRBET_KDC_GEN_ERR, - "Generic error from Kerberos KDC" - - ec KRBET_GC_TKFIL, - "Can't read Kerberos ticket file" - - ec KRBET_GC_NOTKT, - "Can't find Kerberos ticket or TGT" - - ec KRBET_KRB_RES23, - "Reserved 23" - - ec KRBET_KRB_RES24, - "Reserved 24" - - ec KRBET_KRB_RES25, - "Reserved 25" - - ec KRBET_MK_AP_TGTEXP, - "Kerberos TGT Expired" - - ec KRBET_KRB_RES27, - "Reserved 27" - - ec KRBET_KRB_RES28, - "Reserved 28" - - ec KRBET_KRB_RES29, - "Reserved 29" - - ec KRBET_KRB_RES30, - "Reserved 30" - - ec KRBET_RD_AP_UNDEC, - "Kerberos error: Can't decode authenticator" - - ec KRBET_RD_AP_EXP, - "Kerberos ticket expired" - - ec KRBET_RD_AP_NYV, - "Kerberos ticket not yet valid" - - ec KRBET_RD_AP_REPEAT, - "Kerberos error: Repeated request" - - ec KRBET_RD_AP_NOT_US, - "The kerberos ticket isn't for us" - - ec KRBET_RD_AP_INCON, - "Kerberos request inconsistent" - - ec KRBET_RD_AP_TIME, - "Kerberos error: delta_t too big" - - ec KRBET_RD_AP_BADD, - "Kerberos error: incorrect net address" - - ec KRBET_RD_AP_VERSION, - "Kerberos protocol version mismatch" - - ec KRBET_RD_AP_MSG_TYPE, - "Kerberos error: invalid msg type" - - ec KRBET_RD_AP_MODIFIED, - "Kerberos error: message stream modified" - - ec KRBET_RD_AP_ORDER, - "Kerberos error: message out of order" - - ec KRBET_RD_AP_UNAUTHOR, - "Kerberos error: unauthorized request" - - ec KRBET_KRB_RES44, - "Reserved 44" - - ec KRBET_KRB_RES45, - "Reserved 45" - - ec KRBET_KRB_RES46, - "Reserved 46" - - ec KRBET_KRB_RES47, - "Reserved 47" - - ec KRBET_KRB_RES48, - "Reserved 48" - - ec KRBET_KRB_RES49, - "Reserved 49" - - ec KRBET_KRB_RES50, - "Reserved 50" - - ec KRBET_GT_PW_NULL, - "Kerberos error: current PW is null" - - ec KRBET_GT_PW_BADPW, - "Kerberos error: Incorrect current password" - - ec KRBET_GT_PW_PROT, - "Kerberos protocol error" - - ec KRBET_GT_PW_KDCERR, - "Error returned by Kerberos KDC" - - ec KRBET_GT_PW_NULLTKT, - "Null Kerberos ticket returned by KDC" - - ec KRBET_SKDC_RETRY, - "Kerberos error: Retry count exceeded" - - ec KRBET_SKDC_CANT, - "Kerberos error: Can't send request" - - ec KRBET_KRB_RES58, - "Reserved 58" - - ec KRBET_KRB_RES59, - "Reserved 59" - - ec KRBET_KRB_RES60, - "Reserved 60" - - ec KRBET_INTK_W_NOTALL, - "Kerberos error: not all tickets returned" - - ec KRBET_INTK_BADPW, - "Kerberos error: incorrect password" - - ec KRBET_INTK_PROT, - "Kerberos error: Protocol Error" - - ec KRBET_KRB_RES64, - "Reserved 64" - - ec KRBET_KRB_RES65, - "Reserved 65" - - ec KRBET_KRB_RES66, - "Reserved 66" - - ec KRBET_KRB_RES67, - "Reserved 67" - - ec KRBET_KRB_RES68, - "Reserved 68" - - ec KRBET_KRB_RES69, - "Reserved 69" - - ec KRBET_INTK_ERR, - "Other error" - - ec KRBET_AD_NOTGT, - "Don't have Kerberos ticket-granting ticket" - - ec KRBET_KRB_RES72, - "Reserved 72" - - ec KRBET_KRB_RES73, - "Reserved 73" - - ec KRBET_KRB_RES74, - "Reserved 74" - - ec KRBET_KRB_RES75, - "Reserved 75" - - ec KRBET_NO_TKT_FIL, - "No ticket file found" - - ec KRBET_TKT_FIL_ACC, - "Couldn't access ticket file" - - ec KRBET_TKT_FIL_LCK, - "Couldn't lock ticket file" - - ec KRBET_TKT_FIL_FMT, - "Bad ticket file format" - - ec KRBET_TKT_FIL_INI, - "tf_init not called first" - - ec KRBET_KNAME_FMT, - "Bad Kerberos name format" - - ec KRBET_GT_LADDR_NOSOCK, - "Can't open socket" - - ec KRBET_GT_LADDR_IFLIST, - "Can't retrieve local interface list" - - ec KRBET_GT_LADDR_NVI, - "No valid local interface found" - - ec KRBET_BND_LADDR_BIND, - "Can't bind local address" - - end - diff --git a/eBones/lib/libkrb/krb_err_txt.c b/eBones/lib/libkrb/krb_err_txt.c deleted file mode 100644 index ebe6fa4ba6ae2..0000000000000 --- a/eBones/lib/libkrb/krb_err_txt.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: krb_err_txt.c,v 4.7 88/12/01 14:10:14 jtkohl Exp $ - * $Id$ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id$"; -#endif lint -#endif - -/* - * This file contains an array of error text strings. - * The associated error codes (which are defined in "krb.h") - * follow the string in the comments at the end of each line. - */ - -char *krb_err_txt[256] = { - "OK", /* 000 */ - "Principal expired (kerberos)", /* 001 */ - "Service expired (kerberos)", /* 002 */ - "Authentication expired (kerberos)", /* 003 */ - "Unknown protocol version number (kerberos)", /* 004 */ - "Principal: Incorrect master key version (kerberos)", /* 005 */ - "Service: Incorrect master key version (kerberos)", /* 006 */ - "Bad byte order (kerberos)", /* 007 */ - "Principal unknown (kerberos)", /* 008 */ - "Principal not unique (kerberos)", /* 009 */ - "Principal has null key (kerberos)", /* 010 */ - "Reserved error message 11 (kerberos)", /* 011 */ - "Reserved error message 12 (kerberos)", /* 012 */ - "Reserved error message 13 (kerberos)", /* 013 */ - "Reserved error message 14 (kerberos)", /* 014 */ - "Reserved error message 15 (kerberos)", /* 015 */ - "Reserved error message 16 (kerberos)", /* 016 */ - "Reserved error message 17 (kerberos)", /* 017 */ - "Reserved error message 18 (kerberos)", /* 018 */ - "Reserved error message 19 (kerberos)", /* 019 */ - "Permission Denied (kerberos)", /* 020 */ - "Can't read ticket file (krb_get_cred)", /* 021 */ - "Can't find ticket (krb_get_cred)", /* 022 */ - "Reserved error message 23 (krb_get_cred)", /* 023 */ - "Reserved error message 24 (krb_get_cred)", /* 024 */ - "Reserved error message 25 (krb_get_cred)", /* 025 */ - "Ticket granting ticket expired (krb_mk_req)", /* 026 */ - "Reserved error message 27 (krb_mk_req)", /* 027 */ - "Reserved error message 28 (krb_mk_req)", /* 028 */ - "Reserved error message 29 (krb_mk_req)", /* 029 */ - "Reserved error message 30 (krb_mk_req)", /* 030 */ - "Can't decode authenticator (krb_rd_req)", /* 031 */ - "Ticket expired (krb_rd_req)", /* 032 */ - "Ticket issue date too far in the future (krb_rd_req)",/* 033 */ - "Repeat request (krb_rd_req)", /* 034 */ - "Ticket for wrong server (krb_rd_req)", /* 035 */ - "Request inconsistent (krb_rd_req)", /* 036 */ - "Time is out of bounds (krb_rd_req)", /* 037 */ - "Incorrect network address (krb_rd_req)", /* 038 */ - "Protocol version mismatch (krb_rd_req)", /* 039 */ - "Illegal message type (krb_rd_req)", /* 040 */ - "Message integrity error (krb_rd_req)", /* 041 */ - "Message duplicate or out of order (krb_rd_req)", /* 042 */ - "Unauthorized request (krb_rd_req)", /* 043 */ - "Reserved error message 44 (krb_rd_req)", /* 044 */ - "Reserved error message 45 (krb_rd_req)", /* 045 */ - "Reserved error message 46 (krb_rd_req)", /* 046 */ - "Reserved error message 47 (krb_rd_req)", /* 047 */ - "Reserved error message 48 (krb_rd_req)", /* 048 */ - "Reserved error message 49 (krb_rd_req)", /* 049 */ - "Reserved error message 50 (krb_rd_req)", /* 050 */ - "Current password is NULL (get_pw_tkt)", /* 051 */ - "Current password incorrect (get_pw_tkt)", /* 052 */ - "Protocol error (gt_pw_tkt)", /* 053 */ - "Error returned by KDC (gt_pw_tkt)", /* 054 */ - "Null ticket returned by KDC (gt_pw_tkt)", /* 055 */ - "Retry count exceeded (send_to_kdc)", /* 056 */ - "Can't send request (send_to_kdc)", /* 057 */ - "Reserved error message 58 (send_to_kdc)", /* 058 */ - "Reserved error message 59 (send_to_kdc)", /* 059 */ - "Reserved error message 60 (send_to_kdc)", /* 060 */ - "Warning: Not ALL tickets returned", /* 061 */ - "Password incorrect", /* 062 */ - "Protocol error (get_intkt)", /* 063 */ - "Reserved error message 64 (get_in_tkt)", /* 064 */ - "Reserved error message 65 (get_in_tkt)", /* 065 */ - "Reserved error message 66 (get_in_tkt)", /* 066 */ - "Reserved error message 67 (get_in_tkt)", /* 067 */ - "Reserved error message 68 (get_in_tkt)", /* 068 */ - "Reserved error message 69 (get_in_tkt)", /* 069 */ - "Generic error (get_intkt)", /* 070 */ - "Don't have ticket granting ticket (get_ad_tkt)", /* 071 */ - "Reserved error message 72 (get_ad_tkt)", /* 072 */ - "Reserved error message 73 (get_ad_tkt)", /* 073 */ - "Reserved error message 74 (get_ad_tkt)", /* 074 */ - "Reserved error message 75 (get_ad_tkt)", /* 075 */ - "No ticket file (tf_util)", /* 076 */ - "Can't access ticket file (tf_util)", /* 077 */ - "Can't lock ticket file; try later (tf_util)", /* 078 */ - "Bad ticket file format (tf_util)", /* 079 */ - "Read ticket file before tf_init (tf_util)", /* 080 */ - "Bad Kerberos name format (kname_parse)", /* 081 */ - "Can't open socket", /* 082 */ - "Can't retrieve local interface list", /* 083 */ - "No valid local interface found", /* 084 */ - "Can't bind local address", /* 085 */ - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "Generic kerberos error (kfailure)", /* 255 */ -}; diff --git a/eBones/lib/libkrb/krb_get_in_tkt.c b/eBones/lib/libkrb/krb_get_in_tkt.c deleted file mode 100644 index b6ff308a77c01..0000000000000 --- a/eBones/lib/libkrb/krb_get_in_tkt.c +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: der: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp $ - * $Id: krb_get_in_tkt.c,v 1.3 1995/07/18 16:39:04 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: krb_get_in_tkt.c,v 1.3 1995/07/18 16:39:04 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include - -#include -#include -#include - -/* use the bsd time.h struct defs for PC too! */ -#include -#include - -int swap_bytes; - -/* - * decrypt_tkt(): Given user, instance, realm, passwd, key_proc - * and the cipher text sent from the KDC, decrypt the cipher text - * using the key returned by key_proc. - */ - -static int -decrypt_tkt(user, instance, realm, arg, key_proc, cipp) - char *user; - char *instance; - char *realm; - char *arg; - int (*key_proc)(); - KTEXT *cipp; -{ - KTEXT cip = *cipp; - C_Block key; /* Key for decrypting cipher */ - Key_schedule key_s; - -#ifndef NOENCRYPTION - /* Attempt to decrypt it */ -#endif - - /* generate a key */ - - { - register int rc; - rc = (*key_proc)(user,instance,realm,arg,key); - if (rc) - return(rc); - } - -#ifndef NOENCRYPTION - key_sched(&key,key_s); - pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat, - (long) cip->length,key_s,(C_Block *)key,DES_DECRYPT); -#endif /* !NOENCRYPTION */ - /* Get rid of all traces of key */ - bzero((char *)key,sizeof(key)); - bzero((char *)key_s,sizeof(key_s)); - - return(0); -} - -/* - * krb_get_in_tkt() gets a ticket for a given principal to use a given - * service and stores the returned ticket and session key for future - * use. - * - * The "user", "instance", and "realm" arguments give the identity of - * the client who will use the ticket. The "service" and "sinstance" - * arguments give the identity of the server that the client wishes - * to use. (The realm of the server is the same as the Kerberos server - * to whom the request is sent.) The "life" argument indicates the - * desired lifetime of the ticket; the "key_proc" argument is a pointer - * to the routine used for getting the client's private key to decrypt - * the reply from Kerberos. The "decrypt_proc" argument is a pointer - * to the routine used to decrypt the reply from Kerberos; and "arg" - * is an argument to be passed on to the "key_proc" routine. - * - * If all goes well, krb_get_in_tkt() returns INTK_OK, otherwise it - * returns an error code: If an AUTH_MSG_ERR_REPLY packet is returned - * by Kerberos, then the error code it contains is returned. Other - * error codes returned by this routine include INTK_PROT to indicate - * wrong protocol version, INTK_BADPW to indicate bad password (if - * decrypted ticket didn't make sense), INTK_ERR if the ticket was for - * the wrong server or the ticket store couldn't be initialized. - * - * The format of the message sent to Kerberos is as follows: - * - * Size Variable Field - * ---- -------- ----- - * - * 1 byte KRB_PROT_VERSION protocol version number - * 1 byte AUTH_MSG_KDC_REQUEST | message type - * HOST_BYTE_ORDER local byte order in lsb - * string user client's name - * string instance client's instance - * string realm client's realm - * 4 bytes tlocal.tv_sec timestamp in seconds - * 1 byte life desired lifetime - * string service service's name - * string sinstance service's instance - */ - -int -krb_get_in_tkt(user, instance, realm, service, sinstance, life, - key_proc, decrypt_proc, arg) - char *user; - char *instance; - char *realm; - char *service; - char *sinstance; - int life; - int (*key_proc)(); - int (*decrypt_proc)(); - char *arg; -{ - KTEXT_ST pkt_st; - KTEXT pkt = &pkt_st; /* Packet to KDC */ - KTEXT_ST rpkt_st; - KTEXT rpkt = &rpkt_st; /* Returned packet */ - KTEXT_ST cip_st; - KTEXT cip = &cip_st; /* Returned Ciphertext */ - KTEXT_ST tkt_st; - KTEXT tkt = &tkt_st; /* Current ticket */ - C_Block ses; /* Session key for tkt */ - int kvno; /* Kvno for session key */ - unsigned char *v = pkt->dat; /* Prot vers no */ - unsigned char *t = (pkt->dat+1); /* Prot msg type */ - - char s_name[SNAME_SZ]; - char s_instance[INST_SZ]; - char rlm[REALM_SZ]; - int lifetime; - int msg_byte_order; - int kerror; - unsigned long exp_date; - char *ptr; - - struct timeval t_local; - - unsigned long rep_err_code; - - unsigned long kdc_time; /* KDC time */ - - /* BUILD REQUEST PACKET */ - - /* Set up the fixed part of the packet */ - *v = (unsigned char) KRB_PROT_VERSION; - *t = (unsigned char) AUTH_MSG_KDC_REQUEST; - *t |= HOST_BYTE_ORDER; - - /* Now for the variable info */ - (void) strcpy((char *)(pkt->dat+2),user); /* aname */ - pkt->length = 3 + strlen(user); - (void) strcpy((char *)(pkt->dat+pkt->length), - instance); /* instance */ - pkt->length += 1 + strlen(instance); - (void) strcpy((char *)(pkt->dat+pkt->length),realm); /* realm */ - pkt->length += 1 + strlen(realm); - - (void) gettimeofday(&t_local,(struct timezone *) 0); - /* timestamp */ - bcopy((char *)&(t_local.tv_sec),(char *)(pkt->dat+pkt->length), 4); - pkt->length += 4; - - *(pkt->dat+(pkt->length)++) = (char) life; - (void) strcpy((char *)(pkt->dat+pkt->length),service); - pkt->length += 1 + strlen(service); - (void) strcpy((char *)(pkt->dat+pkt->length),sinstance); - pkt->length += 1 + strlen(sinstance); - - rpkt->length = 0; - - /* SEND THE REQUEST AND RECEIVE THE RETURN PACKET */ - - if ((kerror = send_to_kdc(pkt, rpkt, realm))) return(kerror); - - /* check packet version of the returned packet */ - if (pkt_version(rpkt) != KRB_PROT_VERSION) - return(INTK_PROT); - - /* Check byte order */ - msg_byte_order = pkt_msg_type(rpkt) & 1; - swap_bytes = 0; - if (msg_byte_order != HOST_BYTE_ORDER) { - swap_bytes++; - } - - switch (pkt_msg_type(rpkt) & ~1) { - case AUTH_MSG_KDC_REPLY: - break; - case AUTH_MSG_ERR_REPLY: - bcopy(pkt_err_code(rpkt),(char *) &rep_err_code,4); - if (swap_bytes) swap_u_long(rep_err_code); - return((int)rep_err_code); - default: - return(INTK_PROT); - } - - /* EXTRACT INFORMATION FROM RETURN PACKET */ - - /* get the principal's expiration date */ - bcopy(pkt_x_date(rpkt),(char *) &exp_date,sizeof(exp_date)); - if (swap_bytes) swap_u_long(exp_date); - - /* Extract the ciphertext */ - cip->length = pkt_clen(rpkt); /* let clen do the swap */ - - if ((cip->length < 0) || (cip->length > sizeof(cip->dat))) - return(INTK_ERR); /* no appropriate error code - currently defined for INTK_ */ - /* copy information from return packet into "cip" */ - bcopy((char *) pkt_cipher(rpkt),(char *)(cip->dat),cip->length); - - /* Attempt to decrypt the reply. */ - if (decrypt_proc == NULL) - decrypt_proc = decrypt_tkt; - (*decrypt_proc)(user, instance, realm, arg, key_proc, &cip); - - ptr = (char *) cip->dat; - - /* extract session key */ - bcopy(ptr,(char *)ses,8); - ptr += 8; - - if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length) - return(INTK_BADPW); - - /* extract server's name */ - (void) strcpy(s_name,ptr); - ptr += strlen(s_name) + 1; - - if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length) - return(INTK_BADPW); - - /* extract server's instance */ - (void) strcpy(s_instance,ptr); - ptr += strlen(s_instance) + 1; - - if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length) - return(INTK_BADPW); - - /* extract server's realm */ - (void) strcpy(rlm,ptr); - ptr += strlen(rlm) + 1; - - /* extract ticket lifetime, server key version, ticket length */ - /* be sure to avoid sign extension on lifetime! */ - lifetime = (unsigned char) ptr[0]; - kvno = (unsigned char) ptr[1]; - tkt->length = (unsigned char) ptr[2]; - ptr += 3; - - if ((tkt->length < 0) || - ((tkt->length + (ptr - (char *) cip->dat)) > cip->length)) - return(INTK_BADPW); - - /* extract ticket itself */ - bcopy(ptr,(char *)(tkt->dat),tkt->length); - ptr += tkt->length; - - if (strcmp(s_name, service) || strcmp(s_instance, sinstance) || - strcmp(rlm, realm)) /* not what we asked for */ - return(INTK_ERR); /* we need a better code here XXX */ - - /* check KDC time stamp */ - bcopy(ptr,(char *)&kdc_time,4); /* Time (coarse) */ - if (swap_bytes) swap_u_long(kdc_time); - - ptr += 4; - - (void) gettimeofday(&t_local,(struct timezone *) 0); - if (abs((int)(t_local.tv_sec - kdc_time)) > CLOCK_SKEW) { - return(RD_AP_TIME); /* XXX should probably be better - code */ - } - - /* initialize ticket cache */ - if (in_tkt(user,instance) != KSUCCESS) - return(INTK_ERR); - - /* stash ticket, session key, etc. for future use */ - if ((kerror = save_credentials(s_name, s_instance, rlm, ses, - lifetime, kvno, tkt, t_local.tv_sec))) - return(kerror); - - return(INTK_OK); -} diff --git a/eBones/lib/libkrb/krb_realmofhost.3 b/eBones/lib/libkrb/krb_realmofhost.3 deleted file mode 100644 index c3b14cc457882..0000000000000 --- a/eBones/lib/libkrb/krb_realmofhost.3 +++ /dev/null @@ -1,161 +0,0 @@ -.\" from: krb_realmofhost.3,v 4.1 89/01/23 11:10:47 jtkohl Exp $ -.\" $Id: krb_realmofhost.3,v 1.3 1995/07/18 16:41:02 mark Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KRB_REALMOFHOST 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -krb_realmofhost, krb_get_phost, krb_get_krbhst, krb_get_admhst, -krb_get_lrealm \- additional Kerberos utility routines -.SH SYNOPSIS -.nf -.nj -.ft B -#include -#include -#include -.PP -.ft B -char *krb_realmofhost(host) -char *host; -.PP -.ft B -char *krb_get_phost(alias) -char *alias; -.PP -.ft B -krb_get_krbhst(host,realm,n) -char *host; -char *realm; -int n; -.PP -.ft B -krb_get_admhst(host,realm,n) -char *host; -char *realm; -int n; -.PP -.ft B -krb_get_lrealm(realm,n) -char *realm; -int n; -.fi -.ft R -.SH DESCRIPTION -.I krb_realmofhost -returns the Kerberos realm of the host -.IR host , -as determined by the translation table -.IR /etc/kerberosIV/krb.realms . -.I host -should be the fully-qualified domain-style primary host name of the host -in question. In order to prevent certain security attacks, this routine -must either have -.I a priori -knowledge of a host's realm, or obtain such information securely. -.PP -The format of the translation file is described by -.IR krb.realms (5). -If -.I host -exactly matches a host_name line, the corresponding realm -is returned. -Otherwise, if the domain portion of -.I host -matches a domain_name line, the corresponding realm -is returned. -If -.I host -contains a domain, but no translation is found, -.IR host 's -domain is converted to upper-case and returned. -If -.I host -contains no discernable domain, or an error occurs, -the local realm name, as supplied by -.IR krb_get_lrealm (3), -is returned. -.PP -.I krb_get_phost -converts the hostname -.I alias -(which can be either an official name or an alias) into the instance -name to be used in obtaining Kerberos tickets for most services, -including the Berkeley rcmd suite (rlogin, rcp, rsh). -.br -The current convention is to return the first segment of the official -domain-style name after conversion to lower case. -.PP -.I krb_get_krbhst -fills in -.I host -with the hostname of the -.IR n th -host running a Kerberos key distribution center (KDC) -for realm -.IR realm , -as specified in the configuration file (\fI/etc/kerberosIV/krb.conf\fR). -The configuration file is described by -.IR krb.conf (5). -If the host is successfully filled in, the routine -returns KSUCCESS. -If the file cannot be opened, and -.I n -equals 1, then the value of KRB_HOST as defined in -.I -is filled in, and KSUCCESS is returned. If there are fewer than -.I n -hosts running a Kerberos KDC for the requested realm, or the -configuration file is malformed, the routine -returns KFAILURE. -.PP -.I krb_get_admhst -fills in -.I host -with the hostname of the -.IR n th -host running a Kerberos KDC database administration server -for realm -.IR realm , -as specified in the configuration file (\fI/etc/kerberosIV/krb.conf\fR). -If the file cannot be opened or is malformed, or there are fewer than -.I n -hosts running a Kerberos KDC database administration server, -the routine returns KFAILURE. -.PP -The character arrays used as return values for -.IR krb_get_krbhst , -.IR krb_get_admhst , -should be large enough to -hold any hostname (MAXHOSTNAMELEN from ). -.PP -.I krb_get_lrealm -fills in -.I realm -with the -.IR n th -realm of the local host, as specified in the configuration file. -.I realm -should be at least REALM_SZ (from -.IR ) characters long. -.PP -.SH SEE ALSO -kerberos(3), krb.conf(5), krb.realms(5) -.SH FILES -.TP 20n -/etc/kerberosIV/krb.realms -translation file for host-to-realm mapping. -.TP -/etc/kerberosIV/krb.conf -local realm-name and realm/server configuration file. -.SH BUGS -The current convention for instance names is too limited; the full -domain name should be used. -.PP -.I krb_get_lrealm -currently only supports -.I n -= 1. It should really consult the user's ticket cache to determine the -user's current realm, rather than consulting a file on the host. diff --git a/eBones/lib/libkrb/krb_sendauth.3 b/eBones/lib/libkrb/krb_sendauth.3 deleted file mode 100644 index d014d2c3e4cab..0000000000000 --- a/eBones/lib/libkrb/krb_sendauth.3 +++ /dev/null @@ -1,356 +0,0 @@ -.\" from: krb_sendauth.3,v 4.1 89/01/23 11:10:58 jtkohl Exp $ -.\" $Id$ -.\" Copyright 1988 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KRB_SENDAUTH 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -krb_sendauth, krb_recvauth, krb_net_write, krb_net_read \- -Kerberos routines for sending authentication via network stream sockets -.SH SYNOPSIS -.nf -.nj -.ft B -#include -#include -#include -.PP -.fi -.HP 1i -.ft B -int krb_sendauth(options, fd, ktext, service, inst, realm, checksum, -msg_data, cred, schedule, laddr, faddr, version) -.nf -.RS 0 -.ft B -long options; -int fd; -KTEXT ktext; -char *service, *inst, *realm; -u_long checksum; -MSG_DAT *msg_data; -CREDENTIALS *cred; -Key_schedule schedule; -struct sockaddr_in *laddr, *faddr; -char *version; -.PP -.fi -.HP 1i -.ft B -int krb_recvauth(options, fd, ktext, service, inst, faddr, laddr, -auth_data, filename, schedule, version) -.nf -.RS 0 -.ft B -long options; -int fd; -KTEXT ktext; -char *service, *inst; -struct sockaddr_in *faddr, *laddr; -AUTH_DAT *auth_data; -char *filename; -Key_schedule schedule; -char *version; -.PP -.ft B -int krb_net_write(fd, buf, len) -int fd; -char *buf; -int len; -.PP -.ft B -int krb_net_read(fd, buf, len) -int fd; -char *buf; -int len; -.fi -.SH DESCRIPTION -.PP -These functions, -which are built on top of the core Kerberos library, -provide a convenient means for client and server -programs to send authentication messages -to one another through network connections. -The -.I krb_sendauth -function sends an authenticated ticket from the client program to -the server program by writing the ticket to a network socket. -The -.I krb_recvauth -function receives the ticket from the client by -reading from a network socket. - -To ensure proper behavior on multi-homed systems (machines with more -than one network interface) all sockets used with these routines should -be bound to the same address as that used by the Kerberos library via -.I krb_get_local_addr -or -.I krb_bind_local_addr. - -.SH KRB_SENDAUTH -.PP -This function writes the ticket to -the network socket specified by the -file descriptor -.IR fd, -returning KSUCCESS if the write proceeds successfully, -and an error code if it does not. - -The -.I ktext -argument should point to an allocated KTEXT_ST structure. -The -.IR service, -.IR inst, -and -.IR realm -arguments specify the server program's Kerberos principal name, -instance, and realm. -If you are writing a client that uses the local realm exclusively, -you can set the -.I realm -argument to NULL. - -The -.I version -argument allows the client program to pass an application-specific -version string that the server program can then match against -its own version string. -The -.I version -string can be up to KSEND_VNO_LEN (see -.IR ) -characters in length. - -The -.I checksum -argument can be used to pass checksum information to the -server program. -The client program is responsible for specifying this information. -This checksum information is difficult to corrupt because -.I krb_sendauth -passes it over the network in encrypted form. -The -.I checksum -argument is passed as the checksum argument to -.IR krb_mk_req . - -You can set -.IR krb_sendauth's -other arguments to NULL unless you want the -client and server programs to mutually authenticate -themselves. -In the case of mutual authentication, -the client authenticates itself to the server program, -and demands that the server in turn authenticate itself to -the client. - -.SH KRB_SENDAUTH AND MUTUAL AUTHENTICATION -.PP -If you want mutual authentication, -make sure that you read all pending data from the local socket -before calling -.IR krb_sendauth. -Set -.IR krb_sendauth's -.I options -argument to -.BR KOPT_DO_MUTUAL -(this macro is defined in the -.IR krb.h -file); -make sure that the -.I laddr -argument points to -the address of the local socket, -and that -.I faddr -points to the foreign socket's network address. - -.I Krb_sendauth -fills in the other arguments-- -.IR msg_data , -.IR cred , -and -.IR schedule --before -sending the ticket to the server program. -You must, however, allocate space for these arguments -before calling the function. - -.I Krb_sendauth -supports two other options: -.BR KOPT_DONT_MK_REQ, -and -.BR KOPT_DONT_CANON. -If called with -.I options -set as KOPT_DONT_MK_REQ, -.I krb_sendauth -will not use the -.I krb_mk_req -function to retrieve the ticket from the Kerberos server. -The -.I ktext -argument must point to an existing ticket and authenticator (such as -would be created by -.IR krb_mk_req ), -and the -.IR service, -.IR inst, -and -.IR realm -arguments can be set to NULL. - -If called with -.I options -set as KOPT_DONT_CANON, -.I krb_sendauth -will not convert the service's instance to canonical form using -.IR krb_get_phost (3). - -If you want to call -.I krb_sendauth -with a multiple -.I options -specification, -construct -.I options -as a bitwise-OR of the options you want to specify. - -.SH KRB_RECVAUTH -.PP -The -.I krb_recvauth -function -reads a ticket/authenticator pair from the socket pointed to by the -.I fd -argument. -Set the -.I options -argument -as a bitwise-OR of the options desired. -Currently only KOPT_DO_MUTUAL is useful to the receiver. - -The -.I ktext -argument -should point to an allocated KTEXT_ST structure. -.I Krb_recvauth -fills -.I ktext -with the -ticket/authenticator pair read from -.IR fd , -then passes it to -.IR krb_rd_req . - -The -.I service -and -.I inst -arguments -specify the expected service and instance for which the ticket was -generated. They are also passed to -.IR krb_rd_req. -The -.I inst -argument may be set to "*" if the caller wishes -.I krb_mk_req -to fill in the instance used (note that there must be space in the -.I inst -argument to hold a full instance name, see -.IR krb_mk_req (3)). - -The -.I faddr -argument -should point to the address of the peer which is presenting the ticket. -It is also passed to -.IR krb_rd_req . - -If the client and server plan to mutually authenticate -one another, -the -.I laddr -argument -should point to the local address of the file descriptor. -Otherwise you can set this argument to NULL. - -The -.I auth_data -argument -should point to an allocated AUTH_DAT area. -It is passed to and filled in by -.IR krb_rd_req . -The checksum passed to the corresponding -.I krb_sendauth -is available as part of the filled-in AUTH_DAT area. - -The -.I filename -argument -specifies the filename -which the service program should use to obtain its service key. -.I Krb_recvauth -passes -.I filename -to the -.I krb_rd_req -function. -If you set this argument to "", -.I krb_rd_req -looks for the service key in the file -.IR /etc/kerberosIV/srvtab. - -If the client and server are performing mutual authenication, -the -.I schedule -argument -should point to an allocated Key_schedule. -Otherwise it is ignored and may be NULL. - -The -.I version -argument should point to a character array of at least KSEND_VNO_LEN -characters. It is filled in with the version string passed by the client to -.IR krb_sendauth. -.PP -.SH KRB_NET_WRITE AND KRB_NET_READ -.PP -The -.I krb_net_write -function -emulates the write(2) system call, but guarantees that all data -specified is written to -.I fd -before returning, unless an error condition occurs. -.PP -The -.I krb_net_read -function -emulates the read(2) system call, but guarantees that the requested -amount of data is read from -.I fd -before returning, unless an error condition occurs. -.PP -.SH BUGS -.IR krb_sendauth, -.IR krb_recvauth, -.IR krb_net_write, -and -.IR krb_net_read -will not work properly on sockets set to non-blocking I/O mode. - -.SH SEE ALSO - -krb_mk_req(3), krb_rd_req(3), krb_get_phost(3), krb_get_local_addr(3), -krb_bind_local_addr(3) - -.SH AUTHOR -John T. Kohl, MIT Project Athena -.SH RESTRICTIONS -Copyright 1988, Massachusetts Instititute of Technology. -For copying and distribution information, -please see the file . diff --git a/eBones/lib/libkrb/krb_set_tkt_string.3 b/eBones/lib/libkrb/krb_set_tkt_string.3 deleted file mode 100644 index 73b5e5d8d97e8..0000000000000 --- a/eBones/lib/libkrb/krb_set_tkt_string.3 +++ /dev/null @@ -1,43 +0,0 @@ -.\" from: krb_set_tkt_string.3,v 4.1 89/01/23 11:11:09 jtkohl Exp $ -.\" $Id: krb_set_tkt_string.3,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KRB_SET_TKT_STRING 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -krb_set_tkt_string \- set Kerberos ticket cache file name -.SH SYNOPSIS -.nf -.nj -.ft B -#include -.PP -.ft B -void krb_set_tkt_string(filename) -char *filename; -.fi -.ft R -.SH DESCRIPTION -.I krb_set_tkt_string -sets the name of the file that holds the user's -cache of Kerberos server tickets and associated session keys. -.PP -The string -.I filename -passed in is copied into local storage. -Only MAXPATHLEN-1 (see ) characters of the filename are -copied in for use as the cache file name. -.PP -This routine should be called during initialization, before other -Kerberos routines are called; otherwise the routines which fetch the -ticket cache file name may be called and return an undesired ticket file -name until this routine is called. -.SH FILES -.TP 20n -/tmp/tkt[uid] -default ticket file name, unless the environment variable KRBTKFILE is set. -[uid] denotes the user's uid, in decimal. -.SH SEE ALSO -kerberos(3), setenv(3) diff --git a/eBones/lib/libkrb/krbglue.c b/eBones/lib/libkrb/krbglue.c deleted file mode 100644 index f82cf70399f3c..0000000000000 --- a/eBones/lib/libkrb/krbglue.c +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: krbglue.c,v 4.1 89/01/23 15:51:50 wesommer Exp $ - * $Id: krbglue.c,v 1.3 1995/07/18 16:39:05 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -$Id: krbglue.c,v 1.3 1995/07/18 16:39:05 mark Exp $"; -#endif lint -#endif - -#ifndef NCOMPAT -/* - * glue together new libraries and old clients - */ - -#include -#include -#include -#include -#include "krb.h" - -/* These definitions should be in krb.h, no? */ -/* -#if defined(__HIGHC__) -#undef __STDC__ -#endif -#ifdef __STDC__ -extern int krb_mk_req (KTEXT, char *, char *, char *, long); -extern int krb_rd_req (KTEXT, char *, char *, long, AUTH_DAT *, char *); -extern int krb_kntoln (AUTH_DAT *, char *); -extern int krb_set_key (char *, int); -extern int krb_get_cred (char *, char *, char *, CREDENTIALS *); -extern long krb_mk_priv (u_char *, u_char *, u_long, Key_schedule, - C_Block, struct sockaddr_in *, - struct sockaddr_in *); -extern long krb_rd_priv (u_char *, u_long, Key_schedule, - C_Block, struct sockaddr_in *, - struct sockaddr_in *, MSG_DAT *); -extern long krb_mk_safe (u_char *, u_char *, u_long, C_Block *, - struct sockaddr_in *, struct sockaddr_in *); -extern long krb_rd_safe (u_char *, u_long, C_Block *, - struct sockaddr_in *, struct sockaddr_in *, - MSG_DAT *); -extern long krb_mk_err (u_char *, long, char *); -extern int krb_rd_err (u_char *, u_long, long *, MSG_DAT *); -extern int krb_get_pw_in_tkt (char *, char *, char *, char *, char *, int, - char *); -extern int krb_get_svc_in_tkt (char *, char *, char *, char *, char *, int, - char *); -extern int krb_get_pw_tkt (char *, char *, char *, char *); -extern int krb_get_lrealm (char *, char *); -extern int krb_realmofhost (char *); -extern char *krb_get_phost (char *); -extern int krb_get_krbhst (char *, char *, int); -#ifdef DEBUG -extern KTEXT krb_create_death_packet (char *); -#endif -#else -extern int krb_mk_req (); -extern int krb_rd_req (); -extern int krb_kntoln (); -extern int krb_set_key (); -extern int krb_get_cred (); -extern long krb_mk_priv (); -extern long krb_rd_priv (); -extern long krb_mk_safe (); -extern long krb_rd_safe (); -extern long krb_mk_err (); -extern int krb_rd_err (); -extern int krb_get_pw_in_tkt (); -extern int krb_get_svc_in_tkt (); -extern int krb_get_pw_tkt (); -extern int krb_get_lrealm (); -extern int krb_realmofhost (); -extern char *krb_get_phost (); -extern int krb_get_krbhst (); -#ifdef DEBUG -extern KTEXT krb_create_death_packet (); -#endif -#endif -*/ - - -int mk_ap_req(authent, service, instance, realm, checksum) - KTEXT authent; - char *service, *instance, *realm; - u_long checksum; -{ - return krb_mk_req(authent,service,instance,realm,checksum); -} - -int rd_ap_req(authent, service, instance, from_addr, ad, fn) - KTEXT authent; - char *service, *instance; - u_long from_addr; - AUTH_DAT *ad; - char *fn; -{ - return krb_rd_req(authent,service,instance,from_addr,ad,fn); -} - -int an_to_ln(ad, lname) - AUTH_DAT *ad; - char *lname; -{ - return krb_kntoln (ad,lname); -} - -int set_serv_key (key, cvt) - char *key; - int cvt; -{ - return krb_set_key(key,cvt); -} - -int get_credentials (svc,inst,rlm,cred) - char *svc, *inst, *rlm; - CREDENTIALS *cred; -{ - return krb_get_cred (svc, inst, rlm, cred); -} - -long mk_private_msg (in,out,in_length,schedule,key,sender,receiver) - u_char *in, *out; - u_long in_length; - Key_schedule schedule; - C_Block key; - struct sockaddr_in *sender, *receiver; -{ - return krb_mk_priv (in,out,in_length,schedule,key,sender,receiver); -} - -long rd_private_msg (in,in_length,schedule,key,sender,receiver,msg_data) - u_char *in; - u_long in_length; - Key_schedule schedule; - C_Block key; - struct sockaddr_in *sender, *receiver; - MSG_DAT *msg_data; -{ - return krb_rd_priv (in,in_length,schedule,key,sender,receiver,msg_data); -} - -long mk_safe_msg (in,out,in_length,key,sender,receiver) - u_char *in, *out; - u_long in_length; - C_Block *key; - struct sockaddr_in *sender, *receiver; -{ - return krb_mk_safe (in,out,in_length,key,sender,receiver); -} - -long rd_safe_msg (in,length,key,sender,receiver,msg_data) - u_char *in; - u_long length; - C_Block *key; - struct sockaddr_in *sender, *receiver; - MSG_DAT *msg_data; -{ - return krb_rd_safe (in,length,key,sender,receiver,msg_data); -} - -long mk_appl_err_msg (out,code,string) - u_char *out; - long code; - char *string; -{ - return krb_mk_err (out,code,string); -} - -long rd_appl_err_msg (in,length,code,msg_data) - u_char *in; - u_long length; - long *code; - MSG_DAT *msg_data; -{ - return krb_rd_err (in,length,code,msg_data); -} - -int get_in_tkt(user,instance,realm,service,sinstance,life,password) - char *user, *instance, *realm, *service, *sinstance; - int life; - char *password; -{ - return krb_get_pw_in_tkt(user,instance,realm,service,sinstance, - life,password); -} - -int get_svc_in_tkt(user, instance, realm, service, sinstance, life, srvtab) - char *user, *instance, *realm, *service, *sinstance; - int life; - char *srvtab; -{ - return krb_get_svc_in_tkt(user, instance, realm, service, sinstance, - life, srvtab); -} - -int get_pw_tkt(user,instance,realm,cpw) - char *user; - char *instance; - char *realm; - char *cpw; -{ - return krb_get_pw_tkt(user,instance,realm,cpw); -} - -int -get_krbrlm (r, n) -char *r; -int n; -{ - return krb_get_lream(r,n); -} - -int -krb_getrealm (host) -{ - return krb_realmofhost(host); -} - -char * -get_phost (host) -char *host -{ - return krb_get_phost(host); -} - -int -get_krbhst (h, r, n) -char *h; -char *r; -int n; -{ - return krb_get_krbhst(h,r,n); -} -#ifdef DEBUG -struct ktext *create_death_packet(a_name) - char *a_name; -{ - return krb_create_death_packet(a_name); -} -#endif /* DEBUG */ - -#if 0 -extern int krb_ck_repl (); - -int check_replay () -{ - return krb_ck_repl (); -} -#endif -#endif /* NCOMPAT */ diff --git a/eBones/lib/libkrb/kuserok.3 b/eBones/lib/libkrb/kuserok.3 deleted file mode 100644 index c7581a6c6f779..0000000000000 --- a/eBones/lib/libkrb/kuserok.3 +++ /dev/null @@ -1,63 +0,0 @@ -.\" from: kuserok.3,v 4.1 89/01/23 11:11:49 jtkohl Exp $ -.\" $Id: kuserok.3,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KUSEROK 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kuserok \- Kerberos version of ruserok -.SH SYNOPSIS -.nf -.nj -.ft B -#include -.PP -.ft B -kuserok(kdata, localuser) -AUTH_DAT *auth_data; -char *localuser; -.fi -.ft R -.SH DESCRIPTION -.I kuserok -determines whether a Kerberos principal described by the structure -.I auth_data -is authorized to login as user -.I localuser -according to the authorization file -("~\fIlocaluser\fR/.klogin" by default). It returns 0 (zero) if authorized, -1 (one) if not authorized. -.PP -If there is no account for -.I localuser -on the local machine, authorization is not granted. -If there is no authorization file, and the Kerberos principal described -by -.I auth_data -translates to -.I localuser -(using -.IR krb_kntoln (3)), -authorization is granted. -If the authorization file -can't be accessed, or the file is not owned by -.IR localuser, -authorization is denied. Otherwise, the file is searched for -a matching principal name, instance, and realm. If a match is found, -authorization is granted, else authorization is denied. -.PP -The file entries are in the format: -.nf -.in +5n - name.instance@realm -.in -5n -.fi -with one entry per line. -.SH SEE ALSO -kerberos(3), ruserok(3), krb_kntoln(3) -.SH FILES -.TP 20n -~\fIlocaluser\fR/.klogin -authorization list diff --git a/eBones/lib/libkrb/kuserok.c b/eBones/lib/libkrb/kuserok.c deleted file mode 100644 index 8e5d18ab1e317..0000000000000 --- a/eBones/lib/libkrb/kuserok.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * kuserok: check if a kerberos principal has - * access to a local account - * - * from: kuserok.c,v 4.5 89/01/23 09:25:21 jtkohl Exp $ - * $Id: kuserok.c,v 1.3 1995/07/18 16:39:07 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kuserok.c,v 1.3 1995/07/18 16:39:07 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define OK 0 -#define NOTOK 1 -#define MAX_USERNAME 10 - -/* - * Given a Kerberos principal "kdata", and a local username "luser", - * determine whether user is authorized to login according to the - * authorization file ("~luser/.klogin" by default). Returns OK - * if authorized, NOTOK if not authorized. - * - * If there is no account for "luser" on the local machine, returns - * NOTOK. If there is no authorization file, and the given Kerberos - * name "kdata" translates to the same name as "luser" (using - * krb_kntoln()), returns OK. Otherwise, if the authorization file - * can't be accessed, returns NOTOK. Otherwise, the file is read for - * a matching principal name, instance, and realm. If one is found, - * returns OK, if none is found, returns NOTOK. - * - * The file entries are in the format: - * - * name.instance@realm - * - * one entry per line. - * - * The ATHENA_COMPAT code supports old-style Athena ~luser/.klogin - * file entries. See the file "kparse.c". - */ - -#ifdef ATHENA_COMPAT - -#include - -/* - * The parmtable defines the keywords we will recognize with their - * default values, and keeps a pointer to the found value. The found - * value should be filled in with strsave(), since FreeParameterSet() - * will release memory for all non-NULL found strings. - * -*** NOTE WELL! *** - * - * The table below is very nice, but we cannot hard-code a default for the - * realm: we have to get the realm via krb_get_lrealm(). Even though the - * default shows as "from krb_get_lrealm, below", it gets changed in - * kuserok to whatever krb_get_lrealm() tells us. That code assumes that - * the realm will be the entry number in the table below, so if you - * change the order of the entries below, you have to change the - * #definition of REALM_SCRIPT to reflect it. - */ -#define REALM_SUBSCRIPT 1 -parmtable kparm[] = { - -/* keyword default found value */ -{"user", "", (char *) NULL}, -{"realm", "see krb_get_lrealm, below", (char *) NULL}, -{"instance", "", (char *) NULL}, -}; -#define KPARMS kparm,PARMCOUNT(kparm) -#endif ATHENA_COMPAT - -int -kuserok(kdata, luser) - AUTH_DAT *kdata; - char *luser; -{ - struct stat sbuf; - struct passwd *pwd; - char pbuf[MAXPATHLEN]; - int isok = NOTOK, rc; - FILE *fp; - char kuser[MAX_USERNAME]; - char principal[ANAME_SZ], inst[INST_SZ], realm[REALM_SZ]; - char linebuf[BUFSIZ]; - char *newline; - int gobble; -#ifdef ATHENA_COMPAT - char local_realm[REALM_SZ]; -#endif ATHENA_COMPAT - - /* no account => no access */ - if ((pwd = getpwnam(luser)) == NULL) { - return(NOTOK); - } - (void) strcpy(pbuf, pwd->pw_dir); - (void) strcat(pbuf, "/.klogin"); - - if (access(pbuf, F_OK)) { /* not accessible */ - /* - * if he's trying to log in as himself, and there is no .klogin file, - * let him. To find out, call - * krb_kntoln to convert the triple in kdata to a name which we can - * string compare. - */ - if (!krb_kntoln(kdata, kuser) && (strcmp(kuser, luser) == 0)) { - return(OK); - } - } - /* open ~/.klogin */ - if ((fp = fopen(pbuf, "r")) == NULL) { - return(NOTOK); - } - /* - * security: if the user does not own his own .klogin file, - * do not grant access - */ - if (fstat(fileno(fp), &sbuf)) { - fclose(fp); - return(NOTOK); - } - if (sbuf.st_uid != pwd->pw_uid) { - fclose(fp); - return(NOTOK); - } - -#ifdef ATHENA_COMPAT - /* Accept old-style .klogin files */ - - /* - * change the default realm from the hard-coded value to the - * accepted realm that Kerberos specifies. - */ - rc = krb_get_lrealm(local_realm, 1); - if (rc == KSUCCESS) - kparm[REALM_SUBSCRIPT].defvalue = local_realm; - else - return (rc); - - /* check each line */ - while ((isok != OK) && (rc = fGetParameterSet(fp, KPARMS)) != PS_EOF) { - switch (rc) { - case PS_BAD_KEYWORD: - case PS_SYNTAX: - while (((gobble = fGetChar(fp)) != EOF) && (gobble != '\n')); - break; - - case PS_OKAY: - isok = (ParmCompare(KPARMS, "user", kdata->pname) || - ParmCompare(KPARMS, "instance", kdata->pinst) || - ParmCompare(KPARMS, "realm", kdata->prealm)); - break; - - default: - break; - } - FreeParameterSet(kparm, PARMCOUNT(kparm)); - } - /* reset the stream for parsing new-style names, if necessary */ - rewind(fp); -#endif ATHENA_COMPAT - - /* check each line */ - while ((isok != OK) && (fgets(linebuf, BUFSIZ, fp) != NULL)) { - /* null-terminate the input string */ - linebuf[BUFSIZ-1] = '\0'; - newline = NULL; - /* nuke the newline if it exists */ - if ((newline = index(linebuf, '\n'))) - *newline = '\0'; - rc = kname_parse(principal, inst, realm, linebuf); - if (rc == KSUCCESS) { - isok = (strncmp(kdata->pname, principal, ANAME_SZ) || - strncmp(kdata->pinst, inst, INST_SZ) || - strncmp(kdata->prealm, realm, REALM_SZ)); - } - /* clean up the rest of the line if necessary */ - if (!newline) - while (((gobble = getc(fp)) != EOF) && gobble != '\n'); - } - fclose(fp); - return(isok); -} diff --git a/eBones/lib/libkrb/log.c b/eBones/lib/libkrb/log.c deleted file mode 100644 index e33477f5cf54f..0000000000000 --- a/eBones/lib/libkrb/log.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: log.c,v 4.7 88/12/01 14:15:14 jtkohl Exp $ - * $Id: log.c,v 1.3 1995/07/18 16:39:09 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: log.c,v 1.3 1995/07/18 16:39:09 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include - -static char *log_name = KRBLOG; -static is_open; - -/* - * This file contains three logging routines: set_logfile() - * to determine the file that log entries should be written to; - * and log() and new_log() to write log entries to the file. - */ - -/* - * log() is used to add entries to the logfile (see set_logfile() - * below). Note that it is probably not portable since it makes - * assumptions about what the compiler will do when it is called - * with less than the correct number of arguments which is the - * way it is usually called. - * - * The log entry consists of a timestamp and the given arguments - * printed according to the given "format". - * - * The log file is opened and closed for each log entry. - * - * The return value is undefined. - */ - -__BEGIN_DECLS -char *month_sname __P((int)); -__END_DECLS - - -/*VARARGS1 */ -void log(format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0) - char *format; - int a1,a2,a3,a4,a5,a6,a7,a8,a9,a0; -{ - FILE *logfile, *fopen(); - long time(),now; - struct tm *tm; - - if ((logfile = fopen(log_name,"a")) == NULL) - return; - - (void) time(&now); - tm = localtime(&now); - - fprintf(logfile,"%2d-%s-%02d %02d:%02d:%02d ",tm->tm_mday, - month_sname(tm->tm_mon + 1),tm->tm_year, - tm->tm_hour, tm->tm_min, tm->tm_sec); - fprintf(logfile,format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0); - fprintf(logfile,"\n"); - (void) fclose(logfile); - return; -} - -/* - * set_logfile() changes the name of the file to which - * messages are logged. If set_logfile() is not called, - * the logfile defaults to KRBLOG, defined in "krb.h". - */ - -void -set_logfile(filename) - char *filename; -{ - log_name = filename; - is_open = 0; -} - -/* - * new_log() appends a log entry containing the give time "t" and the - * string "string" to the logfile (see set_logfile() above). The file - * is opened once and left open. The routine returns 1 on failure, 0 - * on success. - */ - -int -new_log(t,string) - long t; - char *string; -{ - static FILE *logfile; - - long time(); - struct tm *tm; - - if (!is_open) { - if ((logfile = fopen(log_name,"a")) == NULL) return(1); - is_open = 1; - } - - if (t) { - tm = localtime(&t); - - fprintf(logfile,"\n%2d-%s-%02d %02d:%02d:%02d %s",tm->tm_mday, - month_sname(tm->tm_mon + 1),tm->tm_year, - tm->tm_hour, tm->tm_min, tm->tm_sec, string); - } - else { - fprintf(logfile,"\n%20s%s","",string); - } - - (void) fflush(logfile); - return(0); -} diff --git a/eBones/lib/libkrb/mk_err.c b/eBones/lib/libkrb/mk_err.c deleted file mode 100644 index 86002403bccf9..0000000000000 --- a/eBones/lib/libkrb/mk_err.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: mk_err.c,v 4.4 88/11/15 16:33:36 jtkohl Exp $ - * $Id: mk_err.c,v 1.3 1995/07/18 16:39:11 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: mk_err.c,v 1.3 1995/07/18 16:39:11 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include - -/* - * This routine creates a general purpose error reply message. It - * doesn't use KTEXT because application protocol may have long - * messages, and may want this part of buffer contiguous to other - * stuff. - * - * The error reply is built in "p", using the error code "e" and - * error text "e_string" given. The length of the error reply is - * returned. - * - * The error reply is in the following format: - * - * unsigned char KRB_PROT_VERSION protocol version no. - * unsigned char AUTH_MSG_APPL_ERR message type - * (least significant - * bit of above) HOST_BYTE_ORDER local byte order - * 4 bytes e given error code - * string e_string given error text - */ - -long krb_mk_err(p,e,e_string) - u_char *p; /* Where to build error packet */ - long e; /* Error code */ - char *e_string; /* Text of error */ -{ - u_char *start; - - start = p; - - /* Create fixed part of packet */ - *p++ = (unsigned char) KRB_PROT_VERSION; - *p = (unsigned char) AUTH_MSG_APPL_ERR; - *p++ |= HOST_BYTE_ORDER; - - /* Add the basic info */ - bcopy((char *)&e,(char *)p,4); /* err code */ - p += sizeof(e); - (void) strcpy((char *)p,e_string); /* err text */ - p += strlen(e_string); - - /* And return the length */ - return p-start; -} diff --git a/eBones/lib/libkrb/mk_priv.c b/eBones/lib/libkrb/mk_priv.c deleted file mode 100644 index d45d734c6f170..0000000000000 --- a/eBones/lib/libkrb/mk_priv.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine constructs a Kerberos 'private msg', i.e. - * cryptographically sealed with a private session key. - * - * Note-- bcopy is used to avoid alignment problems on IBM RT. - * - * Note-- It's too bad that it did a long int compare on the RT before. - * - * Returns either < 0 ===> error, or resulting size of message - * - * Steve Miller Project Athena MIT/DEC - * - * from: mk_priv.c,v 4.13 89/03/22 14:48:59 jtkohl Exp $ - * $Id: mk_priv.c,v 1.3 1995/07/18 16:39:13 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: mk_priv.c,v 1.3 1995/07/18 16:39:13 mark Exp $"; -#endif /* lint */ -#endif - -/* system include files */ -#include -#include -#include -#include -#include -#include - -/* application include files */ -#include -#include -#include -#include "lsb_addr_comp.h" - -extern char *errmsg(); -extern int errno; -extern int krb_debug; - -/* static storage */ - - -static u_long c_length; -static struct timeval msg_time; -static u_char msg_time_5ms; -static long msg_time_sec; - -/* - * krb_mk_priv() constructs an AUTH_MSG_PRIVATE message. It takes - * some user data "in" of "length" bytes and creates a packet in "out" - * consisting of the user data, a timestamp, and the sender's network - * address. -#ifndef NOENCRYTION - * The packet is encrypted by pcbc_encrypt(), using the given - * "key" and "schedule". -#endif - * The length of the resulting packet "out" is - * returned. - * - * It is similar to krb_mk_safe() except for the additional key - * schedule argument "schedule" and the fact that the data is encrypted - * rather than appended with a checksum. Also, the protocol version - * number is "private_msg_ver", defined in krb_rd_priv.c, rather than - * KRB_PROT_VERSION, defined in "krb.h". - * - * The "out" packet consists of: - * - * Size Variable Field - * ---- -------- ----- - * - * 1 byte private_msg_ver protocol version number - * 1 byte AUTH_MSG_PRIVATE | message type plus local - * HOST_BYTE_ORDER byte order in low bit - * - * 4 bytes c_length length of data -#ifndef NOENCRYPT - * we encrypt from here with pcbc_encrypt -#endif - * - * 4 bytes length length of user data - * length in user data - * 1 byte msg_time_5ms timestamp milliseconds - * 4 bytes sender->sin.addr.s_addr sender's IP address - * - * 4 bytes msg_time_sec or timestamp seconds with - * -msg_time_sec direction in sign bit - * - * 0<=n<=7 bytes pad to 8 byte multiple zeroes - */ - -long krb_mk_priv(in,out,length,schedule,key,sender,receiver) - u_char *in; /* application data */ - u_char *out; /* put msg here, leave room for - * header! breaks if in and out - * (header stuff) overlap */ - u_long length; /* of in data */ - Key_schedule schedule; /* precomputed key schedule */ - C_Block key; /* encryption key for seed and ivec */ - struct sockaddr_in *sender; /* sender address */ - struct sockaddr_in *receiver; /* receiver address */ -{ - register u_char *p,*q; - static u_char *c_length_ptr; - extern int private_msg_ver; /* in krb_rd_priv.c */ - - /* - * get the current time to use instead of a sequence #, since - * process lifetime may be shorter than the lifetime of a session - * key. - */ - if (gettimeofday(&msg_time,(struct timezone *)0)) { - return -1; - } - msg_time_sec = (long) msg_time.tv_sec; - msg_time_5ms = msg_time.tv_usec/5000; /* 5ms quanta */ - - p = out; - - *p++ = private_msg_ver; - *p++ = AUTH_MSG_PRIVATE | HOST_BYTE_ORDER; - - /* calculate cipher length */ - c_length_ptr = p; - p += sizeof(c_length); - - q = p; - - /* stuff input length */ - bcopy((char *)&length,(char *)p,sizeof(length)); - p += sizeof(length); - -#ifdef NOENCRYPTION - /* make all the stuff contiguous for checksum */ -#else - /* make all the stuff contiguous for checksum and encryption */ -#endif - bcopy((char *)in,(char *)p,(int) length); - p += length; - - /* stuff time 5ms */ - bcopy((char *)&msg_time_5ms,(char *)p,sizeof(msg_time_5ms)); - p += sizeof(msg_time_5ms); - - /* stuff source address */ - bcopy((char *)&sender->sin_addr.s_addr,(char *)p, - sizeof(sender->sin_addr.s_addr)); - p += sizeof(sender->sin_addr.s_addr); - - /* - * direction bit is the sign bit of the timestamp. Ok - * until 2038?? - */ - /* For compatibility with broken old code, compares are done in VAX - byte order (LSBFIRST) */ - if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ - receiver->sin_addr.s_addr)==-1) - msg_time_sec = -msg_time_sec; - else if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==0) - if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) - msg_time_sec = -msg_time_sec; - /* stuff time sec */ - bcopy((char *)&msg_time_sec,(char *)p,sizeof(msg_time_sec)); - p += sizeof(msg_time_sec); - - /* - * All that for one tiny bit! Heaven help those that talk to - * themselves. - */ - -#ifdef notdef - /* - * calculate the checksum of the length, address, sequence, and - * inp data - */ - cksum = quad_cksum(q,NULL,p-q,0,key); - if (krb_debug) - printf("\ncksum = %u",cksum); - /* stuff checksum */ - bcopy((char *) &cksum,(char *) p,sizeof(cksum)); - p += sizeof(cksum); -#endif - - /* - * All the data have been assembled, compute length - */ - - c_length = p - q; - c_length = ((c_length + sizeof(C_Block) -1)/sizeof(C_Block)) * - sizeof(C_Block); - /* stuff the length */ - bcopy((char *) &c_length,(char *)c_length_ptr,sizeof(c_length)); - -#ifndef NOENCRYPTION - pcbc_encrypt((C_Block *)q,(C_Block *)q,(long)(p-q),schedule,(C_Block *)key, - ENCRYPT); -#endif /* NOENCRYPTION */ - - return (q - out + c_length); /* resulting size */ -} diff --git a/eBones/lib/libkrb/mk_req.c b/eBones/lib/libkrb/mk_req.c deleted file mode 100644 index a27c1c0d556b6..0000000000000 --- a/eBones/lib/libkrb/mk_req.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: der: mk_req.c,v 4.17 89/07/07 15:20:35 jtkohl Exp $ - * $Id: mk_req.c,v 1.3 1995/07/18 16:39:15 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: mk_req.c,v 1.3 1995/07/18 16:39:15 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include - -extern int krb_ap_req_debug; -static struct timeval tv_local = { 0, 0 }; -static int lifetime = DEFAULT_TKT_LIFE; - -/* - * krb_mk_req takes a text structure in which an authenticator is to - * be built, the name of a service, an instance, a realm, - * and a checksum. It then retrieves a ticket for - * the desired service and creates an authenticator in the text - * structure passed as the first argument. krb_mk_req returns - * KSUCCESS on success and a Kerberos error code on failure. - * - * The peer procedure on the other end is krb_rd_req. When making - * any changes to this routine it is important to make corresponding - * changes to krb_rd_req. - * - * The authenticator consists of the following: - * - * authent->dat - * - * unsigned char KRB_PROT_VERSION protocol version no. - * unsigned char AUTH_MSG_APPL_REQUEST message type - * (least significant - * bit of above) HOST_BYTE_ORDER local byte ordering - * unsigned char kvno from ticket server's key version - * string realm server's realm - * unsigned char tl ticket length - * unsigned char idl request id length - * text ticket->dat ticket for server - * text req_id->dat request id - * - * The ticket information is retrieved from the ticket cache or - * fetched from Kerberos. The request id (called the "authenticator" - * in the papers on Kerberos) contains the following: - * - * req_id->dat - * - * string cr.pname {name, instance, and - * string cr.pinst realm of principal - * string myrealm making this request} - * 4 bytes checksum checksum argument given - * unsigned char tv_local.tf_usec time (milliseconds) - * 4 bytes tv_local.tv_sec time (seconds) - * - * req_id->length = 3 strings + 3 terminating nulls + 5 bytes for time, - * all rounded up to multiple of 8. - */ - -int -krb_mk_req(authent,service,instance,realm,checksum) - register KTEXT authent; /* Place to build the authenticator */ - char *service; /* Name of the service */ - char *instance; /* Service instance */ - char *realm; /* Authentication domain of service */ - long checksum; /* Checksum of data (optional) */ -{ - static KTEXT_ST req_st; /* Temp storage for req id */ - register KTEXT req_id = &req_st; - unsigned char *v = authent->dat; /* Prot version number */ - unsigned char *t = (authent->dat+1); /* Message type */ - unsigned char *kv = (authent->dat+2); /* Key version no */ - unsigned char *tl = (authent->dat+4+strlen(realm)); /* Tkt len */ - unsigned char *idl = (authent->dat+5+strlen(realm)); /* Reqid len */ - CREDENTIALS cr; /* Credentials used by retr */ - register KTEXT ticket = &(cr.ticket_st); /* Pointer to tkt_st */ - int retval; /* Returned by krb_get_cred */ - static Key_schedule key_s; - char myrealm[REALM_SZ]; - - /* The fixed parts of the authenticator */ - *v = (unsigned char) KRB_PROT_VERSION; - *t = (unsigned char) AUTH_MSG_APPL_REQUEST; - *t |= HOST_BYTE_ORDER; - - /* Get the ticket and move it into the authenticator */ - if (krb_ap_req_debug) - printf("Realm: %s\n",realm); - /* - * Determine realm of these tickets. We will send this to the - * KDC from which we are requesting tickets so it knows what to - * with our session key. - */ - if ((retval = krb_get_tf_realm(TKT_FILE, myrealm)) != KSUCCESS) - return(retval); - - retval = krb_get_cred(service,instance,realm,&cr); - - if (retval == RET_NOTKT) { - if ((retval = get_ad_tkt(service,instance,realm,lifetime))) - return(retval); - if ((retval = krb_get_cred(service,instance,realm,&cr))) - return(retval); - } - - if (retval != KSUCCESS) return (retval); - - if (krb_ap_req_debug) - printf("%s %s %s %s %s\n", service, instance, realm, - cr.pname, cr.pinst); - *kv = (unsigned char) cr.kvno; - (void) strcpy((char *)(authent->dat+3),realm); - *tl = (unsigned char) ticket->length; - bcopy((char *)(ticket->dat),(char *)(authent->dat+6+strlen(realm)), - ticket->length); - authent->length = 6 + strlen(realm) + ticket->length; - if (krb_ap_req_debug) - printf("Ticket->length = %d\n",ticket->length); - if (krb_ap_req_debug) - printf("Issue date: %ld\n",cr.issue_date); - - /* Build request id */ - (void) strcpy((char *)(req_id->dat),cr.pname); /* Auth name */ - req_id->length = strlen(cr.pname)+1; - /* Principal's instance */ - (void) strcpy((char *)(req_id->dat+req_id->length),cr.pinst); - req_id->length += strlen(cr.pinst)+1; - /* Authentication domain */ - (void) strcpy((char *)(req_id->dat+req_id->length),myrealm); - req_id->length += strlen(myrealm)+1; - /* Checksum */ - bcopy((char *)&checksum,(char *)(req_id->dat+req_id->length),4); - req_id->length += 4; - - /* Fill in the times on the request id */ - (void) gettimeofday(&tv_local,(struct timezone *) 0); - *(req_id->dat+(req_id->length)++) = - (unsigned char) tv_local.tv_usec; - /* Time (coarse) */ - bcopy((char *)&(tv_local.tv_sec), - (char *)(req_id->dat+req_id->length), 4); - req_id->length += 4; - - /* Fill to a multiple of 8 bytes for DES */ - req_id->length = ((req_id->length+7)/8)*8; - -#ifndef NOENCRYPTION - key_sched((C_Block *)cr.session,key_s); - pcbc_encrypt((C_Block *)req_id->dat,(C_Block *)req_id->dat, - (long)req_id->length,key_s,(C_Block *)cr.session,ENCRYPT); - bzero((char *) key_s, sizeof(key_s)); -#endif /* NOENCRYPTION */ - - /* Copy it into the authenticator */ - bcopy((char *)(req_id->dat),(char *)(authent->dat+authent->length), - req_id->length); - authent->length += req_id->length; - /* And set the id length */ - *idl = (unsigned char) req_id->length; - /* clean up */ - bzero((char *)req_id, sizeof(*req_id)); - - if (krb_ap_req_debug) - printf("Authent->length = %d\n",authent->length); - if (krb_ap_req_debug) - printf("idl = %d, tl = %d\n",(int) *idl, (int) *tl); - - return(KSUCCESS); -} - -/* - * krb_set_lifetime sets the default lifetime for additional tickets - * obtained via krb_mk_req(). - * - * It returns the previous value of the default lifetime. - */ - -int -krb_set_lifetime(newval) -int newval; -{ - int olife = lifetime; - - lifetime = newval; - return(olife); -} diff --git a/eBones/lib/libkrb/mk_safe.c b/eBones/lib/libkrb/mk_safe.c deleted file mode 100644 index e5490bcd2e9be..0000000000000 --- a/eBones/lib/libkrb/mk_safe.c +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine constructs a Kerberos 'safe msg', i.e. authenticated - * using a private session key to seed a checksum. Msg is NOT - * encrypted. - * - * Note-- bcopy is used to avoid alignment problems on IBM RT - * - * Returns either <0 ===> error, or resulting size of message - * - * Steve Miller Project Athena MIT/DEC - * - * from: mk_safe.c,v 4.12 89/03/22 14:50:49 jtkohl Exp $ - * $Id: mk_safe.c,v 1.3 1995/07/18 16:39:17 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: mk_safe.c,v 1.3 1995/07/18 16:39:17 mark Exp $"; -#endif /* lint */ -#endif - -/* system include files */ -#include -#include -#include -#include -#include -#include - -/* application include files */ -#include -#include -#include -#include "lsb_addr_comp.h" - -extern char *errmsg(); -extern int errno; -extern int krb_debug; - -/* static storage */ - -static u_long cksum; -static C_Block big_cksum[2]; -static struct timeval msg_time; -static u_char msg_time_5ms; -static long msg_time_sec; - -/* - * krb_mk_safe() constructs an AUTH_MSG_SAFE message. It takes some - * user data "in" of "length" bytes and creates a packet in "out" - * consisting of the user data, a timestamp, and the sender's network - * address, followed by a checksum computed on the above, using the - * given "key". The length of the resulting packet is returned. - * - * The "out" packet consists of: - * - * Size Variable Field - * ---- -------- ----- - * - * 1 byte KRB_PROT_VERSION protocol version number - * 1 byte AUTH_MSG_SAFE | message type plus local - * HOST_BYTE_ORDER byte order in low bit - * - * ===================== begin checksum ================================ - * - * 4 bytes length length of user data - * length in user data - * 1 byte msg_time_5ms timestamp milliseconds - * 4 bytes sender->sin.addr.s_addr sender's IP address - * - * 4 bytes msg_time_sec or timestamp seconds with - * -msg_time_sec direction in sign bit - * - * ======================= end checksum ================================ - * - * 16 bytes big_cksum quadratic checksum of - * above using "key" - */ - -long krb_mk_safe(in,out,length,key,sender,receiver) - u_char *in; /* application data */ - u_char *out; /* - * put msg here, leave room for header! - * breaks if in and out (header stuff) - * overlap - */ - u_long length; /* of in data */ - C_Block *key; /* encryption key for seed and ivec */ - struct sockaddr_in *sender; /* sender address */ - struct sockaddr_in *receiver; /* receiver address */ -{ - register u_char *p,*q; - - /* - * get the current time to use instead of a sequence #, since - * process lifetime may be shorter than the lifetime of a session - * key. - */ - if (gettimeofday(&msg_time,(struct timezone *)0)) { - return -1; - } - msg_time_sec = (long) msg_time.tv_sec; - msg_time_5ms = msg_time.tv_usec/5000; /* 5ms quanta */ - - p = out; - - *p++ = KRB_PROT_VERSION; - *p++ = AUTH_MSG_SAFE | HOST_BYTE_ORDER; - - q = p; /* start for checksum stuff */ - /* stuff input length */ - bcopy((char *)&length,(char *)p,sizeof(length)); - p += sizeof(length); - - /* make all the stuff contiguous for checksum */ - bcopy((char *)in,(char *)p,(int) length); - p += length; - - /* stuff time 5ms */ - bcopy((char *)&msg_time_5ms,(char *)p,sizeof(msg_time_5ms)); - p += sizeof(msg_time_5ms); - - /* stuff source address */ - bcopy((char *) &sender->sin_addr.s_addr,(char *)p, - sizeof(sender->sin_addr.s_addr)); - p += sizeof(sender->sin_addr.s_addr); - - /* - * direction bit is the sign bit of the timestamp. Ok until - * 2038?? - */ - /* For compatibility with broken old code, compares are done in VAX - byte order (LSBFIRST) */ - if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ - receiver->sin_addr.s_addr)==-1) - msg_time_sec = -msg_time_sec; - else if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==0) - if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) - msg_time_sec = -msg_time_sec; - /* - * all that for one tiny bit! Heaven help those that talk to - * themselves. - */ - - /* stuff time sec */ - bcopy((char *)&msg_time_sec,(char *)p,sizeof(msg_time_sec)); - p += sizeof(msg_time_sec); - -#ifdef NOENCRYPTION - cksum = 0; - bzero(big_cksum, sizeof(big_cksum)); -#else - cksum=quad_cksum((C_Block *)q,big_cksum,p-q,2,key); -#endif - if (krb_debug) - printf("\ncksum = %lu",cksum); - - /* stuff checksum */ - bcopy((char *)big_cksum,(char *)p,sizeof(big_cksum)); - p += sizeof(big_cksum); - - return ((long)(p - out)); /* resulting size */ - -} diff --git a/eBones/lib/libkrb/month_sname.c b/eBones/lib/libkrb/month_sname.c deleted file mode 100644 index f4ef33994bc9a..0000000000000 --- a/eBones/lib/libkrb/month_sname.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: month_sname.c,v 4.4 88/11/15 16:39:32 jtkohl Exp $ - * $Id: month_sname.c,v 1.3 1995/07/18 16:39:19 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: month_sname.c,v 1.3 1995/07/18 16:39:19 mark Exp $"; -#endif /* lint */ -#endif - - -/* - * Given an integer 1-12, month_sname() returns a string - * containing the first three letters of the corresponding - * month. Returns 0 if the argument is out of range. - */ - -char *month_sname(n) - int n; -{ - static char *name[] = { - "Jan","Feb","Mar","Apr","May","Jun", - "Jul","Aug","Sep","Oct","Nov","Dec" - }; - return((n < 1 || n > 12) ? 0 : name [n-1]); -} diff --git a/eBones/lib/libkrb/netread.c b/eBones/lib/libkrb/netread.c deleted file mode 100644 index 628004e251853..0000000000000 --- a/eBones/lib/libkrb/netread.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: netread.c,v 4.1 88/11/15 16:47:21 jtkohl Exp $ - * $Id: netread.c,v 1.3 1995/07/18 16:39:20 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: netread.c,v 1.3 1995/07/18 16:39:20 mark Exp $"; -#endif lint -#endif - -#include - -/* - * krb_net_read() reads from the file descriptor "fd" to the buffer - * "buf", until either 1) "len" bytes have been read or 2) cannot - * read anymore from "fd". It returns the number of bytes read - * or a read() error. (The calling interface is identical to - * read(2).) - * - * XXX must not use non-blocking I/O - */ - -int -krb_net_read(fd, buf, len) -int fd; -register char *buf; -register int len; -{ - int cc, len2 = 0; - - do { - cc = read(fd, buf, len); - if (cc < 0) - return(cc); /* errno is already set */ - else if (cc == 0) { - return(len2); - } else { - buf += cc; - len2 += cc; - len -= cc; - } - } while (len > 0); - return(len2); -} diff --git a/eBones/lib/libkrb/netwrite.c b/eBones/lib/libkrb/netwrite.c deleted file mode 100644 index f85f7ba5efd77..0000000000000 --- a/eBones/lib/libkrb/netwrite.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: netwrite.c,v 4.1 88/11/15 16:48:58 jtkohl Exp $"; - * $Id: netwrite.c,v 1.3 1995/07/18 16:39:22 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: netwrite.c,v 1.3 1995/07/18 16:39:22 mark Exp $"; -#endif lint -#endif - -#include - -/* - * krb_net_write() writes "len" bytes from "buf" to the file - * descriptor "fd". It returns the number of bytes written or - * a write() error. (The calling interface is identical to - * write(2).) - * - * XXX must not use non-blocking I/O - */ - -int -krb_net_write(fd, buf, len) -int fd; -register char *buf; -int len; -{ - int cc; - register int wrlen = len; - do { - cc = write(fd, buf, wrlen); - if (cc < 0) - return(cc); - else { - buf += cc; - wrlen -= cc; - } - } while (wrlen > 0); - return(len); -} diff --git a/eBones/lib/libkrb/one.c b/eBones/lib/libkrb/one.c deleted file mode 100644 index ef02ae1c878a9..0000000000000 --- a/eBones/lib/libkrb/one.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * form: one.c,v 4.1 88/11/15 16:51:41 jtkohl Exp $ - * $Id: one.c,v 1.3 1995/07/18 16:39:24 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: one.c,v 1.3 1995/07/18 16:39:24 mark Exp $"; -#endif lint -#endif - -/* - * definition of variable set to 1. - * used in krb_conf.h to determine host byte order. - */ - -int krbONE = 1; diff --git a/eBones/lib/libkrb/pkt_cipher.c b/eBones/lib/libkrb/pkt_cipher.c deleted file mode 100644 index 9c32b72b0fe96..0000000000000 --- a/eBones/lib/libkrb/pkt_cipher.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: pkt_cipher.c,v 4.8 89/01/13 17:46:14 steiner Exp $ - * $Id: pkt_cipher.c,v 1.3 1995/07/18 16:39:25 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: pkt_cipher.c,v 1.3 1995/07/18 16:39:25 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - - -/* - * This routine takes a reply packet from the Kerberos ticket-granting - * service and returns a pointer to the beginning of the ciphertext in it. - * - * See "prot.h" for packet format. - */ - -KTEXT -pkt_cipher(packet) - KTEXT packet; -{ - unsigned char *ptr = pkt_a_realm(packet) + 6 - + strlen((char *)pkt_a_realm(packet)); - /* Skip a few more fields */ - ptr += 3 + 4; /* add 4 for exp_date */ - - /* And return the pointer */ - return((KTEXT) ptr); -} diff --git a/eBones/lib/libkrb/pkt_clen.c b/eBones/lib/libkrb/pkt_clen.c deleted file mode 100644 index f8dacae34faa2..0000000000000 --- a/eBones/lib/libkrb/pkt_clen.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: pkt_clen.c,v 4.7 88/11/15 16:56:36 jtkohl Exp $ - * $Id: pkt_clen.c,v 1.3 1995/07/18 16:39:27 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: pkt_clen.c,v 1.3 1995/07/18 16:39:27 mark Exp $"; -#endif /* lint */ -#endif - -#include - -#include -#include - -extern int krb_debug; -extern int swap_bytes; - -/* - * Given a pointer to an AUTH_MSG_KDC_REPLY packet, return the length of - * its ciphertext portion. The external variable "swap_bytes" is assumed - * to have been set to indicate whether or not the packet is in local - * byte order. pkt_clen() takes this into account when reading the - * ciphertext length out of the packet. - */ - -int -pkt_clen(pkt) - KTEXT pkt; -{ - static unsigned short temp,temp2; - int clen = 0; - - /* Start of ticket list */ - unsigned char *ptr = pkt_a_realm(pkt) + 10 - + strlen((char *)pkt_a_realm(pkt)); - - /* Finally the length */ - bcopy((char *)(++ptr),(char *)&temp,2); /* alignment */ - if (swap_bytes) { - /* assume a short is 2 bytes?? */ - swab((char *)&temp,(char *)&temp2,2); - temp = temp2; - } - - clen = (int) temp; - - if (krb_debug) - printf("Clen is %d\n",clen); - return(clen); -} diff --git a/eBones/lib/libkrb/rd_err.c b/eBones/lib/libkrb/rd_err.c deleted file mode 100644 index e46dc6678f0db..0000000000000 --- a/eBones/lib/libkrb/rd_err.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine dissects a a Kerberos 'safe msg', - * checking its integrity, and returning a pointer to the application - * data contained and its length. - * - * Returns 0 (RD_AP_OK) for success or an error code (RD_AP_...) - * - * Steve Miller Project Athena MIT/DEC - * - * from: rd_err.c,v 4.5 89/01/13 17:26:38 steiner Exp $ - * $Id: rd_err.c,v 1.3 1995/07/18 16:39:29 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: rd_err.c,v 1.3 1995/07/18 16:39:29 mark Exp $"; -#endif /* lint */ -#endif - -/* system include files */ -#include -#include -#include -#include -#include -#include - -/* application include files */ -#include -#include - -/* - * Given an AUTH_MSG_APPL_ERR message, "in" and its length "in_length", - * return the error code from the message in "code" and the text in - * "m_data" as follows: - * - * m_data->app_data points to the error text - * m_data->app_length points to the length of the error text - * - * If all goes well, return RD_AP_OK. If the version number - * is wrong, return RD_AP_VERSION, and if it's not an AUTH_MSG_APPL_ERR - * type message, return RD_AP_MSG_TYPE. - * - * The AUTH_MSG_APPL_ERR message format can be found in mk_err.c - */ - -int -krb_rd_err(in,in_length,code,m_data) - u_char *in; /* pointer to the msg received */ - u_long in_length; /* of in msg */ - long *code; /* received error code */ - MSG_DAT *m_data; -{ - register u_char *p; - int swap_bytes = 0; - p = in; /* beginning of message */ - - if (*p++ != KRB_PROT_VERSION) - return(RD_AP_VERSION); - if (((*p) & ~1) != AUTH_MSG_APPL_ERR) - return(RD_AP_MSG_TYPE); - if ((*p++ & 1) != HOST_BYTE_ORDER) - swap_bytes++; - - /* safely get code */ - bcopy((char *)p,(char *)code,sizeof(*code)); - if (swap_bytes) - swap_u_long(*code); - p += sizeof(*code); /* skip over */ - - m_data->app_data = p; /* we're now at the error text - * message */ - m_data->app_length = in_length; - - return(RD_AP_OK); /* OK == 0 */ -} diff --git a/eBones/lib/libkrb/rd_priv.c b/eBones/lib/libkrb/rd_priv.c deleted file mode 100644 index 0c21a1d463b11..0000000000000 --- a/eBones/lib/libkrb/rd_priv.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine dissects a a Kerberos 'private msg', decrypting it, - * checking its integrity, and returning a pointer to the application - * data contained and its length. - * - * Returns 0 (RD_AP_OK) for success or an error code (RD_AP_...). If - * the return value is RD_AP_TIME, then either the times are too far - * out of synch, OR the packet was modified. - * - * Steve Miller Project Athena MIT/DEC - * - * from: rd_priv.c,v 4.14 89/04/28 11:59:42 jtkohl Exp $ - * $Id: rd_priv.c,v 1.3 1995/07/18 16:39:31 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[]= -"$Id: rd_priv.c,v 1.3 1995/07/18 16:39:31 mark Exp $"; -#endif /* lint */ -#endif - -/* system include files */ -#include -#include -#include -#include -#include -#include - -/* application include files */ -#include -#include -#include -#include "lsb_addr_comp.h" - -extern int krb_debug; - -/* static storage */ - -static u_long c_length; -static int swap_bytes; -static struct timeval local_time; -static long delta_t; -int private_msg_ver = KRB_PROT_VERSION; - -/* -#ifdef NOENCRPYTION - * krb_rd_priv() checks the integrity of an -#else - * krb_rd_priv() decrypts and checks the integrity of an -#endif - * AUTH_MSG_PRIVATE message. Given the message received, "in", - * the length of that message, "in_length", the key "schedule" - * and "key", and the network addresses of the - * "sender" and "receiver" of the message, krb_rd_safe() returns - * RD_AP_OK if the message is okay, otherwise some error code. - * - * The message data retrieved from "in" are returned in the structure - * "m_data". The pointer to the application data - * (m_data->app_data) refers back to the appropriate place in "in". - * - * See the file "mk_priv.c" for the format of the AUTH_MSG_PRIVATE - * message. The structure containing the extracted message - * information, MSG_DAT, is defined in "krb.h". - */ - -long -krb_rd_priv(in,in_length,schedule,key,sender,receiver,m_data) - u_char *in; /* pointer to the msg received */ - u_long in_length; /* length of "in" msg */ - Key_schedule schedule; /* precomputed key schedule */ - C_Block key; /* encryption key for seed and ivec */ - struct sockaddr_in *sender; - struct sockaddr_in *receiver; - MSG_DAT *m_data; /*various input/output data from msg */ -{ - register u_char *p,*q; - static u_long src_addr; /* Can't send structs since no - * guarantees on size */ - - if (gettimeofday(&local_time,(struct timezone *)0)) - return -1; - - p = in; /* beginning of message */ - swap_bytes = 0; - - if (*p++ != KRB_PROT_VERSION && *(p-1) != 3) - return RD_AP_VERSION; - private_msg_ver = *(p-1); - if (((*p) & ~1) != AUTH_MSG_PRIVATE) - return RD_AP_MSG_TYPE; - if ((*p++ & 1) != HOST_BYTE_ORDER) - swap_bytes++; - - /* get cipher length */ - bcopy((char *)p,(char *)&c_length,sizeof(c_length)); - if (swap_bytes) - swap_u_long(c_length); - p += sizeof(c_length); - /* check for rational length so we don't go comatose */ - if (VERSION_SZ + MSG_TYPE_SZ + c_length > in_length) - return RD_AP_MODIFIED; - - - q = p; /* mark start of encrypted stuff */ - -#ifndef NOENCRYPTION - pcbc_encrypt((C_Block *)q,(C_Block *)q,(long)c_length,schedule, - (C_Block *)key,DECRYPT); -#endif - - /* safely get application data length */ - bcopy((char *) p,(char *)&(m_data->app_length), - sizeof(m_data->app_length)); - if (swap_bytes) - swap_u_long(m_data->app_length); - p += sizeof(m_data->app_length); /* skip over */ - - if (m_data->app_length + sizeof(c_length) + sizeof(in_length) + - sizeof(m_data->time_sec) + sizeof(m_data->time_5ms) + - sizeof(src_addr) + VERSION_SZ + MSG_TYPE_SZ - > in_length) - return RD_AP_MODIFIED; - -#ifndef NOENCRYPTION - /* we're now at the decrypted application data */ -#endif - m_data->app_data = p; - - p += m_data->app_length; - - /* safely get time_5ms */ - bcopy((char *) p, (char *)&(m_data->time_5ms), - sizeof(m_data->time_5ms)); - /* don't need to swap-- one byte for now */ - p += sizeof(m_data->time_5ms); - - /* safely get src address */ - bcopy((char *) p,(char *)&src_addr,sizeof(src_addr)); - /* don't swap, net order always */ - p += sizeof(src_addr); - - if (src_addr != (u_long) sender->sin_addr.s_addr) - return RD_AP_MODIFIED; - - /* safely get time_sec */ - bcopy((char *) p, (char *)&(m_data->time_sec), - sizeof(m_data->time_sec)); - if (swap_bytes) swap_u_long(m_data->time_sec); - - p += sizeof(m_data->time_sec); - - /* check direction bit is the sign bit */ - /* For compatibility with broken old code, compares are done in VAX - byte order (LSBFIRST) */ - if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==-1) - /* src < recv */ - m_data->time_sec = - m_data->time_sec; - else if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==0) - if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1) - /* src < recv */ - m_data->time_sec = - m_data->time_sec; - /* - * all that for one tiny bit! - * Heaven help those that talk to themselves. - */ - - /* check the time integrity of the msg */ - delta_t = abs((int)((long) local_time.tv_sec - - m_data->time_sec)); - if (delta_t > CLOCK_SKEW) - return RD_AP_TIME; - if (krb_debug) - printf("\ndelta_t = %ld",delta_t); - - /* - * caller must check timestamps for proper order and - * replays, since server might have multiple clients - * each with its own timestamps and we don't assume - * tightly synchronized clocks. - */ - -#ifdef notdef - bcopy((char *) p,(char *)&cksum,sizeof(cksum)); - if (swap_bytes) swap_u_long(cksum) - /* - * calculate the checksum of the length, sequence, - * and input data, on the sending byte order!! - */ - calc_cksum = quad_cksum(q,NULL,p-q,0,key); - - if (krb_debug) - printf("\ncalc_cksum = %u, received cksum = %u", - calc_cksum, cksum); - if (cksum != calc_cksum) - return RD_AP_MODIFIED; -#endif - return RD_AP_OK; /* OK == 0 */ -} diff --git a/eBones/lib/libkrb/rd_req.c b/eBones/lib/libkrb/rd_req.c deleted file mode 100644 index 60ee9483d30c7..0000000000000 --- a/eBones/lib/libkrb/rd_req.c +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: der: rd_req.c,v 4.16 89/03/22 14:52:06 jtkohl Exp $ - * $Id: rd_req.c,v 1.3 1995/07/18 16:39:33 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: rd_req.c,v 1.3 1995/07/18 16:39:33 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include - -extern int krb_ap_req_debug; - -static struct timeval t_local = { 0, 0 }; - -/* - * Keep the following information around for subsequent calls - * to this routine by the same server using the same key. - */ - -static Key_schedule serv_key; /* Key sched to decrypt ticket */ -static C_Block ky; /* Initialization vector */ -static int st_kvno; /* version number for this key */ -static char st_rlm[REALM_SZ]; /* server's realm */ -static char st_nam[ANAME_SZ]; /* service name */ -static char st_inst[INST_SZ]; /* server's instance */ - -/* - * This file contains two functions. krb_set_key() takes a DES - * key or password string and returns a DES key (either the original - * key, or the password converted into a DES key) and a key schedule - * for it. - * - * krb_rd_req() reads an authentication request and returns information - * about the identity of the requestor, or an indication that the - * identity information was not authentic. - */ - -/* - * krb_set_key() takes as its first argument either a DES key or a - * password string. The "cvt" argument indicates how the first - * argument "key" is to be interpreted: if "cvt" is null, "key" is - * taken to be a DES key; if "cvt" is non-null, "key" is taken to - * be a password string, and is converted into a DES key using - * string_to_key(). In either case, the resulting key is returned - * in the external static variable "ky". A key schedule is - * generated for "ky" and returned in the external static variable - * "serv_key". - * - * This routine returns the return value of des_key_sched. - * - * krb_set_key() needs to be in the same .o file as krb_rd_req() so that - * the key set by krb_set_key() is available in private storage for - * krb_rd_req(). - */ - -int -krb_set_key(key,cvt) - char *key; - int cvt; -{ -#ifdef NOENCRYPTION - bzero(ky, sizeof(ky)); - return KSUCCESS; -#else - if (cvt) - string_to_key(key,(C_Block *)ky); - else - bcopy(key,(char *)ky,8); - return(des_key_sched((C_Block *)ky,serv_key)); -#endif -} - - -/* - * krb_rd_req() takes an AUTH_MSG_APPL_REQUEST or - * AUTH_MSG_APPL_REQUEST_MUTUAL message created by krb_mk_req(), - * checks its integrity and returns a judgement as to the requestor's - * identity. - * - * The "authent" argument is a pointer to the received message. - * The "service" and "instance" arguments name the receiving server, - * and are used to get the service's ticket to decrypt the ticket - * in the message, and to compare against the server name inside the - * ticket. "from_addr" is the network address of the host from which - * the message was received; this is checked against the network - * address in the ticket. If "from_addr" is zero, the check is not - * performed. "ad" is an AUTH_DAT structure which is - * filled in with information about the sender's identity according - * to the authenticator and ticket sent in the message. Finally, - * "fn" contains the name of the file containing the server's key. - * (If "fn" is NULL, the server's key is assumed to have been set - * by krb_set_key(). If "fn" is the null string ("") the default - * file KEYFILE, defined in "krb.h", is used.) - * - * krb_rd_req() returns RD_AP_OK if the authentication information - * was genuine, or one of the following error codes (defined in - * "krb.h"): - * - * RD_AP_VERSION - wrong protocol version number - * RD_AP_MSG_TYPE - wrong message type - * RD_AP_UNDEC - couldn't decipher the message - * RD_AP_INCON - inconsistencies found - * RD_AP_BADD - wrong network address - * RD_AP_TIME - client time (in authenticator) - * too far off server time - * RD_AP_NYV - Kerberos time (in ticket) too - * far off server time - * RD_AP_EXP - ticket expired - * - * For the message format, see krb_mk_req(). - * - * Mutual authentication is not implemented. - */ - -int -krb_rd_req(authent,service,instance,from_addr,ad,fn) - register KTEXT authent; /* The received message */ - char *service; /* Service name */ - char *instance; /* Service instance */ - long from_addr; /* Net address of originating host */ - AUTH_DAT *ad; /* Structure to be filled in */ - char *fn; /* Filename to get keys from */ -{ - static KTEXT_ST ticket; /* Temp storage for ticket */ - static KTEXT tkt = &ticket; - static KTEXT_ST req_id_st; /* Temp storage for authenticator */ - register KTEXT req_id = &req_id_st; - - char realm[REALM_SZ]; /* Realm of issuing kerberos */ - static Key_schedule seskey_sched; /* Key sched for session key */ - unsigned char skey[KKEY_SZ]; /* Session key from ticket */ - char sname[SNAME_SZ]; /* Service name from ticket */ - char iname[INST_SZ]; /* Instance name from ticket */ - char r_aname[ANAME_SZ]; /* Client name from authenticator */ - char r_inst[INST_SZ]; /* Client instance from authenticator */ - char r_realm[REALM_SZ]; /* Client realm from authenticator */ - unsigned int r_time_ms; /* Fine time from authenticator */ - unsigned long r_time_sec; /* Coarse time from authenticator */ - register char *ptr; /* For stepping through */ - unsigned long delta_t; /* Time in authenticator - local time */ - long tkt_age; /* Age of ticket */ - static int swap_bytes; /* Need to swap bytes? */ - static int mutual; /* Mutual authentication requested? */ - static unsigned char s_kvno;/* Version number of the server's key - * Kerberos used to encrypt ticket */ - int status; - - if (authent->length <= 0) - return(RD_AP_MODIFIED); - - ptr = (char *) authent->dat; - - /* get msg version, type and byte order, and server key version */ - - /* check version */ - if (KRB_PROT_VERSION != (unsigned int) *ptr++) - return(RD_AP_VERSION); - - /* byte order */ - swap_bytes = 0; - if ((*ptr & 1) != HOST_BYTE_ORDER) - swap_bytes++; - - /* check msg type */ - mutual = 0; - switch (*ptr++ & ~1) { - case AUTH_MSG_APPL_REQUEST: - break; - case AUTH_MSG_APPL_REQUEST_MUTUAL: - mutual++; - break; - default: - return(RD_AP_MSG_TYPE); - } - -#ifdef lint - /* XXX mutual is set but not used; why??? */ - /* this is a crock to get lint to shut up */ - if (mutual) - mutual = 0; -#endif /* lint */ - s_kvno = *ptr++; /* get server key version */ - (void) strcpy(realm,ptr); /* And the realm of the issuing KDC */ - ptr += strlen(ptr) + 1; /* skip the realm "hint" */ - - /* - * If "fn" is NULL, key info should already be set; don't - * bother with ticket file. Otherwise, check to see if we - * already have key info for the given server and key version - * (saved in the static st_* variables). If not, go get it - * from the ticket file. If "fn" is the null string, use the - * default ticket file. - */ - if (fn && (strcmp(st_nam,service) || strcmp(st_inst,instance) || - strcmp(st_rlm,realm) || (st_kvno != s_kvno))) { - if (*fn == 0) fn = KEYFILE; - st_kvno = s_kvno; -#ifndef NOENCRYPTION - if (read_service_key(service,instance,realm,s_kvno,fn,(char *)skey)) - return(RD_AP_UNDEC); - if ((status=krb_set_key((char *)skey,0))) return(status); -#endif - (void) strcpy(st_rlm,realm); - (void) strcpy(st_nam,service); - (void) strcpy(st_inst,instance); - } - - /* Get ticket from authenticator */ - tkt->length = (int) *ptr++; - if ((tkt->length + (ptr+1 - (char *) authent->dat)) > authent->length) - return(RD_AP_MODIFIED); - bcopy(ptr+1,(char *)(tkt->dat),tkt->length); - - if (krb_ap_req_debug) - log("ticket->length: %d",tkt->length); - -#ifndef NOENCRYPTION - /* Decrypt and take apart ticket */ -#endif - - if (decomp_ticket(tkt,&ad->k_flags,ad->pname,ad->pinst,ad->prealm, - &(ad->address),ad->session, &(ad->life), - &(ad->time_sec),sname,iname,ky,serv_key)) - return(RD_AP_UNDEC); - - if (krb_ap_req_debug) { - log("Ticket Contents."); - log(" Aname: %s.%s",ad->pname, - ((int)*(ad->prealm) ? ad->prealm : "Athena")); - log(" Service: %s%s%s",sname,((int)*iname ? "." : ""),iname); - } - - /* Extract the authenticator */ - req_id->length = (int) *(ptr++); - if ((req_id->length + (ptr + tkt->length - (char *) authent->dat)) > - authent->length) - return(RD_AP_MODIFIED); - bcopy(ptr + tkt->length, (char *)(req_id->dat),req_id->length); - -#ifndef NOENCRYPTION - key_sched((C_Block *)ad->session,seskey_sched); - pcbc_encrypt((C_Block *)req_id->dat,(C_Block *)req_id->dat, - (long)req_id->length,seskey_sched,(C_Block *)ad->session,DES_DECRYPT); -#endif /* NOENCRYPTION */ - -#define check_ptr() if ((ptr - (char *) req_id->dat) > req_id->length) return(RD_AP_MODIFIED); - - ptr = (char *) req_id->dat; - (void) strcpy(r_aname,ptr); /* Authentication name */ - ptr += strlen(r_aname)+1; - check_ptr(); - (void) strcpy(r_inst,ptr); /* Authentication instance */ - ptr += strlen(r_inst)+1; - check_ptr(); - (void) strcpy(r_realm,ptr); /* Authentication name */ - ptr += strlen(r_realm)+1; - check_ptr(); - bcopy(ptr,(char *)&ad->checksum,4); /* Checksum */ - ptr += 4; - check_ptr(); - if (swap_bytes) swap_u_long(ad->checksum); - r_time_ms = *(ptr++); /* Time (fine) */ -#ifdef lint - /* XXX r_time_ms is set but not used. why??? */ - /* this is a crock to get lint to shut up */ - if (r_time_ms) - r_time_ms = 0; -#endif /* lint */ - check_ptr(); - /* assume sizeof(r_time_sec) == 4 ?? */ - bcopy(ptr,(char *)&r_time_sec,4); /* Time (coarse) */ - if (swap_bytes) swap_u_long(r_time_sec); - - /* Check for authenticity of the request */ - if (krb_ap_req_debug) - log("Pname: %s %s",ad->pname,r_aname); - if (strcmp(ad->pname,r_aname) != 0) - return(RD_AP_INCON); - if (strcmp(ad->pinst,r_inst) != 0) - return(RD_AP_INCON); - if (krb_ap_req_debug) - log("Realm: %s %s",ad->prealm,r_realm); - if ((strcmp(ad->prealm,r_realm) != 0)) - return(RD_AP_INCON); - - if (krb_ap_req_debug) - log("Address: %d %d",ad->address,from_addr); - if (from_addr && (ad->address != from_addr)) - return(RD_AP_BADD); - - (void) gettimeofday(&t_local,(struct timezone *) 0); - delta_t = abs((int)(t_local.tv_sec - r_time_sec)); - if (delta_t > CLOCK_SKEW) { - if (krb_ap_req_debug) - log("Time out of range: %d - %d = %d", - t_local.tv_sec,r_time_sec,delta_t); - return(RD_AP_TIME); - } - - /* Now check for expiration of ticket */ - - tkt_age = t_local.tv_sec - ad->time_sec; - if (krb_ap_req_debug) - log("Time: %d Issue Date: %d Diff: %d Life %x", - t_local.tv_sec,ad->time_sec,tkt_age,ad->life); - - if (t_local.tv_sec < ad->time_sec) { - if ((ad->time_sec - t_local.tv_sec) > CLOCK_SKEW) - return(RD_AP_NYV); - } - else if ((t_local.tv_sec - ad->time_sec) > 5 * 60 * ad->life) - return(RD_AP_EXP); - - /* All seems OK */ - ad->reply.length = 0; - - return(RD_AP_OK); -} diff --git a/eBones/lib/libkrb/rd_safe.c b/eBones/lib/libkrb/rd_safe.c deleted file mode 100644 index 4d3e8d6735aeb..0000000000000 --- a/eBones/lib/libkrb/rd_safe.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine dissects a a Kerberos 'safe msg', checking its - * integrity, and returning a pointer to the application data - * contained and its length. - * - * Returns 0 (RD_AP_OK) for success or an error code (RD_AP_...) - * - * Steve Miller Project Athena MIT/DEC - * - * from: rd_safe.c,v 4.12 89/01/23 15:16:16 steiner Exp $ - * $Id: rd_safe.c,v 1.3 1995/07/18 16:39:34 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: rd_safe.c,v 1.3 1995/07/18 16:39:34 mark Exp $"; -#endif /* lint */ -#endif - -/* system include files */ -#include -#include -#include -#include -#include -#include - -/* application include files */ -#include -#include -#include -#include "lsb_addr_comp.h" - -extern char *errmsg(); -extern int errno; -extern int krb_debug; - -/* static storage */ - -static C_Block calc_cksum[2]; -static C_Block big_cksum[2]; -static int swap_bytes; -static struct timeval local_time; -static u_long delta_t; - -/* - * krb_rd_safe() checks the integrity of an AUTH_MSG_SAFE message. - * Given the message received, "in", the length of that message, - * "in_length", the "key" to compute the checksum with, and the - * network addresses of the "sender" and "receiver" of the message, - * krb_rd_safe() returns RD_AP_OK if message is okay, otherwise - * some error code. - * - * The message data retrieved from "in" is returned in the structure - * "m_data". The pointer to the application data (m_data->app_data) - * refers back to the appropriate place in "in". - * - * See the file "mk_safe.c" for the format of the AUTH_MSG_SAFE - * message. The structure containing the extracted message - * information, MSG_DAT, is defined in "krb.h". - */ - -long krb_rd_safe(in,in_length,key,sender,receiver,m_data) - u_char *in; /* pointer to the msg received */ - u_long in_length; /* length of "in" msg */ - C_Block *key; /* encryption key for seed and ivec */ - struct sockaddr_in *sender; /* sender's address */ - struct sockaddr_in *receiver; /* receiver's address -- me */ - MSG_DAT *m_data; /* where to put message information */ -{ - register u_char *p,*q; - static u_long src_addr; /* Can't send structs since no - * guarantees on size */ - /* Be very conservative */ - if (sizeof(u_long) != sizeof(struct in_addr)) { - fprintf(stderr,"\n\ -krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)"); - exit(-1); - } - - if (gettimeofday(&local_time,(struct timezone *)0)) - return -1; - - p = in; /* beginning of message */ - swap_bytes = 0; - - if (*p++ != KRB_PROT_VERSION) return RD_AP_VERSION; - if (((*p) & ~1) != AUTH_MSG_SAFE) return RD_AP_MSG_TYPE; - if ((*p++ & 1) != HOST_BYTE_ORDER) swap_bytes++; - - q = p; /* mark start of cksum stuff */ - - /* safely get length */ - bcopy((char *)p,(char *)&(m_data->app_length), - sizeof(m_data->app_length)); - if (swap_bytes) swap_u_long(m_data->app_length); - p += sizeof(m_data->app_length); /* skip over */ - - if (m_data->app_length + sizeof(in_length) - + sizeof(m_data->time_sec) + sizeof(m_data->time_5ms) - + sizeof(big_cksum) + sizeof(src_addr) - + VERSION_SZ + MSG_TYPE_SZ > in_length) - return(RD_AP_MODIFIED); - - m_data->app_data = p; /* we're now at the application data */ - - /* skip app data */ - p += m_data->app_length; - - /* safely get time_5ms */ - bcopy((char *)p, (char *)&(m_data->time_5ms), - sizeof(m_data->time_5ms)); - - /* don't need to swap-- one byte for now */ - p += sizeof(m_data->time_5ms); - - /* safely get src address */ - bcopy((char *)p,(char *)&src_addr,sizeof(src_addr)); - - /* don't swap, net order always */ - p += sizeof(src_addr); - - if (src_addr != (u_long) sender->sin_addr.s_addr) - return RD_AP_MODIFIED; - - /* safely get time_sec */ - bcopy((char *)p, (char *)&(m_data->time_sec), - sizeof(m_data->time_sec)); - if (swap_bytes) - swap_u_long(m_data->time_sec); - p += sizeof(m_data->time_sec); - - /* check direction bit is the sign bit */ - /* For compatibility with broken old code, compares are done in VAX - byte order (LSBFIRST) */ - if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==-1) - /* src < recv */ - m_data->time_sec = - m_data->time_sec; - else if (lsb_net_ulong_less(sender->sin_addr.s_addr, - receiver->sin_addr.s_addr)==0) - if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1) - /* src < recv */ - m_data->time_sec = - m_data->time_sec; - - /* - * All that for one tiny bit! Heaven help those that talk to - * themselves. - */ - - /* check the time integrity of the msg */ - delta_t = abs((int)((long) local_time.tv_sec - m_data->time_sec)); - if (delta_t > CLOCK_SKEW) return RD_AP_TIME; - - /* - * caller must check timestamps for proper order and replays, since - * server might have multiple clients each with its own timestamps - * and we don't assume tightly synchronized clocks. - */ - - bcopy((char *)p,(char *)big_cksum,sizeof(big_cksum)); - if (swap_bytes) swap_u_16(big_cksum); - -#ifdef NOENCRYPTION - bzero(calc_cksum, sizeof(calc_cksum)); -#else - quad_cksum((C_Block *)q,calc_cksum,p-q,2,key); -#endif - - if (krb_debug) - printf("\ncalc_cksum = %lu, received cksum = %lu", - (long) calc_cksum[0], (long) big_cksum[0]); - if (bcmp((char *)big_cksum,(char *)calc_cksum,sizeof(big_cksum))) - return(RD_AP_MODIFIED); - - return(RD_AP_OK); /* OK == 0 */ -} diff --git a/eBones/lib/libkrb/read_service_key.c b/eBones/lib/libkrb/read_service_key.c deleted file mode 100644 index 6064292d96cfd..0000000000000 --- a/eBones/lib/libkrb/read_service_key.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: _service_key.c,v 4.10 90/03/10 19:06:56 jon Exp $ - * $Id: read_service_key.c,v 1.3 1995/07/18 16:39:36 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: read_service_key.c,v 1.3 1995/07/18 16:39:36 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include - -/* - * The private keys for servers on a given host are stored in a - * "srvtab" file (typically "/etc/srvtab"). This routine extracts - * a given server's key from the file. - * - * read_service_key() takes the server's name ("service"), "instance", - * and "realm" and a key version number "kvno", and looks in the given - * "file" for the corresponding entry, and if found, returns the entry's - * key field in "key". - * - * If "instance" contains the string "*", then it will match - * any instance, and the chosen instance will be copied to that - * string. For this reason it is important that the there is enough - * space beyond the "*" to receive the entry. - * - * If "kvno" is 0, it is treated as a wild card and the first - * matching entry regardless of the "vno" field is returned. - * - * This routine returns KSUCCESS on success, otherwise KFAILURE. - * - * The format of each "srvtab" entry is as follows: - * - * Size Variable Field in file - * ---- -------- ------------- - * string serv server name - * string inst server instance - * string realm server realm - * 1 byte vno server key version # - * 8 bytes key server's key - * ... ... ... - */ - - -/*ARGSUSED */ -int -read_service_key(service,instance,realm,kvno,file,key) - char *service; /* Service Name */ - char *instance; /* Instance name or "*" */ - char *realm; /* Realm */ - int kvno; /* Key version number */ - char *file; /* Filename */ - char *key; /* Pointer to key to be filled in */ -{ - char serv[SNAME_SZ]; - char inst[INST_SZ]; - char rlm[REALM_SZ]; - unsigned char vno; /* Key version number */ - int wcard; - - int stab, open(); - - if ((stab = open(file, 0, 0)) < NULL) - return(KFAILURE); - - wcard = (instance[0] == '*') && (instance[1] == '\0'); - - while(getst(stab,serv,SNAME_SZ) > 0) { /* Read sname */ - (void) getst(stab,inst,INST_SZ); /* Instance */ - (void) getst(stab,rlm,REALM_SZ); /* Realm */ - /* Vers number */ - if (read(stab,(char *)&vno,1) != 1) { - close(stab); - return(KFAILURE); - } - /* Key */ - if (read(stab,key,8) != 8) { - close(stab); - return(KFAILURE); - } - /* Is this the right service */ - if (strcmp(serv,service)) - continue; - /* How about instance */ - if (!wcard && strcmp(inst,instance)) - continue; - if (wcard) - (void) strncpy(instance,inst,INST_SZ); - /* Is this the right realm */ -#ifdef ATHENA_COMPAT - /* XXX For backward compatibility: if keyfile says "Athena" - and caller wants "ATHENA.MIT.EDU", call it a match */ - if (strcmp(rlm,realm) && - (strcmp(rlm,"Athena") || - strcmp(realm,"ATHENA.MIT.EDU"))) - continue; -#else /* ! ATHENA_COMPAT */ - if (strcmp(rlm,realm)) - continue; -#endif /* ATHENA_COMPAT */ - - /* How about the key version number */ - if (kvno && kvno != (int) vno) - continue; - - (void) close(stab); - return(KSUCCESS); - } - - /* Can't find the requested service */ - (void) close(stab); - return(KFAILURE); -} diff --git a/eBones/lib/libkrb/recvauth.c b/eBones/lib/libkrb/recvauth.c deleted file mode 100644 index 45d68ee750799..0000000000000 --- a/eBones/lib/libkrb/recvauth.c +++ /dev/null @@ -1,290 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: recvauth.c,v 4.4 90/03/10 19:03:08 jon Exp $"; - * $Id: recvauth.c,v 1.3 1995/07/18 16:39:38 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: recvauth.c,v 1.3 1995/07/18 16:39:38 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define KRB_SENDAUTH_VERS "AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN - chars */ - -/* - * If the protocol changes, you will need to change the version string - * and make appropriate changes in krb_sendauth.c - * be sure to support old versions of krb_sendauth! - */ - -extern int errno; - -/* - * krb_recvauth() reads (and optionally responds to) a message sent - * using krb_sendauth(). The "options" argument is a bit-field of - * selected options (see "sendauth.c" for options description). - * The only option relevant to krb_recvauth() is KOPT_DO_MUTUAL - * (mutual authentication requested). The "fd" argument supplies - * a file descriptor to read from (and write to, if mutual authenti- - * cation is requested). - * - * Part of the received message will be a Kerberos ticket sent by the - * client; this is read into the "ticket" argument. The "service" and - * "instance" arguments supply the server's Kerberos name. If the - * "instance" argument is the string "*", it is treated as a wild card - * and filled in during the krb_rd_req() call (see read_service_key()). - * - * The "faddr" and "laddr" give the sending (client) and receiving - * (local server) network addresses. ("laddr" may be left NULL unless - * mutual authentication is requested, in which case it must be set.) - * - * The authentication information extracted from the message is returned - * in "kdata". The "filename" argument indicates the file where the - * server's key can be found. (It is passed on to krb_rd_req().) If - * left null, the default "/etc/srvtab" will be used. - * - * If mutual authentication is requested, the session key schedule must - * be computed in order to reply; this schedule is returned in the - * "schedule" argument. A string containing the application version - * number from the received message is returned in "version", which - * should be large enough to hold a KRB_SENDAUTH_VLEN-character string. - * - * See krb_sendauth() for the format of the received client message. - * - * This routine supports another client format, for backward - * compatibility, consisting of: - * - * Size Variable Field - * ---- -------- ----- - * - * string tmp_buf, tkt_len length of ticket, in - * ascii - * - * char ' ' (space char) separator - * - * tkt_len ticket->dat the ticket - * - * This old-style version does not support mutual authentication. - * - * krb_recvauth() first reads the protocol version string from the - * given file descriptor. If it doesn't match the current protocol - * version (KRB_SENDAUTH_VERS), the old-style format is assumed. In - * that case, the string of characters up to the first space is read - * and interpreted as the ticket length, then the ticket is read. - * - * If the first string did match KRB_SENDAUTH_VERS, krb_recvauth() - * next reads the application protocol version string. Then the - * ticket length and ticket itself are read. - * - * The ticket is decrypted and checked by the call to krb_rd_req(). - * If no mutual authentication is required, the result of the - * krb_rd_req() call is retured by this routine. If mutual authenti- - * cation is required, a message in the following format is returned - * on "fd": - * - * Size Variable Field - * ---- -------- ----- - * - * 4 bytes tkt_len length of ticket or -1 - * if error occurred - * - * priv_len tmp_buf "private" message created - * by krb_mk_priv() which - * contains the incremented - * checksum sent by the client - * encrypted in the session - * key. (This field is not - * present in case of error.) - * - * If all goes well, KSUCCESS is returned; otherwise KFAILURE or some - * other error code is returned. - */ - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif /* max */ - -int -krb_recvauth(options, fd, ticket, service, instance, faddr, laddr, kdata, - filename, schedule, version) -long options; /* bit-pattern of options */ -int fd; /* file descr. to read from */ -KTEXT ticket; /* storage for client's ticket */ -char *service; /* service expected */ -char *instance; /* inst expected (may be filled in) */ -struct sockaddr_in *faddr; /* address of foreign host on fd */ -struct sockaddr_in *laddr; /* local address */ -AUTH_DAT *kdata; /* kerberos data (returned) */ -char *filename; /* name of file with service keys */ -Key_schedule schedule; /* key schedule (return) */ -char *version; /* version string (filled in) */ -{ - - int i, cc, old_vers = 0; - char krb_vers[KRB_SENDAUTH_VLEN + 1]; /* + 1 for the null terminator */ - char *cp; - int rem; - long tkt_len, priv_len; - u_long cksum; - u_char tmp_buf[MAX_KTXT_LEN+max(KRB_SENDAUTH_VLEN+1,21)]; - - /* read the protocol version number */ - if (krb_net_read(fd, krb_vers, KRB_SENDAUTH_VLEN) != - KRB_SENDAUTH_VLEN) - return(errno); - krb_vers[KRB_SENDAUTH_VLEN] = '\0'; - - /* check version string */ - if (strcmp(krb_vers,KRB_SENDAUTH_VERS)) { - /* Assume the old version of sendkerberosdata: send ascii - length, ' ', and ticket. */ - if (options & KOPT_DO_MUTUAL) - return(KFAILURE); /* XXX can't do old style with mutual auth */ - old_vers = 1; - - /* copy what we have read into tmp_buf */ - (void) bcopy(krb_vers, (char *) tmp_buf, KRB_SENDAUTH_VLEN); - - /* search for space, and make it a null */ - for (i = 0; i < KRB_SENDAUTH_VLEN; i++) - if (tmp_buf[i]== ' ') { - tmp_buf[i] = '\0'; - /* point cp to the beginning of the real ticket */ - cp = (char *) &tmp_buf[i+1]; - break; - } - - if (i == KRB_SENDAUTH_VLEN) - /* didn't find the space, keep reading to find it */ - for (; i<20; i++) { - if (read(fd, (char *)&tmp_buf[i], 1) != 1) { - return(KFAILURE); - } - if (tmp_buf[i] == ' ') { - tmp_buf[i] = '\0'; - /* point cp to the beginning of the real ticket */ - cp = (char *) &tmp_buf[i+1]; - break; - } - } - - tkt_len = (long) atoi((char *) tmp_buf); - - /* sanity check the length */ - if ((i==20)||(tkt_len<=0)||(tkt_len>MAX_KTXT_LEN)) - return(KFAILURE); - - if (i < KRB_SENDAUTH_VLEN) { - /* since we already got the space, and part of the ticket, - we read fewer bytes to get the rest of the ticket */ - if (krb_net_read(fd, (char *)(tmp_buf+KRB_SENDAUTH_VLEN), - (int) (tkt_len - KRB_SENDAUTH_VLEN + 1 + i)) - != (int)(tkt_len - KRB_SENDAUTH_VLEN + 1 + i)) - return(errno); - } else { - if (krb_net_read(fd, (char *)(tmp_buf+i), (int)tkt_len) != - (int) tkt_len) - return(errno); - } - ticket->length = tkt_len; - /* copy the ticket into the struct */ - (void) bcopy(cp, (char *) ticket->dat, ticket->length); - - } else { - /* read the application version string */ - if (krb_net_read(fd, version, KRB_SENDAUTH_VLEN) != - KRB_SENDAUTH_VLEN) - return(errno); - version[KRB_SENDAUTH_VLEN] = '\0'; - - /* get the length of the ticket */ - if (krb_net_read(fd, (char *)&tkt_len, sizeof(tkt_len)) != - sizeof(tkt_len)) - return(errno); - - /* sanity check */ - ticket->length = ntohl((unsigned long)tkt_len); - if ((ticket->length <= 0) || (ticket->length > MAX_KTXT_LEN)) { - if (options & KOPT_DO_MUTUAL) { - rem = KFAILURE; - goto mutual_fail; - } else - return(KFAILURE); /* XXX there may still be junk on the fd? */ - } - - /* read the ticket */ - if (krb_net_read(fd, (char *) ticket->dat, ticket->length) - != ticket->length) - return(errno); - } - /* - * now have the ticket. decrypt it to get the authenticated - * data. - */ - rem = krb_rd_req(ticket,service,instance,faddr->sin_addr.s_addr, - kdata,filename); - - if (old_vers) return(rem); /* XXX can't do mutual with old client */ - - /* if we are doing mutual auth, compose a response */ - if (options & KOPT_DO_MUTUAL) { - if (rem != KSUCCESS) - /* the krb_rd_req failed */ - goto mutual_fail; - - /* add one to the (formerly) sealed checksum, and re-seal it - for return to the client */ - cksum = kdata->checksum + 1; - cksum = htonl(cksum); -#ifndef NOENCRYPTION - key_sched((C_Block *)kdata->session,schedule); -#endif - priv_len = krb_mk_priv((unsigned char *)&cksum, - tmp_buf, - (unsigned long) sizeof(cksum), - schedule, - kdata->session, - laddr, - faddr); - if (priv_len < 0) { - /* re-sealing failed; notify the client */ - rem = KFAILURE; /* XXX */ -mutual_fail: - priv_len = -1; - tkt_len = htonl((unsigned long) priv_len); - /* a length of -1 is interpreted as an authentication - failure by the client */ - if ((cc = krb_net_write(fd, (char *)&tkt_len, sizeof(tkt_len))) - != sizeof(tkt_len)) - return(cc); - return(rem); - } else { - /* re-sealing succeeded, send the private message */ - tkt_len = htonl((unsigned long)priv_len); - if ((cc = krb_net_write(fd, (char *)&tkt_len, sizeof(tkt_len))) - != sizeof(tkt_len)) - return(cc); - if ((cc = krb_net_write(fd, (char *)tmp_buf, (int) priv_len)) - != (int) priv_len) - return(cc); - } - } - return(rem); -} diff --git a/eBones/lib/libkrb/save_credentials.c b/eBones/lib/libkrb/save_credentials.c deleted file mode 100644 index 268bb77a1c4da..0000000000000 --- a/eBones/lib/libkrb/save_credentials.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: save_credentials.c,v 4.9 89/05/31 17:45:43 jtkohl Exp $ - * $Id: save_credentials.c,v 1.3 1995/07/18 16:39:40 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: save_credentials.c,v 1.3 1995/07/18 16:39:40 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include - -/* - * This routine takes a ticket and associated info and calls - * tf_save_cred() to store them in the ticket cache. The peer - * routine for extracting a ticket and associated info from the - * ticket cache is krb_get_cred(). When changes are made to - * this routine, the corresponding changes should be made - * in krb_get_cred() as well. - * - * Returns KSUCCESS if all goes well, otherwise an error returned - * by the tf_init() or tf_save_cred() routines. - */ - -int -save_credentials(service, instance, realm, session, lifetime, kvno, - ticket, issue_date) - char *service; /* Service name */ - char *instance; /* Instance */ - char *realm; /* Auth domain */ - C_Block session; /* Session key */ - int lifetime; /* Lifetime */ - int kvno; /* Key version number */ - KTEXT ticket; /* The ticket itself */ - long issue_date; /* The issue time */ -{ - int tf_status; /* return values of the tf_util calls */ - - /* Open and lock the ticket file for writing */ - if ((tf_status = tf_init(TKT_FILE, W_TKT_FIL)) != KSUCCESS) - return(tf_status); - - /* Save credentials by appending to the ticket file */ - tf_status = tf_save_cred(service, instance, realm, session, - lifetime, kvno, ticket, issue_date); - (void) tf_close(); - return (tf_status); -} diff --git a/eBones/lib/libkrb/send_to_kdc.c b/eBones/lib/libkrb/send_to_kdc.c deleted file mode 100644 index 7f23a458703b2..0000000000000 --- a/eBones/lib/libkrb/send_to_kdc.c +++ /dev/null @@ -1,529 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: send_to_kdc.c,v 4.20 90/01/02 13:40:37 jtkohl Exp $ - * $Id$ - */ - -#if 0 -#ifndef lint -static char rcsid_send_to_kdc_c[] = -"$Id: send_to_kdc.c,v 1.1 1994/03/21 17:35:39 piero Exp "; -#endif /* lint */ -#endif - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#ifdef lint -#include /* struct iovec to make lint happy */ -#endif /* lint */ -#include -#include -#include -#include -#include -#include -#include -#include - -#define S_AD_SZ sizeof(struct sockaddr_in) - -/* Used for extracting addresses from routing messages */ -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) -#define ADVANCE(x, n) (x += ROUNDUP((n)->sin_len)) - -extern int errno; -extern int krb_debug; - -extern char *malloc(), *calloc(), *realloc(); - -int krb_udp_port = 0; - -static struct sockaddr_in local_addr = { S_AD_SZ, - AF_INET - }; - -/* CLIENT_KRB_TIMEOUT indicates the time to wait before - * retrying a server. It's defined in "krb.h". - */ -static struct timeval timeout = { CLIENT_KRB_TIMEOUT, 0}; -static char *prog = "send_to_kdc"; -static send_recv(); - -/* - * This file contains two routines, send_to_kdc() and send_recv(). - * send_recv() is a static routine used by send_to_kdc(). - */ - -/* - * send_to_kdc() sends a message to the Kerberos authentication - * server(s) in the given realm and returns the reply message. - * The "pkt" argument points to the message to be sent to Kerberos; - * the "rpkt" argument will be filled in with Kerberos' reply. - * The "realm" argument indicates the realm of the Kerberos server(s) - * to transact with. If the realm is null, the local realm is used. - * - * If more than one Kerberos server is known for a given realm, - * different servers will be queried until one of them replies. - * Several attempts (retries) are made for each server before - * giving up entirely. - * - * If an answer was received from a Kerberos host, KSUCCESS is - * returned. The following errors can be returned: - * - * SKDC_CANT - can't get local realm - * - can't find "kerberos" in /etc/services database - * - can't open socket - * - can't bind socket - * - all ports in use - * - couldn't find any Kerberos host - * - * SKDC_RETRY - couldn't get an answer from any Kerberos server, - * after several retries - */ - -int -send_to_kdc(pkt,rpkt,realm) - KTEXT pkt; - KTEXT rpkt; - char *realm; -{ - int i, f; - int no_host; /* was a kerberos host found? */ - int retry; - int n_hosts; - int retval; - int addr_count; - struct sockaddr_in to; - struct hostent *host, *hostlist; - char krbhst[MAX_HSTNM]; - char lrealm[REALM_SZ]; - - /* - * If "realm" is non-null, use that, otherwise get the - * local realm. - */ - if (realm) - (void) strcpy(lrealm, realm); - else - if (krb_get_lrealm(lrealm,1)) { - if (krb_debug) - fprintf(stderr, "%s: can't get local realm\n", prog); - return(SKDC_CANT); - } - if (krb_debug) - printf("lrealm is %s\n", lrealm); - if (krb_udp_port == 0) { - register struct servent *sp; - if ((sp = getservbyname("kerberos","udp")) == 0) { - if (krb_debug) - fprintf(stderr, "%s: Can't get kerberos/udp service\n", - prog); - return(SKDC_CANT); - } - krb_udp_port = sp->s_port; - if (krb_debug) - printf("krb_udp_port is %d\n", krb_udp_port); - } - bzero((char *)&to, S_AD_SZ); - hostlist = (struct hostent *) malloc(sizeof(struct hostent)); - if (!hostlist) - return (/*errno */SKDC_CANT); - if ((f = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - if (krb_debug) - fprintf(stderr,"%s: Can't open socket\n", prog); - return(SKDC_CANT); - } - /* from now on, exit through rtn label for cleanup */ - - no_host = 1; - /* get an initial allocation */ - n_hosts = 0; - for (i = 1; krb_get_krbhst(krbhst, lrealm, i) == KSUCCESS; ++i) { - if (krb_debug) { - printf("Getting host entry for %s...",krbhst); - (void) fflush(stdout); - } - host = gethostbyname(krbhst); - if (krb_debug) { - printf("%s.\n", - host ? "Got it" : "Didn't get it"); - (void) fflush(stdout); - } - if (!host) - continue; - no_host = 0; /* found at least one */ - n_hosts++; - /* - * Preserve host network addresses to check against later - */ - hostlist = (struct hostent *) - realloc((char *)hostlist, - (unsigned) - sizeof(struct hostent)*(n_hosts+1)); - if (!hostlist) { - fprintf(stderr, "Could not grow hostlist\n"); - return /*errno */SKDC_CANT; - } - bcopy((char *)host, (char *)&hostlist[n_hosts-1], - sizeof(struct hostent)); - host = &hostlist[n_hosts-1]; -/* At least Sun OS version 3.2 (or worse) and Ultrix version 2.2 - (or worse) only return one address ... */ -#if (defined(ULTRIX022) || (defined(SunOS) && SunOS < 40)) - { - char *cp = malloc((unsigned)host->h_length); - if (!cp) { - retval = /*errno */SKDC_CANT; - goto rtn; - } - bcopy((char *)host->h_addr, cp, host->h_length); - host->h_addr = cp; - } -#else /* !(ULTRIX022 || (SunOS < 40)) */ - /* - * Make a copy of the entire h_addr_list. - */ - { - char *addr; - char **old_addr_list; - addr_count = 0; - old_addr_list = host->h_addr_list; - while(old_addr_list[addr_count++]) - ; - host->h_addr_list = (char **)malloc(addr_count+1 * sizeof(char *)); - if (host->h_addr_list == NULL) { - fprintf(stderr, "Could not allocate host->h_addr_list\n"); - retval = SKDC_CANT; - goto rtn; - } - if (krb_debug) { - printf("h_length = %d\n", host->h_length); - printf("Number of addresses = %d\n", addr_count); - } - for (addr_count = 0; old_addr_list[addr_count]; addr_count++) { - if (krb_debug) - printf ("addr[%d] = %s\n", addr_count, - inet_ntoa(*(struct in_addr *)old_addr_list[addr_count])); - addr = (char *)malloc(host->h_length); - if (addr == NULL) { - fprintf(stderr, "Could not allocate address\n"); - retval = SKDC_CANT; - goto rtn; - } - bcopy(old_addr_list[addr_count], addr, host->h_length); - host->h_addr_list[addr_count] = addr; - } - host->h_addr_list[addr_count] = NULL; - } -#endif /* !(ULTRIX022 || (SunOS < 40)) */ - - bzero((char *)&hostlist[n_hosts], - sizeof(struct hostent)); - to.sin_family = host->h_addrtype; - bcopy(host->h_addr, (char *)&to.sin_addr, - host->h_length); - to.sin_port = krb_udp_port; - if ((retval = krb_bind_local_addr(f)) != KSUCCESS) { - fprintf(stderr, "krb_bind_local_addr: %s", krb_err_txt[retval]); - retval = SKDC_CANT; - goto rtn; - } - if (send_recv(pkt, rpkt, f, &to, hostlist)) { - retval = KSUCCESS; - goto rtn; - } - if (krb_debug) { - printf("Timeout, error, or wrong descriptor\n"); - (void) fflush(stdout); - } - } - if (no_host) { - if (krb_debug) - fprintf(stderr, "%s: can't find any Kerberos host.\n", prog); - retval = SKDC_CANT; - goto rtn; - } - /* - * retry each host in sequence. Some addresses may be unreachable - * from where we are, so loop through them as well. - */ - for (retry = 0; retry < CLIENT_KRB_RETRY; ++retry) { - for (host = hostlist; host->h_name != (char *)NULL; host++) { -#if (defined(ULTRIX022) || (defined(SunOS) && SunOS < 40)) - to.sin_family = host->h_addrtype; - bcopy(host->h_addr_list[addr_count], (char *)&to.sin_addr, - host->h_length); - if (send_recv(pkt, rpkt, f, &to, hostlist)) { - retval = KSUCCESS; - goto rtn; - } -#else /* !(ULTRIX022 || (SunOS < 40)) */ - for (addr_count = 0; host->h_addr_list[addr_count]; addr_count++) { - to.sin_family = host->h_addrtype; - bcopy(host->h_addr_list[addr_count], (char *)&to.sin_addr, - host->h_length); - if (send_recv(pkt, rpkt, f, &to, hostlist)) { - retval = KSUCCESS; - goto rtn; - } - } -#endif /* !(ULTRIX022 || (SunOS < 40)) */ - } - } - retval = SKDC_RETRY; -rtn: - (void) close(f); - if (hostlist) { - if(!no_host) { - register struct hostent *hp; - for (hp = hostlist; hp->h_name; hp++) -#if !(defined(ULTRIX022) || (defined(SunOS) && SunOS < 40)) - if (hp->h_addr_list) { -#endif /* ULTRIX022 || SunOS */ - if (hp->h_addr) - free(hp->h_addr); -#if !(defined(ULTRIX022) || (defined(SunOS) && SunOS < 40)) - free((char *)hp->h_addr_list); - } -#endif /* ULTRIX022 || SunOS */ - } - free((char *)hostlist); - } - return(retval); -} - -/* - * try to send out and receive message. - * return 1 on success, 0 on failure - */ - -static int -send_recv(pkt,rpkt,f,_to,addrs) - KTEXT pkt; - KTEXT rpkt; - int f; - struct sockaddr_in *_to; - struct hostent *addrs; -{ - fd_set readfds; - register struct hostent *hp; - struct sockaddr_in from; - int sin_size; - int numsent; - int addr_count; - - if (krb_debug) { - if (_to->sin_family == AF_INET) - printf("Sending message to %s...", - inet_ntoa(_to->sin_addr)); - else - printf("Sending message..."); - (void) fflush(stdout); - } - if ((numsent = sendto(f,(char *)(pkt->dat), pkt->length, 0, - (struct sockaddr *)_to, - S_AD_SZ)) != pkt->length) { - if (krb_debug) - printf("sent only %d/%d\n",numsent, pkt->length); - return 0; - } - if (krb_debug) { - printf("Sent\nWaiting for reply..."); - (void) fflush(stdout); - } - FD_ZERO(&readfds); - FD_SET(f, &readfds); - errno = 0; - /* select - either recv is ready, or timeout */ - /* see if timeout or error or wrong descriptor */ - if (select(f + 1, &readfds, (fd_set *)0, (fd_set *)0, &timeout) < 1 - || !FD_ISSET(f, &readfds)) { - if (krb_debug) { - fprintf(stderr, "select failed: readfds=%x", - readfds); - perror(""); - } - return 0; - } - sin_size = sizeof(from); - if (recvfrom(f, (char *)(rpkt->dat), sizeof(rpkt->dat), 0, - (struct sockaddr *)&from, &sin_size) - < 0) { - if (krb_debug) - perror("recvfrom"); - return 0; - } - if (krb_debug) { - printf("received packet from %s\n", inet_ntoa(from.sin_addr)); - fflush(stdout); - } -/* At least Sun OS version 3.2 (or worse) and Ultrix version 2.2 - (or worse) only return one address ... */ -#if (defined(ULTRIX022) || (defined(SunOS) && SunOS < 40)) - for (hp = addrs; hp->h_name != (char *)NULL; hp++) { - if (!bcmp(hp->h_addr, (char *)&from.sin_addr.s_addr, - hp->h_length)) { - if (krb_debug) { - printf("Received it\n"); - (void) fflush(stdout); - } - return 1; - } - if (krb_debug) - fprintf(stderr, "packet not from %s\n", - inet_ntoa(*(struct in_addr *)hp->h_addr)); - } -#else /* !(ULTRIX022 || (SunOS < 40)) */ - for (hp = addrs; hp->h_name != (char *)NULL; hp++) { - for (addr_count = 0; hp->h_addr_list[addr_count]; addr_count++) { - if (!bcmp(hp->h_addr_list[addr_count], - (char *)&from.sin_addr.s_addr, hp->h_length)) { - if (krb_debug) { - printf("Received it\n"); - (void) fflush(stdout); - } - return 1; - } - if (krb_debug) - fprintf(stderr, "packet not from %s\n", - inet_ntoa(*(struct in_addr *)hp->h_addr_list[addr_count])); - } - } -#endif /* !(ULTRIX022 || (SunOS < 40)) */ - if (krb_debug) - fprintf(stderr, "%s: received packet from wrong host! (%s)\n", - "send_to_kdc(send_rcv)", inet_ntoa(from.sin_addr)); - return 0; -} - - -static int -setfixedaddr(s) - int s; -{ - struct ifa_msghdr *ifa, *ifa0, *ifa_end; - struct sockaddr_in *cur_addr; - int tries; - int i; - u_long loopback; - int mib[6] = { CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, 0 }; - size_t len; - - /* Get information about our interfaces */ -#define NUMTRIES 10 - tries = 0; - -retry: - len = 0; - if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) { - perror("setfixedaddr: Can't get size of interface table: sysctl"); - return GT_LADDR_IFLIST; - } - ifa = (struct ifa_msghdr *)malloc(len); - if (!ifa) { - fprintf(stderr, "setfixedaddr: Cannot malloc\n"); - return (KFAILURE); - } - if (sysctl(mib, 6, ifa, &len, NULL, 0) < 0) { - free(ifa); - if (errno == ENOMEM && tries < NUMTRIES) { - /* Table grew between calls */ - tries++; - goto retry; - } - else { - perror("setfixedaddr: Can't get interface table: sysctl"); - return GT_LADDR_IFLIST; - } - } - loopback = inet_addr("127.0.0.1"); - - ifa0 = ifa; - for(ifa_end = (struct ifa_msghdr *)((caddr_t)ifa + len); - ifa < ifa_end; - (caddr_t)ifa += ifa->ifam_msglen) { - /* Ignore interface name messages and ensure we have an address */ - if (ifa->ifam_type == RTM_IFINFO || !(ifa->ifam_addrs & RTAX_IFA)) - continue; - cur_addr = (struct sockaddr_in *)(ifa + 1); - for (i = 0; i < RTAX_IFA; i++) { - if (ifa->ifam_addrs & (1 << i)) - ADVANCE((caddr_t)cur_addr, cur_addr); - } - if (cur_addr->sin_addr.s_addr != loopback) { - local_addr.sin_addr.s_addr = cur_addr->sin_addr.s_addr; - break; - } - } - free(ifa0); - if (ifa >= ifa_end) { - return GT_LADDR_NVI; - } - if (krb_debug) { - fprintf(stderr, "setfixedaddr: using local address %s\n", - inet_ntoa(local_addr.sin_addr)); - } - return (KSUCCESS); -} - -int -krb_bind_local_addr(s) - int s; -{ - int retval; - if (local_addr.sin_addr.s_addr == INADDR_ANY) { - /* - * We haven't determined the local interface to use - * for kerberos server interactions. Do so now. - */ - if ((retval = setfixedaddr(s)) != KSUCCESS) - return (retval); - } - if (bind(s, (struct sockaddr *)&local_addr, sizeof(local_addr)) < 0) { - perror("krb_bind_local_addr: bind"); - return BND_LADDR_BIND; - } - if (krb_debug) - printf("local_addr = %s\n", inet_ntoa(local_addr.sin_addr)); - return(KSUCCESS); -} - -int -krb_get_local_addr(returned_addr) - struct sockaddr_in *returned_addr; -{ - int retval; - if (local_addr.sin_addr.s_addr == INADDR_ANY) { - /* - * We haven't determined the local interface to use - * for kerberos server interactions. Do so now. - */ - int s; - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - return GT_LADDR_NOSOCK; - } - if ((retval = setfixedaddr(s)) != KSUCCESS) { - close(s); - return (retval); - } - close(s); - } - if (!returned_addr) - return(KFAILURE); - *returned_addr = local_addr; - if (krb_debug) - printf("local_addr = %s\n", inet_ntoa(local_addr.sin_addr)); - return (KSUCCESS); -} diff --git a/eBones/lib/libkrb/sendauth.c b/eBones/lib/libkrb/sendauth.c deleted file mode 100644 index a1d79e772bc06..0000000000000 --- a/eBones/lib/libkrb/sendauth.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: sendauth.c,v 4.6 90/03/10 23:18:28 jon Exp $ - * $Id: sendauth.c,v 1.3 1995/07/18 16:39:44 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: sendauth.c,v 1.3 1995/07/18 16:39:44 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include - -#define KRB_SENDAUTH_VERS "AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN chars */ -/* - * If the protocol changes, you will need to change the version string - * and make appropriate changes in krb_recvauth.c - */ - -extern int errno; - -extern char *krb_get_phost(); - -/* - * This file contains two routines: krb_sendauth() and krb_sendsrv(). - * - * krb_sendauth() transmits a ticket over a file descriptor for a - * desired service, instance, and realm, doing mutual authentication - * with the server if desired. - * - * krb_sendsvc() sends a service name to a remote knetd server. - */ - -/* - * The first argument to krb_sendauth() contains a bitfield of - * options (the options are defined in "krb.h"): - * - * KOPT_DONT_CANON Don't canonicalize instance as a hostname. - * (If this option is not chosen, krb_get_phost() - * is called to canonicalize it.) - * - * KOPT_DONT_MK_REQ Don't request server ticket from Kerberos. - * A ticket must be supplied in the "ticket" - * argument. - * (If this option is not chosen, and there - * is no ticket for the given server in the - * ticket cache, one will be fetched using - * krb_mk_req() and returned in "ticket".) - * - * KOPT_DO_MUTUAL Do mutual authentication, requiring that the - * receiving server return the checksum+1 encrypted - * in the session key. The mutual authentication - * is done using krb_mk_priv() on the other side - * (see "recvauth.c") and krb_rd_priv() on this - * side. - * - * The "fd" argument is a file descriptor to write to the remote - * server on. The "ticket" argument is used to store the new ticket - * from the krb_mk_req() call. If the KOPT_DONT_MK_REQ options is - * chosen, the ticket must be supplied in the "ticket" argument. - * The "service", "inst", and "realm" arguments identify the ticket. - * If "realm" is null, the local realm is used. - * - * The following arguments are only needed if the KOPT_DO_MUTUAL option - * is chosen: - * - * The "checksum" argument is a number that the server will add 1 to - * to authenticate itself back to the client; the "msg_data" argument - * holds the returned mutual-authentication message from the server - * (i.e., the checksum+1); the "cred" structure is used to hold the - * session key of the server, extracted from the ticket file, for use - * in decrypting the mutual authentication message from the server; - * and "schedule" holds the key schedule for that decryption. The - * the local and server addresses are given in "laddr" and "faddr". - * - * The application protocol version number (of up to KRB_SENDAUTH_VLEN - * characters) is passed in "version". - * - * If all goes well, KSUCCESS is returned, otherwise some error code. - * - * The format of the message sent to the server is: - * - * Size Variable Field - * ---- -------- ----- - * - * KRB_SENDAUTH_VLEN KRB_SENDAUTH_VER sendauth protocol - * bytes version number - * - * KRB_SENDAUTH_VLEN version application protocol - * bytes version number - * - * 4 bytes ticket->length length of ticket - * - * ticket->length ticket->dat ticket itself - */ - -/* - * XXX: Note that krb_rd_priv() is coded in such a way that - * "msg_data->app_data" will be pointing into "priv_buf", which - * will disappear when krb_sendauth() returns. - */ - -int -krb_sendauth(options, fd, ticket, service, inst, realm, checksum, - msg_data, cred, schedule, laddr, faddr, version) -long options; /* bit-pattern of options */ -int fd; /* file descriptor to write onto */ -KTEXT ticket; /* where to put ticket (return); or - * supplied in case of KOPT_DONT_MK_REQ */ -char *service, *inst, *realm; /* service name, instance, realm */ -u_long checksum; /* checksum to include in request */ -MSG_DAT *msg_data; /* mutual auth MSG_DAT (return) */ -CREDENTIALS *cred; /* credentials (return) */ -Key_schedule schedule; /* key schedule (return) */ -struct sockaddr_in *laddr; /* local address */ -struct sockaddr_in *faddr; /* address of foreign host on fd */ -char *version; /* version string */ -{ - int rem, i, cc; - char srv_inst[INST_SZ]; - char krb_realm[REALM_SZ]; - char buf[BUFSIZ]; - long tkt_len; - u_char priv_buf[1024]; - u_long cksum; - - rem=KSUCCESS; - - /* get current realm if not passed in */ - if (!realm) { - rem = krb_get_lrealm(krb_realm,1); - if (rem != KSUCCESS) - return(rem); - realm = krb_realm; - } - - /* copy instance into local storage, canonicalizing if desired */ - if (options & KOPT_DONT_CANON) - (void) strncpy(srv_inst, inst, INST_SZ); - else - (void) strncpy(srv_inst, krb_get_phost(inst), INST_SZ); - - /* get the ticket if desired */ - if (!(options & KOPT_DONT_MK_REQ)) { - rem = krb_mk_req(ticket, service, srv_inst, realm, checksum); - if (rem != KSUCCESS) - return(rem); - } - -#ifdef ATHENA_COMPAT - /* this is only for compatibility with old servers */ - if (options & KOPT_DO_OLDSTYLE) { - (void) sprintf(buf,"%d ",ticket->length); - (void) write(fd, buf, strlen(buf)); - (void) write(fd, (char *) ticket->dat, ticket->length); - return(rem); - } -#endif ATHENA_COMPAT - /* if mutual auth, get credentials so we have service session - keys for decryption below */ - if (options & KOPT_DO_MUTUAL) - if ((cc = krb_get_cred(service, srv_inst, realm, cred))) - return(cc); - - /* zero the buffer */ - (void) bzero(buf, BUFSIZ); - - /* insert version strings */ - (void) strncpy(buf, KRB_SENDAUTH_VERS, KRB_SENDAUTH_VLEN); - (void) strncpy(buf+KRB_SENDAUTH_VLEN, version, KRB_SENDAUTH_VLEN); - - /* increment past vers strings */ - i = 2*KRB_SENDAUTH_VLEN; - - /* put ticket length into buffer */ - tkt_len = htonl((unsigned long) ticket->length); - (void) bcopy((char *) &tkt_len, buf+i, sizeof(tkt_len)); - i += sizeof(tkt_len); - - /* put ticket into buffer */ - (void) bcopy((char *) ticket->dat, buf+i, ticket->length); - i += ticket->length; - - /* write the request to the server */ - if ((cc = krb_net_write(fd, buf, i)) != i) - return(cc); - - /* mutual authentication, if desired */ - if (options & KOPT_DO_MUTUAL) { - /* get the length of the reply */ - if (krb_net_read(fd, (char *) &tkt_len, sizeof(tkt_len)) != - sizeof(tkt_len)) - return(errno); - tkt_len = ntohl((unsigned long)tkt_len); - - /* if the length is negative, the server failed to recognize us. */ - if ((tkt_len < 0) || (tkt_len > sizeof(priv_buf))) - return(KFAILURE); /* XXX */ - /* read the reply... */ - if (krb_net_read(fd, (char *)priv_buf, (int) tkt_len) != (int) tkt_len) - return(errno); - - /* ...and decrypt it */ -#ifndef NOENCRYPTION - key_sched((C_Block *)cred->session,schedule); -#endif - if ((cc = krb_rd_priv(priv_buf,(unsigned long) tkt_len, schedule, - cred->session, faddr, laddr, msg_data))) - return(cc); - - /* fetch the (modified) checksum */ - (void) bcopy((char *)msg_data->app_data, (char *)&cksum, - sizeof(cksum)); - cksum = ntohl(cksum); - - /* if it doesn't match, fail */ - if (cksum != checksum + 1) - return(KFAILURE); /* XXX */ - } - return(KSUCCESS); -} - -#ifdef ATHENA_COMPAT -/* - * krb_sendsvc - */ - -int -krb_sendsvc(fd, service) -int fd; -char *service; -{ - /* write the service name length and then the service name to - the fd */ - long serv_length; - int cc; - - serv_length = htonl((unsigned long)strlen(service)); - if ((cc = krb_net_write(fd, (char *) &serv_length, - sizeof(serv_length))) - != sizeof(serv_length)) - return(cc); - if ((cc = krb_net_write(fd, service, strlen(service))) - != strlen(service)) - return(cc); - return(KSUCCESS); -} -#endif ATHENA_COMPAT diff --git a/eBones/lib/libkrb/stime.c b/eBones/lib/libkrb/stime.c deleted file mode 100644 index 2da246319eb73..0000000000000 --- a/eBones/lib/libkrb/stime.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: stime.c,v 4.5 88/11/15 16:58:05 jtkohl Exp $ - * $Id: stime.c,v 1.3 1995/07/18 16:39:46 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: stime.c,v 1.3 1995/07/18 16:39:46 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include /* for sprintf() */ - -/* - * Given a pointer to a long containing the number of seconds - * since the beginning of time (midnight 1 Jan 1970 GMT), return - * a string containing the local time in the form: - * - * "25-Jan-88 10:17:56" - */ - -char * -stime(t) - long *t; -{ - static char st_data[40]; - static char *st = st_data; - struct tm *tm; - char *month_sname(); - - tm = localtime(t); - (void) sprintf(st,"%2d-%s-%02d %02d:%02d:%02d",tm->tm_mday, - month_sname(tm->tm_mon + 1),tm->tm_year, - tm->tm_hour, tm->tm_min, tm->tm_sec); - return st; -} diff --git a/eBones/lib/libkrb/tf_shm.c b/eBones/lib/libkrb/tf_shm.c deleted file mode 100644 index 31894cb83983a..0000000000000 --- a/eBones/lib/libkrb/tf_shm.c +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Shared memory segment functions for session keys. Derived from code - * contributed by Dan Kolkowitz (kolk@jessica.stanford.edu). - * - * from: tf_shm.c,v 4.2 89/10/25 23:26:46 qjb Exp $ - * $Id: tf_shm.c,v 1.3 1995/07/18 16:39:48 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: tf_shm.c,v 1.3 1995/07/18 16:39:48 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAX_BUFF sizeof(des_cblock)*1000 /* room for 1k keys */ - -extern int errno; -extern int krb_debug; - -/* - * krb_create_shmtkt: - * - * create a shared memory segment for session keys, leaving its id - * in the specified filename. - */ - -int -krb_shm_create(file_name) -char *file_name; -{ - int retval; - int shmid; - struct shmid_ds shm_buf; - FILE *sfile; - uid_t me, metoo, getuid(), geteuid(); - - (void) krb_shm_dest(file_name); /* nuke it if it exists... - this cleans up to make sure we - don't slowly lose memory. */ - - shmid = shmget((long)IPC_PRIVATE,MAX_BUFF, IPC_CREAT); - if (shmid == -1) { - if (krb_debug) - perror("krb_shm_create shmget"); - return(KFAILURE); /* XXX */ - } - me = getuid(); - metoo = geteuid(); - /* - * now set up the buffer so that we can modify it - */ - shm_buf.shm_perm.uid = me; - shm_buf.shm_perm.gid = getgid(); - shm_buf.shm_perm.mode = 0600; - if (shmctl(shmid,IPC_SET,&shm_buf) < 0) { /*can now map it */ - if (krb_debug) - perror("krb_shm_create shmctl"); - (void) shmctl(shmid, IPC_RMID, 0); - return(KFAILURE); /* XXX */ - } - (void) shmctl(shmid, SHM_LOCK, 0); /* attempt to lock-in-core */ - /* arrange so the file is owned by the ruid - (swap real & effective uid if necessary). */ - if (me != metoo) { - if (setreuid(metoo, me) < 0) { - /* can't switch??? barf! */ - if (krb_debug) - perror("krb_shm_create: setreuid"); - (void) shmctl(shmid, IPC_RMID, 0); - return(KFAILURE); - } else - if (krb_debug) - printf("swapped UID's %d and %d\n",metoo,me); - } - if ((sfile = fopen(file_name,"w")) == 0) { - if (krb_debug) - perror("krb_shm_create file"); - (void) shmctl(shmid, IPC_RMID, 0); - return(KFAILURE); /* XXX */ - } - if (fchmod(fileno(sfile),0600) < 0) { - if (krb_debug) - perror("krb_shm_create fchmod"); - (void) shmctl(shmid, IPC_RMID, 0); - return(KFAILURE); /* XXX */ - } - if (me != metoo) { - if (setreuid(me, metoo) < 0) { - /* can't switch??? barf! */ - if (krb_debug) - perror("krb_shm_create: setreuid2"); - (void) shmctl(shmid, IPC_RMID, 0); - return(KFAILURE); - } else - if (krb_debug) - printf("swapped UID's %d and %d\n",me,metoo); - } - - (void) fprintf(sfile,"%d",shmid); - (void) fflush(sfile); - (void) fclose(sfile); - return(KSUCCESS); -} - - -/* - * krb_is_diskless: - * - * check / to see if file .diskless exists. If so it is diskless. - * Do it this way now to avoid dependencies on a particular routine. - * Choose root file system since that will be private to the client. - */ - -int krb_is_diskless() -{ - struct stat buf; - if (stat("/.diskless",&buf) < 0) - return(0); - else return(1); -} - -/* - * krb_shm_dest: destroy shared memory segment with session keys, and remove - * file pointing to it. - */ - -int krb_shm_dest(file) -char *file; -{ - int shmid; - FILE *sfile; - struct stat st_buf; - - if (stat(file,&st_buf) == 0) { - /* successful stat */ - if ((sfile = fopen(file,"r")) == 0) { - if (krb_debug) - perror("cannot open shared memory file"); - return(KFAILURE); /* XXX */ - } - if (fscanf(sfile,"%d",&shmid) == 1) { - if (shmctl(shmid,IPC_RMID,0) != 0) { - if (krb_debug) - perror("krb_shm_dest: cannot delete shm segment"); - (void) fclose(sfile); - return(KFAILURE); /* XXX */ - } - } else { - if (krb_debug) - fprintf(stderr, "bad format in shmid file\n"); - (void) fclose(sfile); - return(KFAILURE); /* XXX */ - } - (void) fclose(sfile); - (void) unlink(file); - return(KSUCCESS); - } else - return(RET_TKFIL); /* XXX */ -} - - - diff --git a/eBones/lib/libkrb/tf_util.3 b/eBones/lib/libkrb/tf_util.3 deleted file mode 100644 index ee6e436893299..0000000000000 --- a/eBones/lib/libkrb/tf_util.3 +++ /dev/null @@ -1,151 +0,0 @@ -.\" from: tf_util.3,v 4.2 89/04/25 17:17:11 jtkohl Exp $ -.\" $Id: tf_util.3,v 1.1.1.1 1994/09/30 14:50:08 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH TF_UTIL 3 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -tf_init, tf_get_pname, tf_get_pinst, tf_get_cred, tf_close \ -\- Routines for manipulating a Kerberos ticket file -.SH SYNOPSIS -.nf -.nj -.ft B -#include -.PP -.ft B -extern char *krb_err_txt[]; -.PP -.ft B -tf_init(tf_name, rw) -char *tf_name; -int rw; -.PP -.ft B -tf_get_pname(pname) -char *pname; -.PP -.ft B -tf_get_pinst(pinst) -char *pinst; -.PP -.ft B -tf_get_cred(c) -CREDENTIALS *c; -.PP -.ft B -tf_close() -.PP -.fi -.SH DESCRIPTION -This group of routines are provided to manipulate the Kerberos tickets -file. A ticket file has the following format: -.nf -.in +4 -.sp -principal's name (null-terminated string) -principal's instance (null-terminated string) -CREDENTIAL_1 -CREDENTIAL_2 - ... -CREDENTIAL_n -EOF -.sp -.in -4 -.LP -Where "CREDENTIAL_x" consists of the following fixed-length -fields from the CREDENTIALS structure (defined in ): -.nf -.sp -.in +4 - char service[ANAME_SZ] - char instance[INST_SZ] - char realm[REALM_SZ] - des_cblock session - int lifetime - int kvno - KTEXT_ST ticket_st - long issue_date -.in -4 -.sp -.fi -.PP -.I tf_init -must be called before the other ticket file -routines. -It takes the name of the ticket file to use, -and a read/write flag as arguments. -It tries to open the ticket file, checks the mode and if -everything is okay, locks the file. If it's opened for -reading, the lock is shared. If it's opened for writing, -the lock is exclusive. -KSUCCESS is returned if all went well, otherwise one of the -following: -.nf -.sp -NO_TKT_FIL - file wasn't there -TKT_FIL_ACC - file was in wrong mode, etc. -TKT_FIL_LCK - couldn't lock the file, even after a retry -.sp -.fi -.PP -The -.I tf_get_pname -reads the principal's name from a ticket file. -It should only be called after tf_init has been called. The -principal's name is filled into the -.I pname -parameter. If all goes -well, KSUCCESS is returned. -If tf_init wasn't called, TKT_FIL_INI -is returned. -If the principal's name was null, or EOF was encountered, or the -name was longer than ANAME_SZ, TKT_FIL_FMT is returned. -.PP -The -.I tf_get_pinst -reads the principal's instance from a ticket file. -It should only be called after tf_init and tf_get_pname -have been called. -The principal's instance is filled into the -.I pinst -parameter. -If all goes -well, KSUCCESS is returned. -If tf_init wasn't called, TKT_FIL_INI -is returned. -If EOF was encountered, or the -name was longer than INST_SZ, TKT_FIL_FMT is returned. -Note that, unlike the principal name, the instance name may be null. -.PP -The -.I tf_get_cred -routine reads a CREDENTIALS record from a ticket file and -fills in the given structure. -It should only be called after -tf_init, tf_get_pname, and tf_get_pinst have been called. -If all goes well, KSUCCESS is returned. Possible error codes -are: -.nf -.sp -TKT_FIL_INI - tf_init wasn't called first -TKT_FIL_FMT - bad format -EOF - end of file encountered -.sp -.fi -.PP -.I tf_close -closes the ticket file and releases the lock on it. -.SH "SEE ALSO" -krb(3) -.SH DIAGNOSTICS -.SH BUGS -The ticket file routines have to be called in a certain order. -.SH AUTHORS -Jennifer Steiner, MIT Project Athena -.br -Bill Bryant, MIT Project Athena -.SH RESTRICTIONS -Copyright 1987 Massachusetts Institute of Technology diff --git a/eBones/lib/libkrb/tf_util.c b/eBones/lib/libkrb/tf_util.c deleted file mode 100644 index e939c38e9da86..0000000000000 --- a/eBones/lib/libkrb/tf_util.c +++ /dev/null @@ -1,581 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: tf_util.c,v 4.9 90/03/10 19:19:45 jon Exp $ - * $Id: tf_util.c,v 1.3 1995/07/18 16:39:50 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: tf_util.c,v 1.3 1995/07/18 16:39:50 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef TKT_SHMEM -#include -#include -#include -#endif /* TKT_SHMEM */ - -#define TOO_BIG -1 -#define TF_LCK_RETRY ((unsigned)2) /* seconds to sleep before - * retry if ticket file is - * locked */ -extern int krb_debug; - -#ifdef TKT_SHMEM -char *krb_shm_addr = 0; -static char *tmp_shm_addr = 0; -static char krb_dummy_skey[8] = {0,0,0,0,0,0,0,0}; - -#endif /* TKT_SHMEM */ - -/* - * fd must be initialized to something that won't ever occur as a real - * file descriptor. Since open(2) returns only non-negative numbers as - * valid file descriptors, and tf_init always stuffs the return value - * from open in here even if it is an error flag, we must - * a. Initialize fd to a negative number, to indicate that it is - * not initially valid. - * b. When checking for a valid fd, assume that negative values - * are invalid (ie. when deciding whether tf_init has been - * called.) - * c. In tf_close, be sure it gets reinitialized to a negative - * number. - */ -static fd = -1; -static curpos; /* Position in tfbfr */ -static lastpos; /* End of tfbfr */ -static char tfbfr[BUFSIZ]; /* Buffer for ticket data */ - -static int tf_read(char *s, int n); -static int tf_gets(char *s, int n); - -/* - * This file contains routines for manipulating the ticket cache file. - * - * The ticket file is in the following format: - * - * principal's name (null-terminated string) - * principal's instance (null-terminated string) - * CREDENTIAL_1 - * CREDENTIAL_2 - * ... - * CREDENTIAL_n - * EOF - * - * Where "CREDENTIAL_x" consists of the following fixed-length - * fields from the CREDENTIALS structure (see "krb.h"): - * - * char service[ANAME_SZ] - * char instance[INST_SZ] - * char realm[REALM_SZ] - * C_Block session - * int lifetime - * int kvno - * KTEXT_ST ticket_st - * long issue_date - * - * Short description of routines: - * - * tf_init() opens the ticket file and locks it. - * - * tf_get_pname() returns the principal's name. - * - * tf_get_pinst() returns the principal's instance (may be null). - * - * tf_get_cred() returns the next CREDENTIALS record. - * - * tf_save_cred() appends a new CREDENTIAL record to the ticket file. - * - * tf_close() closes the ticket file and releases the lock. - * - * tf_gets() returns the next null-terminated string. It's an internal - * routine used by tf_get_pname(), tf_get_pinst(), and tf_get_cred(). - * - * tf_read() reads a given number of bytes. It's an internal routine - * used by tf_get_cred(). - */ - -/* - * tf_init() should be called before the other ticket file routines. - * It takes the name of the ticket file to use, "tf_name", and a - * read/write flag "rw" as arguments. - * - * It tries to open the ticket file, checks the mode, and if everything - * is okay, locks the file. If it's opened for reading, the lock is - * shared. If it's opened for writing, the lock is exclusive. - * - * Returns KSUCCESS if all went well, otherwise one of the following: - * - * NO_TKT_FIL - file wasn't there - * TKT_FIL_ACC - file was in wrong mode, etc. - * TKT_FIL_LCK - couldn't lock the file, even after a retry - */ - -int -tf_init(tf_name, rw) - char *tf_name; - int rw; -{ - int wflag; - uid_t me, getuid(); - struct stat stat_buf; -#ifdef TKT_SHMEM - char shmidname[MAXPATHLEN]; - FILE *sfp; - int shmid; -#endif - - switch (rw) { - case R_TKT_FIL: - wflag = 0; - break; - case W_TKT_FIL: - wflag = 1; - break; - default: - if (krb_debug) fprintf(stderr, "tf_init: illegal parameter\n"); - return TKT_FIL_ACC; - } - if (lstat(tf_name, &stat_buf) < 0) - switch (errno) { - case ENOENT: - return NO_TKT_FIL; - default: - return TKT_FIL_ACC; - } - me = getuid(); - if ((stat_buf.st_uid != me && me != 0) || - ((stat_buf.st_mode & S_IFMT) != S_IFREG)) - return TKT_FIL_ACC; -#ifdef TKT_SHMEM - (void) strcpy(shmidname, tf_name); - (void) strcat(shmidname, ".shm"); - if (stat(shmidname,&stat_buf) < 0) - return(TKT_FIL_ACC); - if ((stat_buf.st_uid != me && me != 0) || - ((stat_buf.st_mode & S_IFMT) != S_IFREG)) - return TKT_FIL_ACC; -#endif /* TKT_SHMEM */ - - /* - * If "wflag" is set, open the ticket file in append-writeonly mode - * and lock the ticket file in exclusive mode. If unable to lock - * the file, sleep and try again. If we fail again, return with the - * proper error message. - */ - - curpos = sizeof(tfbfr); - -#ifdef TKT_SHMEM - sfp = fopen(shmidname, "r"); /* only need read/write on the - actual tickets */ - if (sfp == 0) - return TKT_FIL_ACC; - shmid = -1; - { - char buf[BUFSIZ]; - int val; /* useful for debugging fscanf */ - /* We provide our own buffer here since some STDIO libraries - barf on unbuffered input with fscanf() */ - - setbuf(sfp, buf); - if ((val = fscanf(sfp,"%d",&shmid)) != 1) { - (void) fclose(sfp); - return TKT_FIL_ACC; - } - if (shmid < 0) { - (void) fclose(sfp); - return TKT_FIL_ACC; - } - (void) fclose(sfp); - } - /* - * global krb_shm_addr is initialized to 0. Ultrix bombs when you try and - * attach the same segment twice so we need this check. - */ - if (!krb_shm_addr) { - if ((krb_shm_addr = shmat(shmid,0,0)) == -1){ - if (krb_debug) - fprintf(stderr, - "cannot attach shared memory for segment %d\n", - shmid); - krb_shm_addr = 0; /* reset so we catch further errors */ - return TKT_FIL_ACC; - } - } - tmp_shm_addr = krb_shm_addr; -#endif /* TKT_SHMEM */ - - if (wflag) { - fd = open(tf_name, O_RDWR, 0600); - if (fd < 0) { - return TKT_FIL_ACC; - } - if (flock(fd, LOCK_EX | LOCK_NB) < 0) { - sleep(TF_LCK_RETRY); - if (flock(fd, LOCK_EX | LOCK_NB) < 0) { - (void) close(fd); - fd = -1; - return TKT_FIL_LCK; - } - } - return KSUCCESS; - } - /* - * Otherwise "wflag" is not set and the ticket file should be opened - * for read-only operations and locked for shared access. - */ - - fd = open(tf_name, O_RDONLY, 0600); - if (fd < 0) { - return TKT_FIL_ACC; - } - if (flock(fd, LOCK_SH | LOCK_NB) < 0) { - sleep(TF_LCK_RETRY); - if (flock(fd, LOCK_SH | LOCK_NB) < 0) { - (void) close(fd); - fd = -1; - return TKT_FIL_LCK; - } - } - return KSUCCESS; -} - -/* - * tf_get_pname() reads the principal's name from the ticket file. It - * should only be called after tf_init() has been called. The - * principal's name is filled into the "p" parameter. If all goes well, - * KSUCCESS is returned. If tf_init() wasn't called, TKT_FIL_INI is - * returned. If the name was null, or EOF was encountered, or the name - * was longer than ANAME_SZ, TKT_FIL_FMT is returned. - */ - -int -tf_get_pname(p) - char *p; -{ - if (fd < 0) { - if (krb_debug) - fprintf(stderr, "tf_get_pname called before tf_init.\n"); - return TKT_FIL_INI; - } - if (tf_gets(p, ANAME_SZ) < 2) /* can't be just a null */ - return TKT_FIL_FMT; - return KSUCCESS; -} - -/* - * tf_get_pinst() reads the principal's instance from a ticket file. - * It should only be called after tf_init() and tf_get_pname() have been - * called. The instance is filled into the "inst" parameter. If all - * goes well, KSUCCESS is returned. If tf_init() wasn't called, - * TKT_FIL_INI is returned. If EOF was encountered, or the instance - * was longer than ANAME_SZ, TKT_FIL_FMT is returned. Note that the - * instance may be null. - */ - -int -tf_get_pinst(inst) - char *inst; -{ - if (fd < 0) { - if (krb_debug) - fprintf(stderr, "tf_get_pinst called before tf_init.\n"); - return TKT_FIL_INI; - } - if (tf_gets(inst, INST_SZ) < 1) - return TKT_FIL_FMT; - return KSUCCESS; -} - -/* - * tf_get_cred() reads a CREDENTIALS record from a ticket file and fills - * in the given structure "c". It should only be called after tf_init(), - * tf_get_pname(), and tf_get_pinst() have been called. If all goes well, - * KSUCCESS is returned. Possible error codes are: - * - * TKT_FIL_INI - tf_init wasn't called first - * TKT_FIL_FMT - bad format - * EOF - end of file encountered - */ - -int -tf_get_cred(c) - CREDENTIALS *c; -{ - KTEXT ticket = &c->ticket_st; /* pointer to ticket */ - int k_errno; - - if (fd < 0) { - if (krb_debug) - fprintf(stderr, "tf_get_cred called before tf_init.\n"); - return TKT_FIL_INI; - } - if ((k_errno = tf_gets(c->service, SNAME_SZ)) < 2) - switch (k_errno) { - case TOO_BIG: - case 1: /* can't be just a null */ - tf_close(); - return TKT_FIL_FMT; - case 0: - return EOF; - } - if ((k_errno = tf_gets(c->instance, INST_SZ)) < 1) - switch (k_errno) { - case TOO_BIG: - return TKT_FIL_FMT; - case 0: - return EOF; - } - if ((k_errno = tf_gets(c->realm, REALM_SZ)) < 2) - switch (k_errno) { - case TOO_BIG: - case 1: /* can't be just a null */ - tf_close(); - return TKT_FIL_FMT; - case 0: - return EOF; - } - if ( - tf_read((char *) (c->session), KEY_SZ) < 1 || - tf_read((char *) &(c->lifetime), sizeof(c->lifetime)) < 1 || - tf_read((char *) &(c->kvno), sizeof(c->kvno)) < 1 || - tf_read((char *) &(ticket->length), sizeof(ticket->length)) - < 1 || - /* don't try to read a silly amount into ticket->dat */ - ticket->length > MAX_KTXT_LEN || - tf_read((char *) (ticket->dat), ticket->length) < 1 || - tf_read((char *) &(c->issue_date), sizeof(c->issue_date)) < 1 - ) { - tf_close(); - return TKT_FIL_FMT; - } -#ifdef TKT_SHMEM - bcopy(tmp_shm_addr,c->session,KEY_SZ); - tmp_shm_addr += KEY_SZ; -#endif /* TKT_SHMEM */ - return KSUCCESS; -} - -/* - * tf_close() closes the ticket file and sets "fd" to -1. If "fd" is - * not a valid file descriptor, it just returns. It also clears the - * buffer used to read tickets. - * - * The return value is not defined. - */ - -void -tf_close() -{ - if (!(fd < 0)) { -#ifdef TKT_SHMEM - if (shmdt(krb_shm_addr)) { - /* what kind of error? */ - if (krb_debug) - fprintf(stderr, "shmdt 0x%x: errno %d",krb_shm_addr, errno); - } else { - krb_shm_addr = 0; - } -#endif TKT_SHMEM - (void) flock(fd, LOCK_UN); - (void) close(fd); - fd = -1; /* see declaration of fd above */ - } - bzero(tfbfr, sizeof(tfbfr)); -} - -/* - * tf_gets() is an internal routine. It takes a string "s" and a count - * "n", and reads from the file until either it has read "n" characters, - * or until it reads a null byte. When finished, what has been read exists - * in "s". If it encounters EOF or an error, it closes the ticket file. - * - * Possible return values are: - * - * n the number of bytes read (including null terminator) - * when all goes well - * - * 0 end of file or read error - * - * TOO_BIG if "count" characters are read and no null is - * encountered. This is an indication that the ticket - * file is seriously ill. - */ - -static int -tf_gets(s, n) - register char *s; - int n; -{ - register count; - - if (fd < 0) { - if (krb_debug) - fprintf(stderr, "tf_gets called before tf_init.\n"); - return TKT_FIL_INI; - } - for (count = n - 1; count > 0; --count) { - if (curpos >= sizeof(tfbfr)) { - lastpos = read(fd, tfbfr, sizeof(tfbfr)); - curpos = 0; - } - if (curpos == lastpos) { - tf_close(); - return 0; - } - *s = tfbfr[curpos++]; - if (*s++ == '\0') - return (n - count); - } - tf_close(); - return TOO_BIG; -} - -/* - * tf_read() is an internal routine. It takes a string "s" and a count - * "n", and reads from the file until "n" bytes have been read. When - * finished, what has been read exists in "s". If it encounters EOF or - * an error, it closes the ticket file. - * - * Possible return values are: - * - * n the number of bytes read when all goes well - * - * 0 on end of file or read error - */ - -static int -tf_read(s, n) - register char *s; - register int n; -{ - register count; - - for (count = n; count > 0; --count) { - if (curpos >= sizeof(tfbfr)) { - lastpos = read(fd, tfbfr, sizeof(tfbfr)); - curpos = 0; - } - if (curpos == lastpos) { - tf_close(); - return 0; - } - *s++ = tfbfr[curpos++]; - } - return n; -} - -/* - * tf_save_cred() appends an incoming ticket to the end of the ticket - * file. You must call tf_init() before calling tf_save_cred(). - * - * The "service", "instance", and "realm" arguments specify the - * server's name; "session" contains the session key to be used with - * the ticket; "kvno" is the server key version number in which the - * ticket is encrypted, "ticket" contains the actual ticket, and - * "issue_date" is the time the ticket was requested (local host's time). - * - * Returns KSUCCESS if all goes well, TKT_FIL_INI if tf_init() wasn't - * called previously, and KFAILURE for anything else that went wrong. - */ - -int -tf_save_cred(service, instance, realm, session, lifetime, kvno, - ticket, issue_date) - char *service; /* Service name */ - char *instance; /* Instance */ - char *realm; /* Auth domain */ - C_Block session; /* Session key */ - int lifetime; /* Lifetime */ - int kvno; /* Key version number */ - KTEXT ticket; /* The ticket itself */ - long issue_date; /* The issue time */ -{ - - off_t lseek(); - int count; /* count for write */ -#ifdef TKT_SHMEM - int *skey_check; -#endif /* TKT_SHMEM */ - - if (fd < 0) { /* fd is ticket file as set by tf_init */ - if (krb_debug) - fprintf(stderr, "tf_save_cred called before tf_init.\n"); - return TKT_FIL_INI; - } - /* Find the end of the ticket file */ - (void) lseek(fd, 0L, 2); -#ifdef TKT_SHMEM - /* scan to end of existing keys: pick first 'empty' slot. - we assume that no real keys will be completely zero (it's a weak - key under DES) */ - - skey_check = (int *) krb_shm_addr; - - while (*skey_check && *(skey_check+1)) - skey_check += 2; - tmp_shm_addr = (char *)skey_check; -#endif /* TKT_SHMEM */ - - /* Write the ticket and associated data */ - /* Service */ - count = strlen(service) + 1; - if (write(fd, service, count) != count) - goto bad; - /* Instance */ - count = strlen(instance) + 1; - if (write(fd, instance, count) != count) - goto bad; - /* Realm */ - count = strlen(realm) + 1; - if (write(fd, realm, count) != count) - goto bad; - /* Session key */ -#ifdef TKT_SHMEM - bcopy(session,tmp_shm_addr,8); - tmp_shm_addr+=8; - if (write(fd,krb_dummy_skey,8) != 8) - goto bad; -#else /* ! TKT_SHMEM */ - if (write(fd, (char *) session, 8) != 8) - goto bad; -#endif /* TKT_SHMEM */ - /* Lifetime */ - if (write(fd, (char *) &lifetime, sizeof(int)) != sizeof(int)) - goto bad; - /* Key vno */ - if (write(fd, (char *) &kvno, sizeof(int)) != sizeof(int)) - goto bad; - /* Tkt length */ - if (write(fd, (char *) &(ticket->length), sizeof(int)) != - sizeof(int)) - goto bad; - /* Ticket */ - count = ticket->length; - if (write(fd, (char *) (ticket->dat), count) != count) - goto bad; - /* Issue date */ - if (write(fd, (char *) &issue_date, sizeof(long)) - != sizeof(long)) - goto bad; - - /* Actually, we should check each write for success */ - return (KSUCCESS); -bad: - return (KFAILURE); -} diff --git a/eBones/lib/libkrb/tkt_string.c b/eBones/lib/libkrb/tkt_string.c deleted file mode 100644 index d944833a33aa6..0000000000000 --- a/eBones/lib/libkrb/tkt_string.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: tkt_string.c,v 4.6 89/01/05 12:31:51 raeburn Exp $ - * $Id: tkt_string.c,v 1.3 1995/07/18 16:39:52 mark Exp $ - */ - -#if 0 -#ifndef lint -static char *rcsid = -"$Id: tkt_string.c,v 1.3 1995/07/18 16:39:52 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include -#include - -/* - * This routine is used to generate the name of the file that holds - * the user's cache of server tickets and associated session keys. - * - * If it is set, krb_ticket_string contains the ticket file name. - * Otherwise, the filename is constructed as follows: - * - * If it is set, the environment variable "KRBTKFILE" will be used as - * the ticket file name. Otherwise TKT_ROOT (defined in "krb.h") and - * the user's uid are concatenated to produce the ticket file name - * (e.g., "/tmp/tkt123"). A pointer to the string containing the ticket - * file name is returned. - */ - -static char krb_ticket_string[MAXPATHLEN] = ""; - -char *tkt_string() -{ - char *env; - uid_t getuid(); - - if (!*krb_ticket_string) { - if ((env = getenv("KRBTKFILE"))) { - (void) strncpy(krb_ticket_string, env, - sizeof(krb_ticket_string)-1); - krb_ticket_string[sizeof(krb_ticket_string)-1] = '\0'; - } else { - /* 32 bits of signed integer will always fit in 11 characters - (including the sign), so no need to worry about overflow */ - (void) sprintf(krb_ticket_string, "%s%ld",TKT_ROOT,getuid()); - } - } - return krb_ticket_string; -} - -/* - * This routine is used to set the name of the file that holds the user's - * cache of server tickets and associated session keys. - * - * The value passed in is copied into local storage. - * - * NOTE: This routine should be called during initialization, before other - * Kerberos routines are called; otherwise tkt_string() above may be called - * and return an undesired ticket file name until this routine is called. - */ - -void -krb_set_tkt_string(val) -char *val; -{ - - (void) strncpy(krb_ticket_string, val, sizeof(krb_ticket_string)-1); - krb_ticket_string[sizeof(krb_ticket_string)-1] = '\0'; - - return; -} diff --git a/eBones/lib/libkrb/util.c b/eBones/lib/libkrb/util.c deleted file mode 100644 index 68c0dbc1eb4b8..0000000000000 --- a/eBones/lib/libkrb/util.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Miscellaneous debug printing utilities - * - * from: util.c,v 4.8 89/01/17 22:02:08 wesommer Exp $ - * $Id: util.c,v 1.3 1995/07/18 16:39:54 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: util.c,v 1.3 1995/07/18 16:39:54 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include - -/* - * Print some of the contents of the given authenticator structure - * (AUTH_DAT defined in "krb.h"). Fields printed are: - * - * pname, pinst, prealm, netaddr, flags, cksum, timestamp, session - */ - -void -ad_print(x) -AUTH_DAT *x; -{ - struct in_addr in; - - /* Print the contents of an auth_dat struct. */ - in.s_addr = x->address; - printf("\n%s %s %s %s flags %u cksum 0x%lX\n\ttkt_tm 0x%lX sess_key", - x->pname, x->pinst, x->prealm, inet_ntoa(in), x->k_flags, - x->checksum, x->time_sec); - - printf("[8] ="); -#ifdef NOENCRYPTION - placebo_cblock_print(x->session); -#else - des_cblock_print_file((C_Block *)x->session,stdout); -#endif - /* skip reply for now */ -} - -/* - * Print in hex the 8 bytes of the given session key. - * - * Printed format is: " 0x { x, x, x, x, x, x, x, x }" - */ - -#ifdef NOENCRYPTION -placebo_cblock_print(x) - des_cblock x; -{ - unsigned char *y = (unsigned char *) x; - register int i = 0; - - printf(" 0x { "); - - while (i++ <8) { - printf("%x",*y++); - if (i<8) printf(", "); - } - printf(" }"); -} -#endif diff --git a/eBones/lib/librkinit/Makefile b/eBones/lib/librkinit/Makefile deleted file mode 100644 index 29ee4401b5972..0000000000000 --- a/eBones/lib/librkinit/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 - -LIB= rkinit -CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -I${RKINITOBJDIR} -SRCS= rkinit_err.c rk_lib.c rk_rpc.c rk_util.c rk_krb.c - -LDADD+= -lcom_err - -beforeinstall: - -cd ${.OBJDIR}; cmp -s rkinit_err.h \ - ${DESTDIR}/usr/include/kerberosIV/rkinit_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 rkinit_err.h \ - ${DESTDIR}/usr/include/kerberosIV - -MAN3= rkinit.3 - -.include - -rkinit_err.c: ${RKINITOBJDIR}/rkinit_err.h diff --git a/eBones/lib/librkinit/rk_krb.c b/eBones/lib/librkinit/rk_krb.c deleted file mode 100644 index ad8a6537b2d45..0000000000000 --- a/eBones/lib/librkinit/rk_krb.c +++ /dev/null @@ -1,316 +0,0 @@ -/* - * $Id: rk_krb.c,v 1.1 1993/12/10 19:36:09 dglo Exp gibbs $ - * $Source: /usr/src/eBones/librkinit/RCS/rk_krb.c,v $ - * $Author: dglo $ - * - * This file contains the kerberos parts of the rkinit library. - * See the comment at the top of rk_lib.c for a description of the naming - * conventions used within the rkinit library. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rk_krb.c,v 1.1 1993/12/10 19:36:09 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef POSIX -#include -#else -#include -#endif - -#include -#include -#include - -static jmp_buf env; -static void sig_restore(); -static void push_signals(); -static void pop_signals(); - -/* Information to be passed around within client get_in_tkt */ -typedef struct { - KTEXT scip; /* Server KDC packet */ - char *username; - char *host; -} rkinit_intkt_info; - -static char errbuf[BUFSIZ]; - -/* The compiler complains if this is declared static. */ -#ifdef __STDC__ -int rki_key_proc(char *user, char *instance, char *realm, char *arg, - des_cblock *key) -#else -int rki_key_proc(user, instance, realm, arg, key) - char *user; - char *instance; - char *realm; - char *arg; - des_cblock *key; -#endif /* __STDC__ */ - -{ - rkinit_intkt_info *rii = (rkinit_intkt_info *)arg; - char password[BUFSIZ]; - int ok = 0; -#ifdef POSIX - struct termios ttyb; -#else - struct sgttyb ttyb; /* For turning off echo */ -#endif - - SBCLEAR(ttyb); - BCLEAR(password); - - /* - * If the username does not match the aname in the ticket, - * we will print that too. Otherwise, we won't. - */ - - printf("Kerberos initialization (%s)", rii->host); - if (strcmp(rii->username, user)) - printf(": tickets will be owned by %s", rii->username); - - printf("\nPassword for %s%s%s@%s: ", user, - (instance[0]) ? "." : "", instance, realm); - - fflush(stdout); - - push_signals(); - if (setjmp(env)) { - ok = -1; - goto lose; - } - -#ifndef POSIX - ioctl(0, TIOCGETP, &ttyb); - ttyb.sg_flags &= ~ECHO; - ioctl(0, TIOCSETP, &ttyb); -#else - (void) tcgetattr(0, &ttyb); - ttyb.c_lflag &= ~ECHO; - (void) tcsetattr(0, TCSAFLUSH, &ttyb); -#endif - - bzero(password, sizeof(password)); - if (read(0, password, sizeof(password)) == -1) { - perror("read"); - ok = -1; - goto lose; - } - - if (password[strlen(password)-1] == '\n') - password[strlen(password)-1] = 0; - - /* Generate the key from the password and destroy the password */ - - des_string_to_key(password, key); - -lose: - BCLEAR(password); - -#ifndef POSIX - ttyb.sg_flags |= ECHO; - ioctl(0, TIOCSETP, &ttyb); -#else - ttyb.c_lflag |= ECHO; - (void) tcsetattr(0, TCSAFLUSH, &ttyb); -#endif - - pop_signals(); - printf("\n"); - - return(ok); -} - -#ifdef __STDC__ -static int rki_decrypt_tkt(char *user, char *instance, char *realm, - char *arg, int (*key_proc)(), KTEXT *cipp) -#else -static int rki_decrypt_tkt(user, instance, realm, arg, key_proc, cipp) - char *user; - char *instance; - char *realm; - char *arg; - int (*key_proc)(); - KTEXT *cipp; -#endif /* __STDC__ */ -{ - KTEXT cip = *cipp; - C_Block key; /* Key for decrypting cipher */ - Key_schedule key_s; - KTEXT scip = 0; /* cipher from rkinit server */ - - rkinit_intkt_info *rii = (rkinit_intkt_info *)arg; - - /* generate a key */ - { - register int rc; - rc = (*key_proc)(user, instance, realm, arg, key); - if (rc) - return(rc); - } - - des_key_sched(&key, key_s); - - /* Decrypt information from KDC */ - des_pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat, - (long) cip->length, key_s, &key, 0); - - /* DescrYPT rkinit server's information from KDC */ - scip = rii->scip; - des_pcbc_encrypt((C_Block *)scip->dat,(C_Block *)scip->dat, - (long) scip->length, key_s, &key, 0); - - /* Get rid of all traces of key */ - bzero((char *)key, sizeof(key)); - bzero((char *)key_s, sizeof(key_s)); - - return(0); -} - -#ifdef __STDC__ -int rki_get_tickets(int version, char *host, char *r_krealm, rkinit_info *info) -#else -int rki_get_tickets(version, host, r_krealm, info) - int version; - char *host; - char *r_krealm; - rkinit_info *info; -#endif /* __STDC__ */ -{ - int status = RKINIT_SUCCESS; - KTEXT_ST auth; - char phost[MAXHOSTNAMELEN]; - KTEXT_ST scip; /* server's KDC packet */ - des_cblock key; - des_key_schedule sched; - struct sockaddr_in caddr; - struct sockaddr_in saddr; - CREDENTIALS cred; - MSG_DAT msg_data; - u_char enc_data[MAX_KTXT_LEN]; - - rkinit_intkt_info rii; - - SBCLEAR(auth); - BCLEAR(phost); - SBCLEAR(rii); - SBCLEAR(scip); - SBCLEAR(caddr); - SBCLEAR(saddr); - SBCLEAR(cred); - SBCLEAR(msg_data); - BCLEAR(enc_data); - - if ((status = rki_send_rkinit_info(version, info)) != RKINIT_SUCCESS) - return(status); - - if ((status = rki_rpc_get_skdc(&scip)) != RKINIT_SUCCESS) - return(status); - - rii.scip = &scip; - rii.host = host; - rii.username = info->username; - - if ((status = krb_get_in_tkt(info->aname, info->inst, info->realm, - "krbtgt", info->realm, 1, - rki_key_proc, rki_decrypt_tkt, (char *)&rii))) { - strcpy(errbuf, krb_err_txt[status]); - rkinit_errmsg(errbuf); - return(RKINIT_KERBEROS); - } - - /* Create an authenticator */ - strcpy(phost, krb_get_phost(host)); - if ((status = krb_mk_req(&auth, KEY, phost, r_krealm, 0))) { - sprintf(errbuf, "krb_mk_req: %s", krb_err_txt[status]); - rkinit_errmsg(errbuf); - return(RKINIT_KERBEROS); - } - - /* Re-encrypt server KDC packet in session key */ - /* Get credentials from ticket file */ - if ((status = krb_get_cred(KEY, phost, r_krealm, &cred))) { - sprintf(errbuf, "krb_get_cred: %s", krb_err_txt[status]); - rkinit_errmsg(errbuf); - return(RKINIT_KERBEROS); - } - - /* Exctract the session key and make the schedule */ - bcopy(cred.session, key, sizeof(key)); - if ((status = des_key_sched(&key, sched))) { - sprintf(errbuf, "des_key_sched: %s", krb_err_txt[status]); - rkinit_errmsg(errbuf); - return(RKINIT_DES); - } - - /* Get client and server addresses */ - if ((status = rki_get_csaddr(&caddr, &saddr)) != RKINIT_SUCCESS) - return(status); - - /* - * scip was passed to krb_get_in_tkt, where it was decrypted. - * Now re-encrypt in the session key. - */ - - msg_data.app_data = enc_data; - if ((msg_data.app_length = - krb_mk_priv(scip.dat, msg_data.app_data, scip.length, sched, key, - &caddr, &saddr)) == -1) { - sprintf(errbuf, "krb_mk_priv failed."); - rkinit_errmsg(errbuf); - return(RKINIT_KERBEROS); - } - - /* Destroy tickets, which we no longer need */ - dest_tkt(); - - if ((status = rki_rpc_send_ckdc(&msg_data)) != RKINIT_SUCCESS) - return(status); - - if ((status = rki_rpc_sendauth(&auth)) != RKINIT_SUCCESS) - return(status); - - if ((status = rki_rpc_get_status())) - return(status); - - return(RKINIT_SUCCESS); -} - - -static void (*old_sigfunc[NSIG])(int); - -static void push_signals() -{ - register i; - for (i = 0; i < NSIG; i++) - old_sigfunc[i] = signal(i,sig_restore); -} - -static void pop_signals() -{ - register i; - for (i = 0; i < NSIG; i++) - signal(i,old_sigfunc[i]); -} - -static void sig_restore(sig,code,scp) - int sig,code; - struct sigcontext *scp; -{ - longjmp(env,1); -} diff --git a/eBones/lib/librkinit/rk_lib.c b/eBones/lib/librkinit/rk_lib.c deleted file mode 100644 index 06b8f392e0d6f..0000000000000 --- a/eBones/lib/librkinit/rk_lib.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * $Id: rk_lib.c,v 1.1 1993/12/10 19:32:01 dglo Exp gibbs $ - * $Source: /usr/src/eBones/librkinit/RCS/rk_lib.c,v $ - * $Author: dglo $ - * - * This file contains the non-rpc top-level rkinit library routines. - * The routines in the rkinit library that should be called from clients - * are exactly those defined in this file. - * - * The naming convetions used within the rkinit library are as follows: - * Functions intended for general client use start with rkinit_ - * Functions intended for use only inside the library or server start with - * rki_ - * Functions that do network communcation start with rki_rpc_ - * Static functions can be named in any fashion. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rk_lib.c,v 1.1 1993/12/10 19:32:01 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#ifdef __STDC__ -char *rkinit_errmsg(char *string) -#else -char *rkinit_errmsg(string) - char *string; -#endif /* __STDC__ */ -{ - static char errmsg[BUFSIZ]; - - if (string) { - BCLEAR(errmsg); - strncpy(errmsg, string, sizeof(errmsg) - 1); - } - - return(errmsg); -} - -#ifdef __STDC__ -int rkinit(char *host, char *r_krealm, rkinit_info *info, int timeout) -#else -int rkinit(host, r_krealm, info, timeout) - char *host; - char *r_krealm; - rkinit_info *info; - int timeout; -#endif /* __STDC__ */ -{ - int status = RKINIT_SUCCESS; - int version = 0; - char phost[MAXHOSTNAMELEN]; - jmp_buf timeout_env; - void (*old_alrm)(int) = NULL; - char origtktfilename[MAXPATHLEN]; /* original ticket file name */ - char tktfilename[MAXPATHLEN]; /* temporary client ticket file */ - - BCLEAR(phost); - BCLEAR(origtktfilename); - BCLEAR(tktfilename); - BCLEAR(timeout_env); - - init_rkin_err_tbl(); - - if ((status = rki_setup_rpc(host))) - return(status); - - if (timeout) - old_alrm = rki_setup_timer(timeout_env); - - /* The alarm handler longjmps us to here. */ - if ((status = setjmp(timeout_env)) == 0) { - - strcpy(origtktfilename, tkt_string()); - sprintf(tktfilename, "/tmp/tkt_rkinit.%ld", getpid()); - krb_set_tkt_string(tktfilename); - - if ((status = rki_choose_version(&version)) == RKINIT_SUCCESS) - status = rki_get_tickets(version, host, r_krealm, info); - } - - if (timeout) - rki_restore_timer(old_alrm); - - dest_tkt(); - krb_set_tkt_string(origtktfilename); - - rki_cleanup_rpc(); - - return(status); -} diff --git a/eBones/lib/librkinit/rk_rpc.c b/eBones/lib/librkinit/rk_rpc.c deleted file mode 100644 index 6a0a6d38d9f49..0000000000000 --- a/eBones/lib/librkinit/rk_rpc.c +++ /dev/null @@ -1,392 +0,0 @@ -/* - * $Id$ - * $Source$ - * $Author$ - * - * This file contains functions that are used for network communication. - * See the comment at the top of rk_lib.c for a description of the naming - * conventions used within the rkinit library. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id$"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -extern int errno; - -static int sock; -struct sockaddr_in saddr; - -static char errbuf[BUFSIZ]; - -char *calloc(); - -#ifdef __STDC__ -int rki_send_packet(int sock, char type, u_int32_t length, const char *data) -#else -int rki_send_packet(sock, type, length, data) - int sock; - char type; - u_int32_t length; - const char *data; -#endif /* __STDC__ */ -{ - int len; - u_char *packet; - u_int32_t pkt_len; - u_int32_t net_pkt_len; - - pkt_len = length + PKT_DATA; - - if ((packet = (u_char *)calloc(pkt_len, sizeof(u_char))) == NULL) { - sprintf(errbuf, "rki_send_packet: failure allocating %d bytes", - pkt_len * sizeof(u_char)); - rkinit_errmsg(errbuf); - return(RKINIT_MEMORY); - } - - net_pkt_len = htonl(pkt_len); - - packet[PKT_TYPE] = type; - bcopy((char *)&net_pkt_len, packet + PKT_LEN, sizeof(u_int32_t)); - bcopy(data, packet + PKT_DATA, length); - - if ((len = write(sock, packet, pkt_len)) != pkt_len) { - if (len == -1) - sprintf(errbuf, "write: %s", sys_errlist[errno]); - else - sprintf(errbuf, "write: %d bytes written; %d bytes actually sent", - pkt_len, len); - rkinit_errmsg(errbuf); - free(packet); - return(RKINIT_WRITE); - } - - free(packet); - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int rki_get_packet(int sock, u_char type, u_int32_t *length, char *data) -#else -int rki_get_packet(sock, type, length, data) - int sock; - u_char type; - u_int32_t *length; - char *data; -#endif /* __STDC__ */ -{ - int len; - int len_sofar = 0; - u_int32_t expected_length = 0; - int got_full_packet = FALSE; - int tries = 0; - u_char *packet; - - u_int32_t max_pkt_len; - - max_pkt_len = *length + PKT_DATA; - - if ((packet = (u_char *)calloc(max_pkt_len, sizeof(u_char))) == NULL) { - sprintf(errbuf, "rki_get_packet: failure allocating %d bytes", - max_pkt_len * sizeof(u_char)); - rkinit_errmsg(errbuf); - return(RKINIT_MEMORY); - } - - /* Read the packet type and length */ - while ((len_sofar < PKT_DATA) && (tries < RETRIES)) { - if ((len = read(sock, packet + len_sofar, PKT_DATA - len_sofar)) < 0) { - sprintf(errbuf, "read: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - return(RKINIT_READ); - } - len_sofar += len; - tries++; - } - if (len_sofar < PKT_DATA) { - sprintf(errbuf, - "read: expected to receive at least %d bytes; received %d", - PKT_DATA, len_sofar); - rkinit_errmsg(errbuf); - return(RKINIT_PACKET); - } - bcopy(packet + PKT_LEN, (char *)&expected_length, sizeof(u_int32_t)); - expected_length = ntohl(expected_length); - if (expected_length > max_pkt_len) { - sprintf(errbuf, "%s %d %s %d", - "rki_get_packet: incoming message of size", - expected_length, - "is larger than message buffer of size", - max_pkt_len); - rkinit_errmsg(errbuf); - return(RKINIT_PACKET); - } - tries = 0; - while (!got_full_packet && (tries < RETRIES)) { - if ((len = read(sock, packet + len_sofar, - expected_length - len_sofar)) < 0) { - sprintf(errbuf, "read: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - return(RKINIT_READ); - } - len_sofar += len; - if (expected_length == len_sofar) - got_full_packet = TRUE; - } - if (len_sofar < expected_length) { - sprintf(errbuf, - "read: expected to receive at least %d bytes; received %d", - expected_length, len_sofar); - rkinit_errmsg(errbuf); - return(RKINIT_PACKET); - } - if (packet[PKT_TYPE] == MT_DROP) { - BCLEAR(errbuf); - rkinit_errmsg(errbuf); - return(RKINIT_DROPPED); - } - - if (packet[PKT_TYPE] != type) { - sprintf(errbuf, "Expected packet type of %s; got %s", - rki_mt_to_string(type), - rki_mt_to_string(packet[PKT_TYPE])); - rkinit_errmsg(errbuf); - return(RKINIT_PACKET); - } - - *length = len_sofar - PKT_DATA; - bcopy(packet + PKT_DATA, data, *length); - - free(packet); - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int rki_setup_rpc(char *host) -#else -int rki_setup_rpc(host) - char *host; -#endif /* __STDC__ */ -{ - struct hostent *hp; - struct servent *sp; - int port, retval; - - SBCLEAR(saddr); - SBCLEAR(hp); - SBCLEAR(sp); - - if ((hp = gethostbyname(host)) == NULL) { - sprintf(errbuf, "%s: unknown host.", host); - rkinit_errmsg(errbuf); - return(RKINIT_HOST); - } - - if ((sp = getservbyname(SERVENT, "tcp"))) - port = sp->s_port; - else - /* Fall back on known port number */ - port = htons(PORT); - - saddr.sin_family = hp->h_addrtype; - bcopy(hp->h_addr, (char *)&saddr.sin_addr, hp->h_length); - saddr.sin_port = port; - - if ((sock = socket(hp->h_addrtype, SOCK_STREAM, IPPROTO_IP)) < 0) { - sprintf(errbuf, "socket: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - return(RKINIT_SOCKET); - } - if ((retval = krb_bind_local_addr(sock)) != KSUCCESS) { - sprintf(errbuf, "krb_bind_local_addr: %s", krb_err_txt[retval]); - rkinit_errmsg(errbuf); - close(sock); - return(RKINIT_SOCKET); - } - if (connect(sock, (struct sockaddr *)&saddr, sizeof (saddr)) < 0) { - sprintf(errbuf, "connect: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - close(sock); - return(RKINIT_CONNECT); - } - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int rki_rpc_exchange_version_info(int c_lversion, int c_hversion, - int *s_lversion, int *s_hversion) -#else -int rki_rpc_exchange_version_info(c_lversion, c_hversion, - s_lversion, s_hversion) - int c_lversion; - int c_hversion; - int *s_lversion; - int *s_hversion; -#endif /* __STDC__ */ -{ - int status = RKINIT_SUCCESS; - u_char version_info[VERSION_INFO_SIZE]; - u_int32_t length = sizeof(version_info); - - version_info[0] = (u_char) c_lversion; - version_info[1] = (u_char) c_hversion; - - if ((status = rki_send_packet(sock, MT_CVERSION, length, - (char *)version_info)) != RKINIT_SUCCESS) - return(status); - - if ((status = rki_get_packet(sock, MT_SVERSION, &length, - (char *)version_info)) != RKINIT_SUCCESS) - return(status); - - *s_lversion = (int) version_info[0]; - *s_hversion = (int) version_info[1]; - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int rki_rpc_send_rkinit_info(rkinit_info *info) -#else -int rki_rpc_send_rkinit_info(info) - rkinit_info *info; -#endif /* __STDC__ */ -{ - rkinit_info info_copy; - - bcopy(info, &info_copy, sizeof(rkinit_info)); - info_copy.lifetime = htonl(info_copy.lifetime); - return(rki_send_packet(sock, MT_RKINIT_INFO, sizeof(rkinit_info), - (char *)&info_copy)); -} - -#ifdef __STDC__ -int rki_rpc_get_status(void) -#else -int rki_rpc_get_status() -#endif /* __STDC__ */ -{ - char msg[BUFSIZ]; - int status = RKINIT_SUCCESS; - u_int32_t length = sizeof(msg); - - if ((status = rki_get_packet(sock, MT_STATUS, &length, msg))) - return(status); - - if (length == 0) - return(RKINIT_SUCCESS); - else { - rkinit_errmsg(msg); - return(RKINIT_DAEMON); - } -} - -#ifdef __STDC__ -int rki_rpc_get_ktext(int sock, KTEXT auth, u_char type) -#else -int rki_rpc_get_ktext(sock, auth, type) - int sock; - KTEXT auth; - u_char type; -#endif /* __STDC__ */ -{ - int status = RKINIT_SUCCESS; - u_int32_t length = MAX_KTXT_LEN; - - if ((status = rki_get_packet(sock, type, &length, (char *)auth->dat))) - return(status); - - auth->length = length; - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int rki_rpc_sendauth(KTEXT auth) -#else -int rki_rpc_sendauth(auth) - KTEXT auth; -#endif /* __STDC__ */ -{ - return(rki_send_packet(sock, MT_AUTH, auth->length, (char *)auth->dat)); -} - - -#ifdef __STDC__ -int rki_rpc_get_skdc(KTEXT scip) -#else -int rki_rpc_get_skdc(scip) - KTEXT scip; -#endif /* __STDC__ */ -{ - return(rki_rpc_get_ktext(sock, scip, MT_SKDC)); -} - -#ifdef __STDC__ -int rki_rpc_send_ckdc(MSG_DAT *scip) -#else -int rki_rpc_send_ckdc(scip) - MSG_DAT *scip; -#endif /* __STDC__ */ -{ - return(rki_send_packet(sock, MT_CKDC, scip->app_length, - (char *)scip->app_data)); -} - -#ifdef __STDC__ -int rki_get_csaddr(struct sockaddr_in *caddrp, struct sockaddr_in *saddrp) -#else -int rki_get_csaddr(caddrp, saddrp) - struct sockaddr_in *caddrp; - struct sockaddr_in *saddrp; -#endif /* __STDC__ */ -{ - int addrlen = sizeof(struct sockaddr_in); - - bcopy((char *)&saddr, (char *)saddrp, addrlen); - - if (getsockname(sock, (struct sockaddr *)caddrp, &addrlen) < 0) { - sprintf(errbuf, "getsockname: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - return(RKINIT_GETSOCK); - } - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -void rki_drop_server(void) -#else -void rki_drop_server() -#endif /* __STDC__ */ -{ - (void) rki_send_packet(sock, MT_DROP, 0, ""); -} - -#ifdef __STDC__ -void rki_cleanup_rpc(void) -#else -void rki_cleanup_rpc() -#endif /* __STDC__ */ -{ - rki_drop_server(); - (void) close(sock); -} diff --git a/eBones/lib/librkinit/rk_util.c b/eBones/lib/librkinit/rk_util.c deleted file mode 100644 index 4333d38d306f9..0000000000000 --- a/eBones/lib/librkinit/rk_util.c +++ /dev/null @@ -1,214 +0,0 @@ -/* - * $Id: rk_util.c,v 1.1 1993/12/10 19:36:09 dglo Exp gibbs $ - * $Source: /usr/src/eBones/librkinit/RCS/rk_util.c,v $ - * $Author: dglo $ - * - * This file contains internal routines for general use by the rkinit - * library and server. - * - * See the comment at the top of rk_lib.c for a description of the naming - * conventions used within the rkinit library. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rk_util.c,v 1.1 1993/12/10 19:36:09 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include - -#ifdef DEBUG -#include -#endif /* DEBUG */ - -#include -#include -#include - -#define RKINIT_TIMEOUTVAL 60 - -static char errbuf[BUFSIZ]; -static jmp_buf timeout_env; - -#ifdef DEBUG -static int _rkinit_server_ = FALSE; - -#ifdef __STDC__ -void rki_dmsg(char *string) -#else -void rki_dmsg(string) - char *string; -#endif /* __STDC__ */ -{ - if (_rkinit_server_) - syslog(LOG_NOTICE, string); - else - printf("%s\n", string); -} - -#ifdef __STDC__ -void rki_i_am_server(void) -#else -void rki_i_am_server() -#endif /* __STDC__ */ -{ - _rkinit_server_ = TRUE; -} -#else /* DEBUG */ -#ifdef __STDC__ -void rki_dmsg(char *string) -#else -void rki_dmsg(string) - char *string; -#endif /* __STDC__ */ -{ - return; -} - -#endif /* DEBUG */ - -#ifdef __STDC__ -const char *rki_mt_to_string(int mt) -#else -const char *rki_mt_to_string(mt) - int mt; -#endif /* __STDC__ */ -{ - char *string = 0; - - switch(mt) { - case MT_STATUS: - string = "Status message"; - break; - case MT_CVERSION: - string = "Client version"; - break; - case MT_SVERSION: - string = "Server version"; - break; - case MT_RKINIT_INFO: - string = "Rkinit information"; - break; - case MT_SKDC: - string = "Server kdc packet"; - break; - case MT_CKDC: - string = "Client kdc packet"; - break; - case MT_AUTH: - string = "Authenticator"; - break; - case MT_DROP: - string = "Drop server"; - break; - default: - string = "Unknown message type"; - break; - } - - return(string); -} - -#ifdef __STDC__ -int rki_choose_version(int *version) -#else -int rki_choose_version(version) - int *version; -#endif /* __STDC__ */ -{ - int s_lversion; /* lowest version number server supports */ - int s_hversion; /* highest version number server supports */ - int status = RKINIT_SUCCESS; - - if ((status = - rki_rpc_exchange_version_info(RKINIT_LVERSION, RKINIT_HVERSION, - &s_lversion, - &s_hversion)) != RKINIT_SUCCESS) - return(status); - - *version = min(RKINIT_HVERSION, s_hversion); - if (*version < max(RKINIT_LVERSION, s_lversion)) { - sprintf(errbuf, - "Can't run version %d client against version %d server.", - RKINIT_HVERSION, s_hversion); - rkinit_errmsg(errbuf); - status = RKINIT_VERSION; - } - - return(status); -} - -#ifdef __STDC__ -int rki_send_rkinit_info(int version, rkinit_info *info) -#else -int rki_send_rkinit_info(version, info) - int version; - rkinit_info *info; -#endif /* __STDC__ */ -{ - int status = 0; - - if ((status = rki_rpc_send_rkinit_info(info)) != RKINIT_SUCCESS) - return(status); - - return(rki_rpc_get_status()); -} - -#ifdef __STDC__ -static void rki_timeout(int signal) -#else -static void rki_timeout(signal) - int signal; -#endif /* __STDC__ */ -{ - sprintf(errbuf, "%d seconds exceeded.", RKINIT_TIMEOUTVAL); - rkinit_errmsg(errbuf); - longjmp(timeout_env, RKINIT_TIMEOUT); - return; -} - -#ifdef __STDC__ -static void set_timer(int secs) -#else -static void set_timer(secs) - int secs; -#endif /* __STDC__ */ -{ - struct itimerval timer; /* Time structure for timeout */ - - /* Set up an itimer structure to send an alarm signal after TIMEOUT - seconds. */ - timer.it_interval.tv_sec = secs; - timer.it_interval.tv_usec = 0; - timer.it_value = timer.it_interval; - - (void) setitimer (ITIMER_REAL, &timer, (struct itimerval *)0); -} - - -#ifdef __STDC__ -void (*rki_setup_timer(jmp_buf env))(int) -#else -void (*rki_setup_timer(env))(int) - jmp_buf env; -#endif /* __STDC__ */ -{ - bcopy((char *)env, (char *)timeout_env, sizeof(jmp_buf)); - set_timer(RKINIT_TIMEOUTVAL); - return(signal(SIGALRM, rki_timeout)); -} - -#ifdef __STDC__ -void rki_restore_timer(void (*old_alrm)(int)) -#else -void rki_restore_timer(old_alrm) - void (*old_alrm)(int); -#endif /* __STDC__ */ -{ - set_timer(0); - (void) signal(SIGALRM, old_alrm); -} diff --git a/eBones/lib/librkinit/rkinit.3 b/eBones/lib/librkinit/rkinit.3 deleted file mode 100644 index fe6bdf7a1fb65..0000000000000 --- a/eBones/lib/librkinit/rkinit.3 +++ /dev/null @@ -1,167 +0,0 @@ -.\" -.\" $Header: /local/cvsfiles/kerberos/src/appl/rkinit/man/rkinit.3,v 1.1 1991/12/03 23:21:29 eichin Exp $ -.\" $Source: /local/cvsfiles/kerberos/src/appl/rkinit/man/rkinit.3,v $ -.\" $Author: eichin $ -.\" -.\" -.TH RKINIT 3 "November 12, 1989" -.SH NAME -rkinit, rkinit_errmsg -.SH SYNOPSIS -.nf -.nj -.ft B -#include -#include -.PP -.ft B -int rkinit(host, r_krealm, info, timeout) - char *host; - char *r_krealm; - rkinit_info *info; - int timeout; -.PP -.ft B -char *rkinit_errmsg(string) - char *string; -.fi -.ft R -.SH DESCRIPTION -This library contains the calls necessary to interface with the -.I rkinit -system of remote ticket establishment. See -.IR rkinit (1) -for more information on -.I rkinit -.PP -.I rkinit.h -is the header file that contains information that all clients -will need to use. -.PP -.I rkinit_err.h -is the -.I com_err -error table header file. See -.IR com_err (3) -for more information about -.I com_err. -.PP -.IR rkinit () -takes as arguments the name of the host on which you wish to -establish tickets, the kerberos realm of the remote host, a -fully initialized rkinit_info structure, and a boolean value -telling -whether or not -.IR rkinit () -should time out if the transaction -fails to complete after a certain about of time. -This call does not know about about default values, so -something must be filled in for everything except for the ticket -filename in the rkinit_info structure described below. - -.nf -.nj -.ft B -This is the rkinit_info type: - -typedef struct { - char aname[ANAME_SZ + 1]; - char inst[INST_SZ + 1]; - char realm[REALM_SZ + 1]; - char sname[ANAME_SZ + 1]; - char sinst[INST_SZ + 1]; - char username[9]; /* max local name length + 1 */ - char tktfilename[MAXPATHLEN + 1]; - long lifetime; -} rkinit_info; -.fi -.ft R - -.I aname -is the name part of the kerberos principal for which tickets are -being requested. - -.I inst -is the instance part. - -.I realm -is the realm part. - -.I sname -is the service name of the key that will appear in the remote -initial ticket (for example, "krbtgt"). - -.I sname -is the service instance. - -.I username -is the name of the local user on the remote host who will own -the ticket file. - -.I tktfilename -is the name of the file on the remote host in which the -tickets will be stored. This is the only field in the structure -for which a blank value is filled in. If this value is left -blank, the server will figure out what to call the ticket file -by using the kerberos library default as determined by -.I TKT_FILE -as defined in -.IR krb.h . - -.I lifetime -is the lifetime of the tickets in the usual five minute -intervals. It is possible with this routine, as with -.IR krb_get_in_tkt (3) -to request tickets with zero lifetime. - -.IR rkinit (), -while it is running, opens a socket, changes the name -of the default kerberos ticket file, and changes the signal -handler for the ALRM signal (if timeout != 0). rkinit() -restores all these values when it exits whether it exits with -an error or not, so clients using the rkinit library need not -worry about this information. - -.IR rkinit_errmsg () -takes a string as its only argument. Passing -other than NULL to this routine should be done -by only the rkinit library and server. -Doing this sets the current rkinit -error message. Calling -.IR rkinit_errmsg () -with NULL as the argument returns the current rkinit error -message. -Although the rkinit library uses -.IR com_err (3) -for error handling, the error messages returned by -.IR com_err () -may not be specific enough. A client could report the error -message returned by rkinit as follows: - - -.nf -.nj -.ft B -if (status = rkinit(host, r_krealm, &info, timeout)) { - com_err(argv[0], status, "while obtaining remote tickets:"); - fprintf(stderr, "%s\\n", rkinit_errmsg(0)); - exit(1); -} -.fi -.ft R - -.SH SEE ALSO -kerberos(1), kerberos(3), rkinit(1), rkinitd(8) - -.SH DIAGNOSTICS -.IR rkinit () -is usually good about reporting error messages to the client. -It will probably not handle uninitialized variables well, -however. Make sure that things like the realm of the remote -host and the lifetime of the tickets have been properly -initialized before calling -.IR rkinit (). - - -.SH AUTHOR -Emanuel Jay Berkenbilt (MIT-Project Athena) diff --git a/eBones/lib/librkinit/rkinit_err.et b/eBones/lib/librkinit/rkinit_err.et deleted file mode 100644 index d0ade5ba11cbc..0000000000000 --- a/eBones/lib/librkinit/rkinit_err.et +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Header: /local/cvsfiles/kerberos/src/appl/rkinit/lib/rkinit_err.et,v 1.1 1991/12/03 23:20:58 eichin Exp $ -# $Source: /local/cvsfiles/kerberos/src/appl/rkinit/lib/rkinit_err.et,v $ -# $Author: eichin $ -# -# These error messages will probably not be printed by com_err. -# Instead, a better error message (with specific information) -# will be obtained by a call to rkinit_errmsg(). -# - -et rkin - -ec RKINIT_RCSID, "$Header: /local/cvsfiles/kerberos/src/appl/rkinit/lib/rkinit_err.et,v 1.1 1991/12/03 23:20:58 eichin Exp $" -ec RKINIT_VERSION, "Version mismatch" -ec RKINIT_HOST, "Failure getting host information" -ec RKINIT_SERV, "Failure getting service information (/etc/services)" -ec RKINIT_SOCKET, "Failure setting up socket" -ec RKINIT_CONNECT, "Failure connecting" -ec RKINIT_PACKET, "Bad packet type" -ec RKINIT_WRITE, "Failure writing" -ec RKINIT_READ, "Failure reading" -ec RKINIT_DAEMON, "Error reported by rkinitd" -ec RKINIT_KERBEROS, "Kerberos error" -ec RKINIT_DES, "Des error" -ec RKINIT_GETPEER, "Failure in getpeername" -ec RKINIT_GETSOCK, "Failure in getsockname" -ec RKINIT_MEMORY, "Out of memory" -ec RKINIT_TIMEOUT, "Timed out" -ec RKINIT_DROPPED, "Connection dropped" - -ec RKINIT_LAST, "Last error message" -end diff --git a/eBones/libexec/Makefile b/eBones/libexec/Makefile deleted file mode 100644 index b7193e672228e..0000000000000 --- a/eBones/libexec/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.1 1995/09/13 17:23:59 markm Exp $ - -SUBDIR= kpropd registerd rkinitd - -.include diff --git a/eBones/libexec/Makefile.inc b/eBones/libexec/Makefile.inc deleted file mode 100644 index d694f9b03653d..0000000000000 --- a/eBones/libexec/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 - -BINDIR?= /usr/libexec - -.include "../Makefile.inc" diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile deleted file mode 100644 index 03f4eaa159212..0000000000000 --- a/eBones/libexec/kpropd/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -PROG= kpropd -CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop -DPADD+= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -NOMAN= noman - -.include diff --git a/eBones/libexec/kpropd/kpropd.c b/eBones/libexec/kpropd/kpropd.c deleted file mode 100644 index 1b232dfc0ded5..0000000000000 --- a/eBones/libexec/kpropd/kpropd.c +++ /dev/null @@ -1,453 +0,0 @@ -/* - * Copyright 1987 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * MIT.Copyright. - * - * kprop/kpropd have been abandonded by Project Athena (for good reason) - * however they still form the basis for one of the better ways for - * distributing kerberos databases. This version of kpropd has been - * adapted from the MIT distribution to work properly in a 4.4BSD - * environment. - * - * $Revision: 1.1.1.1 $ $Date: 1995/08/03 07:37:19 $ $State: Exp $ - * $Source: /usr/cvs/src/eBones/kpropd/kpropd.c,v $ - * - * Log: kpropd.c,v - * Revision 4.5 92/10/23 15:45:46 tytso Make it possible - * to specify the location of the kdb_util program. - * - * Revision 4.4 91/06/15 03:20:51 probe Fixed inclusion - * - * Revision 4.3 89/05/16 15:06:04 wesommer Fix operator precedence stuff. - * Programmer: John Kohl. - * - * Revision 4.2 89/03/23 10:24:00 jtkohl NOENCRYPTION changes - * - * Revision 4.1 89/01/24 20:33:48 root name change - * - * Revision 4.0 89/01/24 18:45:06 wesommer Original version; programmer: - * wesommer auditor: jon - * - * Revision 4.5 88/01/08 18:07:46 jon formatting and rcs header changes */ - -/* - * This program is run on slave servers, to catch updates "pushed" from the - * master kerberos server in a realm. - */ - -#if 0 -#ifndef lint -static char rcsid_kpropd_c[] = -"$Header: /usr/cvs/src/eBones/kpropd/kpropd.c,v 1.1.1.1 1995/08/03 07:37:19 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "kprop.h" - -static char kprop_version[KPROP_PROT_VERSION_LEN] = KPROP_PROT_VERSION; - -int debug = 0; - -int pause_int = 300; /* 5 minutes in seconds */ -unsigned long get_data_checksum(int fd, Key_schedule key_sched); -void recv_auth(int in, int out, int private, - struct sockaddr_in *remote, struct sockaddr_in *local, - AUTH_DAT *ad); -static void SlowDeath(void); -void recv_clear(int in, int out); - /* leave room for private msg overhead */ -static char buf[KPROP_BUFSIZ + 64]; - -static void -usage() -{ - fprintf(stderr, "\nUsage: kpropd [-r realm] [-s srvtab] [-P kdb_util] fname\n"); - exit(2); -} - -void -main(argc, argv) - int argc; - char **argv; -{ - struct sockaddr_in from; - struct sockaddr_in sin; - int s2, fd, n, fdlock; - int from_len; - char local_file[256]; - char local_temp[256]; - struct hostent *hp; - char hostname[256]; - char from_str[128]; - long kerror; - AUTH_DAT auth_dat; - KTEXT_ST ticket; - char my_instance[INST_SZ]; - char my_realm[REALM_SZ]; - char cmd[1024]; - short net_transfer_mode, transfer_mode; - Key_schedule session_sched; - char version[9]; - int c; - extern char *optarg; - extern int optind; - int rflag = 0; - char *srvtab = ""; - char *local_db = DBM_FILE; - char *kdb_util = KPROP_KDB_UTIL; - - if (argv[argc - 1][0] == 'k' && isdigit(argv[argc - 1][1])) { - argc--; /* ttys file hack */ - } - while ((c = getopt(argc, argv, "r:s:d:P:")) != EOF) { - switch (c) { - case 'r': - rflag++; - strcpy(my_realm, optarg); - break; - case 's': - srvtab = optarg; - break; - case 'd': - local_db = optarg; - break; - case 'P': - kdb_util = optarg; - break; - default: - usage(); - break; - } - } - if (optind != argc - 1) - usage(); - - openlog("kpropd", LOG_PID, LOG_AUTH); - - strcpy(local_file, argv[optind]); - strcat(strcpy(local_temp, argv[optind]), ".tmp"); - -#ifdef STANDALONE - - if ((sp = getservbyname("krb_prop", "tcp")) == NULL) { - syslog(LOG_ERR, "tcp/krb_prop: unknown service."); - SlowDeath(); - } - bzero(&sin, sizeof sin); - sin.sin_port = sp->s_port; - sin.sin_family = AF_INET; - - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - syslog(LOG_ERR, "socket: %m"); - SlowDeath(); - } - if (bind(s, (struct sockaddr *)&sin, sizeof sin) < 0) { - syslog(LOG_ERR, "bind: %m"); - SlowDeath(); - } - -#endif /* STANDALONE */ - - if (!rflag) { - kerror = krb_get_lrealm(my_realm, 1); - if (kerror != KSUCCESS) { - syslog(LOG_ERR, "can't get local realm. %s", - krb_err_txt[kerror]); - SlowDeath(); - } - } - if (gethostname(my_instance, sizeof(my_instance)) != 0) { - syslog(LOG_ERR, "gethostname: %m"); - SlowDeath(); - } - -#ifdef STANDALONE - listen(s, 5); - for (;;) { - from_len = sizeof from; - if ((s2 = accept(s, (struct sockaddr *)&from, &from_len)) < 0) { - syslog(LOG_ERR, "accept: %m"); - continue; - } -#else /* !STANDALONE */ - - s2 = 0; - from_len = sizeof from; - if (getpeername(0, (struct sockaddr *)&from, &from_len) < 0) { - syslog(LOG_ERR, "getpeername: %m"); - SlowDeath(); - } - -#endif /* !STANDALONE */ - - strcpy(from_str, inet_ntoa(from.sin_addr)); - - if ((hp = gethostbyaddr((char *) &(from.sin_addr.s_addr), - from_len, AF_INET)) == NULL) { - strcpy(hostname, "UNKNOWN"); - } else { - strcpy(hostname, hp->h_name); - } - - syslog(LOG_INFO, "connection from %s, %s", hostname, from_str); - - /* for krb_rd_{priv, safe} */ - n = sizeof sin; - if (getsockname(s2, (struct sockaddr *)&sin, &n) != 0) { - syslog(LOG_ERR, "can't get socketname: %m"); - SlowDeath(); - } - if (n != sizeof(sin)) { - syslog(LOG_ERR, "can't get socketname (length)"); - SlowDeath(); - } - if ((fdlock = open(local_temp, O_WRONLY | O_CREAT, 0600)) < 0) { - syslog(LOG_ERR, "open: %m"); - SlowDeath(); - } - if (flock(fdlock, LOCK_EX | LOCK_NB)) { - syslog(LOG_ERR, "flock: %m"); - SlowDeath(); - } - if ((fd = creat(local_temp, 0600)) < 0) { - syslog(LOG_ERR, "creat: %m"); - SlowDeath(); - } - if ((n = read(s2, buf, sizeof(kprop_version))) - != sizeof(kprop_version)) { - syslog(LOG_ERR, - "can't read protocol version (%d bytes)", n); - SlowDeath(); - } - if (strncmp(buf, kprop_version, sizeof(kprop_version)) != 0) { - syslog(LOG_ERR, "unsupported version %s", buf); - SlowDeath(); - } - if ((n = read(s2, &net_transfer_mode, - sizeof(net_transfer_mode))) - != sizeof(net_transfer_mode)) { - syslog(LOG_ERR, "can't read transfer mode"); - SlowDeath(); - } - transfer_mode = ntohs(net_transfer_mode); - kerror = krb_recvauth(KOPT_DO_MUTUAL, s2, &ticket, - KPROP_SERVICE_NAME, - my_instance, - &from, - &sin, - &auth_dat, - srvtab, - session_sched, - version); - if (kerror != KSUCCESS) { - syslog(LOG_ERR, "%s calling getkdata", - krb_err_txt[kerror]); - SlowDeath(); - } - syslog(LOG_INFO, "connection from %s.%s@%s", - auth_dat.pname, auth_dat.pinst, auth_dat.prealm); - - /* - * AUTHORIZATION is done here. We might want to expand this - * to read an acl file at some point, but allowing for now - * KPROP_SERVICE_NAME.KRB_MASTER@local-realm is fine ... - */ - - if ((strcmp(KPROP_SERVICE_NAME, auth_dat.pname) != 0) || - (strcmp(KRB_MASTER, auth_dat.pinst) != 0) || - (strcmp(my_realm, auth_dat.prealm) != 0)) { - syslog(LOG_NOTICE, "authorization denied"); - SlowDeath(); - } - switch (transfer_mode) { - case KPROP_TRANSFER_PRIVATE: - recv_auth(s2, fd, 1 /* private */ , &from, &sin, &auth_dat); - break; - case KPROP_TRANSFER_SAFE: - recv_auth(s2, fd, 0 /* safe */ , &from, &sin, &auth_dat); - break; - case KPROP_TRANSFER_CLEAR: - recv_clear(s2, fd); - break; - default: - syslog(LOG_ERR, "bad transfer mode %d", transfer_mode); - SlowDeath(); - } - - if (transfer_mode != KPROP_TRANSFER_PRIVATE) { - syslog(LOG_ERR, "non-private transfers not supported\n"); - SlowDeath(); -#ifdef doesnt_work_yet - lseek(fd, (long) 0, L_SET); - if (auth_dat.checksum != get_data_checksum(fd, session_sched)) { - syslog(LOG_ERR, "checksum doesn't match"); - SlowDeath(); - } -#endif - } else { - struct stat st; - fstat(fd, &st); - if (st.st_size != auth_dat.checksum) { - syslog(LOG_ERR, "length doesn't match"); - SlowDeath(); - } - } - close(fd); - close(s2); - - if (rename(local_temp, local_file) < 0) { - syslog(LOG_ERR, "rename: %m"); - SlowDeath(); - } - - if (flock(fdlock, LOCK_UN)) { - syslog(LOG_ERR, "flock (unlock): %m"); - SlowDeath(); - } - close(fdlock); - sprintf(cmd, "%s load %s %s\n", kdb_util, local_file, local_db); - if (system(cmd) != 0) { - syslog(LOG_ERR, "couldn't load database"); - SlowDeath(); - } - -#ifdef STANDALONE - } -#endif - -} - -void -recv_auth(in, out, private, remote, local, ad) - int in, out; - int private; - struct sockaddr_in *remote, *local; - AUTH_DAT *ad; -{ - u_long length; - long kerror; - int n; - MSG_DAT msg_data; - Key_schedule session_sched; - - if (private) -#ifdef NOENCRYPTION - bzero((char *) session_sched, sizeof(session_sched)); -#else - if (key_sched((C_Block *)ad->session, session_sched)) { - syslog(LOG_ERR, "can't make key schedule"); - SlowDeath(); - } -#endif - - while (1) { - n = krb_net_read(in, (char *)&length, sizeof length); - if (n == 0) - break; - if (n < 0) { - syslog(LOG_ERR, "read: %m"); - SlowDeath(); - } - length = ntohl(length); - if (length > sizeof buf) { - syslog(LOG_ERR, "read length %d, bigger than buf %d", - length, sizeof buf); - SlowDeath(); - } - n = krb_net_read(in, buf, length); - if (n < 0) { - syslog(LOG_ERR, "kpropd: read: %m"); - SlowDeath(); - } - if (private) - kerror = krb_rd_priv(buf, n, session_sched, ad->session, - remote, local, &msg_data); - else - kerror = krb_rd_safe(buf, n, (C_Block *)ad->session, - remote, local, &msg_data); - if (kerror != KSUCCESS) { - syslog(LOG_ERR, "%s: %s", - private ? "krb_rd_priv" : "krb_rd_safe", - krb_err_txt[kerror]); - SlowDeath(); - } - if (write(out, msg_data.app_data, msg_data.app_length) != - msg_data.app_length) { - syslog(LOG_ERR, "write: %m"); - SlowDeath(); - } - } -} - -void -recv_clear(in, out) - int in, out; -{ - int n; - - while (1) { - n = read(in, buf, sizeof buf); - if (n == 0) - break; - if (n < 0) { - syslog(LOG_ERR, "read: %m"); - SlowDeath(); - } - if (write(out, buf, n) != n) { - syslog(LOG_ERR, "write: %m"); - SlowDeath(); - } - } -} - -static void -SlowDeath() -{ -#ifdef STANDALONE - sleep(pause_int); -#endif - exit(1); -} - -#ifdef doesnt_work_yet -unsigned long -get_data_checksum(fd, key_sched) - int fd; - Key_schedule key_sched; -{ - unsigned long cksum = 0; - unsigned long cbc_cksum(); - int n; - char buf[BUFSIZ]; - char obuf[8]; - - while (n = read(fd, buf, sizeof buf)) { - if (n < 0) { - syslog(LOG_ERR, "read (in checksum test): %m"); - SlowDeath(); - } -#ifndef NOENCRYPTION - cksum += cbc_cksum(buf, obuf, n, key_sched, key_sched); -#endif - } - return cksum; -} -#endif diff --git a/eBones/libexec/registerd/Makefile b/eBones/libexec/registerd/Makefile deleted file mode 100644 index 3e3c0b0e4e607..0000000000000 --- a/eBones/libexec/registerd/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (c) 1990 The Regents of the University of California. -# All rights reserved. -# -# %sccs.include.redist.sh -# -# @(#)Makefile 8.1 (Berkeley) 6/1/93 -# -# $Id$ - -PROG= registerd -SRCS= registerd.c -CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/register -DPADD+= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= registerd.8 - -.include diff --git a/eBones/libexec/registerd/registerd.8 b/eBones/libexec/registerd/registerd.8 deleted file mode 100644 index 3fc8e2873140b..0000000000000 --- a/eBones/libexec/registerd/registerd.8 +++ /dev/null @@ -1,71 +0,0 @@ -.\" Copyright (c) 1990, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)registerd.8 8.2 (Berkeley) 12/11/93 -.\" -.Dd December 11, 1993 -.Dt REGISTERD 8 -.Os -.Sh NAME -.Nm registerd -.Nd Kerberos registration daemon -.Sh SYNOPSIS -.Nm registerd -.Sh DESCRIPTION -Act as a registration agent for a Kerberos domain. -.Sh FILES -.Bl -tag -width /etc/kerberosIV/register_keys -compact -.It Pa /etc/kerberosIV/principal* -Kerberos database -.It Pa /etc/kerberosIV/register_keys/ -directory containing -.Tn DES -keys for trusted hosts -.It Pa .update.keyxx.xx.xx.xx -shared -.Tn DES -key with server -.El -.Sh SEE ALSO -.Xr registerd 8 , -.Xr kerberos 1 -.Sh DIAGNOSTICS -.Dq Already exists , -if the user already exists in the Kerberos database. -.Pp -.Dq Permission Denied , -if the host on which register is being run is untrusted. -.Sh HISTORY -The -.Nm registerd -utility -first appeared in 4.4BSD. - diff --git a/eBones/libexec/registerd/registerd.c b/eBones/libexec/registerd/registerd.c deleted file mode 100644 index 7c749240ae1ba..0000000000000 --- a/eBones/libexec/registerd/registerd.c +++ /dev/null @@ -1,355 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#if 0 -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -static char sccsid[] = "@(#)registerd.c 8.1 (Berkeley) 6/1/93"; -#endif /* not lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "register_proto.h" -#include "pathnames.h" - -#define KBUFSIZ (sizeof(struct keyfile_data)) -#define RCRYPT 0x00 -#define CLEAR 0x01 - -char *progname, msgbuf[BUFSIZ]; - -void cleanup(void); -void die(int); -void send_packet(char *msg, int flag); -int net_get_principal(char *pname, char *iname, C_Block *keyp); -int do_append(struct sockaddr_in *sinp); - -void -main(argc, argv) - int argc; - char **argv; -{ - static Key_schedule schedule; - static struct rlimit rl = { 0, 0 }; - struct keyfile_data *kfile; - u_char code; - int kf, retval, sval; - struct sockaddr_in sin; - char keyfile[MAXPATHLEN], keybuf[KBUFSIZ]; - - progname = argv[0]; /* for the library routines */ - - openlog("registerd", LOG_PID, LOG_AUTH); - - signal(SIGHUP, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGTSTP, SIG_IGN); - signal(SIGPIPE, die); - - if (setrlimit(RLIMIT_CORE, &rl) < 0) { - syslog(LOG_ERR, "setrlimit: %m"); - exit(1); - } - - - /* figure out who we are talking to */ - - sval = sizeof(sin); - if (getpeername(0, (struct sockaddr *) &sin, &sval) < 0) { - syslog(LOG_ERR, "getpeername: %m"); - exit(1); - } - - /* get encryption key */ - - (void) sprintf(keyfile, "%s/%s%s", - SERVER_KEYDIR, - KEYFILE_BASE, - inet_ntoa(sin.sin_addr)); - - if ((kf = open(keyfile, O_RDONLY)) < 0) { - syslog(LOG_ERR, - "error opening Kerberos update keyfile (%s): %m", keyfile); - sprintf(msgbuf, - "couldn't open session keyfile for your host"); - send_packet(msgbuf, CLEAR); - exit(1); - } - - if (read(kf, keybuf, KBUFSIZ) != KBUFSIZ) { - syslog(LOG_ERR, "wrong read size of Kerberos update keyfile"); - sprintf(msgbuf, - "couldn't read session key from your host's keyfile"); - send_packet(msgbuf, CLEAR); - exit(1); - } - sprintf(msgbuf, GOTKEY_MSG); - send_packet(msgbuf, CLEAR); - kfile = (struct keyfile_data *) keybuf; - key_sched((C_Block *)kfile->kf_key, schedule); - des_set_key_krb((des_cblock *)kfile->kf_key, schedule); - - /* read the command code byte */ - - if (des_read(0, &code, 1) == 1) { - - switch(code) { - case APPEND_DB: - retval = do_append(&sin); - break; - case ABORT: - cleanup(); - close(0); - exit(0); - default: - retval = KFAILURE; - syslog(LOG_NOTICE, - "invalid command code on db update (0x%x)", - code); - } - - } else { - retval = KFAILURE; - syslog(LOG_ERR, - "couldn't read command code on Kerberos update"); - } - - code = (u_char) retval; - if (code != KSUCCESS) { - sprintf(msgbuf, "%s", krb_err_txt[code]); - send_packet(msgbuf, RCRYPT); - } else { - sprintf(msgbuf, "Update complete."); - send_packet(msgbuf, RCRYPT); - } - cleanup(); - close(0); - exit(0); -} - -#define MAX_PRINCIPAL 10 -static Principal principal_data[MAX_PRINCIPAL]; -static C_Block key, master_key; -static Key_schedule master_key_schedule; - -int -do_append(sinp) - struct sockaddr_in *sinp; -{ - Principal default_princ; - char input_name[ANAME_SZ]; - char input_instance[INST_SZ]; - int j,n, more; - long mkeyversion; - - - - /* get master key from MKEYFILE */ - if (kdb_get_master_key(0, master_key, master_key_schedule) != 0) { - syslog(LOG_ERR, "couldn't get master key"); - return(KFAILURE); - } - - mkeyversion = kdb_verify_master_key(master_key, master_key_schedule, NULL); - if (mkeyversion < 0) { - syslog(LOG_ERR, "couldn't validate master key"); - return(KFAILURE); - } - - n = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, - &default_princ, 1, &more); - - if (n != 1) { - syslog(LOG_ERR, "couldn't get default principal"); - return(KFAILURE); - } - - /* - * get principal name, instance, and password from network. - * convert password to key and store it - */ - - if (net_get_principal(input_name, input_instance, (C_Block *)key) != 0) { - return(KFAILURE); - } - - - j = kerb_get_principal( - input_name, - input_instance, - principal_data, - MAX_PRINCIPAL, - &more - ); - - if (j != 0) { - /* already in database, no update */ - syslog(LOG_NOTICE, - "attempt to add duplicate entry for principal %s.%s", - input_name, input_instance); - return(KDC_PR_N_UNIQUE); - } - - /* - * set up principal's name, instance - */ - - strcpy(principal_data[0].name, input_name); - strcpy(principal_data[0].instance, input_instance); - principal_data[0].old = NULL; - - - /* and the expiration date and version #s */ - - principal_data[0].exp_date = default_princ.exp_date; - strcpy(principal_data[0].exp_date_txt, default_princ.exp_date_txt); - principal_data[0].max_life = default_princ.max_life; - principal_data[0].attributes = default_princ.attributes; - principal_data[0].kdc_key_ver = default_princ.kdc_key_ver; - - - /* and the key */ - - kdb_encrypt_key(key, key, master_key, master_key_schedule, - ENCRYPT); - bcopy(key, &principal_data[0].key_low, 4); - bcopy(((long *) key) + 1, &principal_data[0].key_high,4); - bzero(key, sizeof(key)); - - principal_data[0].key_version = 1; /* 1st entry */ - - /* and write it to the database */ - - if (kerb_put_principal(&principal_data[0], 1)) { - syslog(LOG_INFO, "Kerberos update failure: put_principal failed"); - return(KFAILURE); - } - - syslog(LOG_NOTICE, "Kerberos update: wrote new record for %s.%s from %s", - principal_data[0].name, - principal_data[0].instance, - inet_ntoa(sinp->sin_addr) - ); - - return(KSUCCESS); - -} - -void -send_packet(msg,flag) - char *msg; - int flag; -{ - int len = strlen(msg); - msg[len++] = '\n'; - msg[len] = '\0'; - if (len > sizeof(msgbuf)) { - syslog(LOG_ERR, "send_packet: invalid msg size"); - return; - } - if (flag == RCRYPT) { - if (des_write(0, msg, len) != len) - syslog(LOG_ERR, "couldn't write reply message"); - } else if (flag == CLEAR) { - if (write(0, msg, len) != len) - syslog(LOG_ERR, "couldn't write reply message"); - } else - syslog(LOG_ERR, "send_packet: invalid flag (%d)", flag); - -} - -int -net_get_principal(pname, iname, keyp) - char *pname, *iname; - C_Block *keyp; -{ - int cc; - static char password[255]; - - cc = des_read(0, pname, ANAME_SZ); - if (cc != ANAME_SZ) { - syslog(LOG_ERR, "couldn't get principal name"); - return(-1); - } - - cc = des_read(0, iname, INST_SZ); - if (cc != INST_SZ) { - syslog(LOG_ERR, "couldn't get instance name"); - return(-1); - } - - cc = des_read(0, password, 255); - if (cc != 255) { - syslog(LOG_ERR, "couldn't get password"); - bzero(password, 255); - return(-1); - } - - string_to_key(password, (des_cblock *)*keyp); - bzero(password, 255); - return(0); -} - -void -cleanup() -{ - bzero(master_key, sizeof(master_key)); - bzero(key, sizeof(key)); - bzero(master_key_schedule, sizeof(master_key_schedule)); -} - -void -die(sig) - int sig; -{ - syslog(LOG_ERR, "remote end died (SIGPIPE)"); - cleanup(); - exit(1); -} diff --git a/eBones/libexec/rkinitd/Makefile b/eBones/libexec/rkinitd/Makefile deleted file mode 100644 index 3872644163897..0000000000000 --- a/eBones/libexec/rkinitd/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 - -PROG= rkinitd -SRCS= ${RKINITOBJDIR}/rkinit_err.h rkinitd.c util.c rpc.c krb.c -CFLAGS+=-I${KRBOBJDIR} -I${RKINITOBJDIR} -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${RKINITOBJDIR} -lrkinit -L${KRBOBJDIR} -lkrb \ - -L${DESOBJDIR} -ldes - -MAN8= rkinitd.8 - -.include diff --git a/eBones/libexec/rkinitd/krb.c b/eBones/libexec/rkinitd/krb.c deleted file mode 100644 index 23734db4307d4..0000000000000 --- a/eBones/libexec/rkinitd/krb.c +++ /dev/null @@ -1,388 +0,0 @@ -/* - * $Id: krb.c,v 1.1 1993/07/29 22:45:19 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinitd/RCS/krb.c,v $ - * $Author: dglo $ - * - * This file contains all of the kerberos part of rkinitd. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: krb.c,v 1.1 1993/07/29 22:45:19 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "rkinitd.h" - -#define FAILURE (!RKINIT_SUCCESS) - -extern int errno; - -static char errbuf[BUFSIZ]; - -typedef struct { - jmp_buf env; -} rkinitd_intkt_info; - - -#if defined(_AIX) && defined(_IBMR2) - -#include - -/* - * The RIOS has bizzarre ideas about changing uids around. They are - * such that the seteuid and setruid calls here fail. For this reason - * we are replacing the seteuid and setruid calls. - * - * The bizzarre ideas are as follows: - * - * The effective ID may be changed only to the current real or - * saved IDs. - * - * The saved uid may be set only if the real and effective - * uids are being set to the same value. - * - * The real uid may be set only if the effective - * uid is being set to the same value. - */ - -#ifdef __STDC__ -static int setruid(uid_t ruid) -#else -static int setruid(ruid) - uid_t ruid; -#endif /* __STDC__ */ -{ - uid_t euid; - - euid = geteuid(); - - if (setuidx(ID_REAL | ID_EFFECTIVE, ruid) == -1) - return (-1); - - return (setuidx(ID_EFFECTIVE, euid)); -} - - -#ifdef __STDC__ -static int seteuid(uid_t euid) -#else -static int seteuid(euid) - uid_t euid; -#endif /* __STDC__ */ -{ - uid_t ruid; - - ruid = getuid(); - - if (setuidx(ID_SAVED | ID_REAL | ID_EFFECTIVE, euid) == -1) - return (-1); - - return (setruid(ruid)); -} - - -#ifdef __STDC__ -static int setreuid(uid_t ruid, uid_t euid) -#else -static int setreuid(ruid, euid) - uid_t ruid; - uid_t euid; -#endif /* __STDC__ */ -{ - if (seteuid(euid) == -1) - return (-1); - - return (setruid(ruid)); -} - - -#ifdef __STDC__ -static int setuid(uid_t uid) -#else -static int setuid(uid) - uid_t uid; -#endif /* __STDC__ */ -{ - return (setreuid(uid, uid)); -} - -#endif /* RIOS */ - - -#ifdef __STDC__ -static void this_phost(char *host, int hostlen) -#else -static void this_phost(host, hostlen) - char *host; - int hostlen; -#endif /* __STDC__ */ -{ - char this_host[MAXHOSTNAMELEN + 1]; - - BCLEAR(this_host); - - if (gethostname(this_host, sizeof(this_host)) < 0) { - sprintf(errbuf, "gethostname: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - error(); - exit(1); - } - - strncpy(host, krb_get_phost(this_host), hostlen - 1); -} - -#ifdef __STDC__ -static int decrypt_tkt(char *user, char *instance, char *realm, char *arg, - int (*key_proc)(), KTEXT *cipp) -#else -static int decrypt_tkt(user, instance, realm, arg, key_proc, cipp) - char *user; - char *instance; - char *realm; - char *arg; - int (*key_proc)(); - KTEXT *cipp; -#endif /* __STDC__ */ -{ - MSG_DAT msg_data; /* Message data containing decrypted data */ - KTEXT_ST auth; /* Authenticator */ - AUTH_DAT auth_dat; /* Authentication data */ - KTEXT cip = *cipp; - MSG_DAT scip; - int status = 0; - des_cblock key; - des_key_schedule sched; - char phost[MAXHOSTNAMELEN + 1]; - struct sockaddr_in caddr; /* client internet address */ - struct sockaddr_in saddr; /* server internet address */ - - rkinitd_intkt_info *rii = (rkinitd_intkt_info *)arg; - - u_char enc_data[MAX_KTXT_LEN]; - - SBCLEAR(auth); - SBCLEAR(auth_dat); - SBCLEAR(scip); - BCLEAR(enc_data); - - scip.app_data = enc_data; - - /* - * Exchange with the client our response from the KDC (ticket encrypted - * in user's private key) for the same ticket encrypted in our - * (not yet known) session key. - */ - - rpc_exchange_tkt(cip, &scip); - - /* - * Get the authenticator - */ - - SBCLEAR(auth); - - rpc_getauth(&auth, &caddr, &saddr); - - /* - * Decode authenticator and extract session key. The first zero - * means we don't care what host this comes from. This needs to - * be done with euid of root so that /etc/srvtab can be read. - */ - - BCLEAR(phost); - this_phost(phost, sizeof(phost)); - - /* - * This function has to use longjmp to return to the caller - * because the kerberos library routine that calls it doesn't - * pay attention to the return value it gives. That means that - * if any of these routines failed, the error returned to the client - * would be "password incorrect". - */ - - if ((status = krb_rd_req(&auth, KEY, phost, caddr.sin_addr.s_addr, - &auth_dat, KEYFILE))) { - sprintf(errbuf, "krb_rd_req: %s", krb_err_txt[status]); - rkinit_errmsg(errbuf); - longjmp(rii->env, status); - } - - bcopy(auth_dat.session, key, sizeof(key)); - if (des_key_sched(&key, sched)) { - sprintf(errbuf, "Error in des_key_sched"); - rkinit_errmsg(errbuf); - longjmp(rii->env, RKINIT_DES); - } - - /* Decrypt the data. */ - if ((status = - krb_rd_priv((u_char *)scip.app_data, scip.app_length, - sched, key, &caddr, &saddr, &msg_data)) == KSUCCESS) { - cip->length = msg_data.app_length; - bcopy(msg_data.app_data, cip->dat, msg_data.app_length); - cip->dat[cip->length] = 0; - } - else { - sprintf(errbuf, "krb_rd_priv: %s", krb_err_txt[status]); - rkinit_errmsg(errbuf); - longjmp(rii->env, status); - } - - return(status); -} - -#ifdef __STDC__ -static int validate_user(char *aname, char *inst, char *realm, - char *username, char *errmsg) -#else -static int validate_user(aname, inst, realm, username, errmsg) - char *aname; - char *inst; - char *realm; - char *username; - char *errmsg; -#endif /* __STDC__ */ -{ - struct passwd *pwnam; /* For access_check and uid */ - AUTH_DAT auth_dat; - int kstatus = KSUCCESS; - - SBCLEAR(auth_dat); - - if ((pwnam = getpwnam(username)) == NULL) { - sprintf(errmsg, "%s does not exist on the remote host.", username); - return(FAILURE); - } - - strcpy(auth_dat.pname, aname); - strcpy(auth_dat.pinst, inst); - strcpy(auth_dat.prealm, realm); - - if (seteuid(pwnam->pw_uid) < 0) { - sprintf(errmsg, "Failure setting euid to %d: %s\n", pwnam->pw_uid, - sys_errlist[errno]); - strcpy(errbuf, errmsg); - error(); - return(FAILURE); - } - kstatus = kuserok(&auth_dat, username); - if (seteuid(0) < 0) { - sprintf(errmsg, "Failure setting euid to 0: %s\n", - sys_errlist[errno]); - strcpy(errbuf, errmsg); - error(); - return(FAILURE); - } - - if (kstatus != KSUCCESS) { - sprintf(errmsg, "%s has not allowed you to log in with", username); - if (strlen(auth_dat.pinst)) - sprintf(errmsg, "%s %s.%s", errmsg, auth_dat.pname, - auth_dat.pinst); - else - sprintf(errmsg, "%s %s", errmsg, auth_dat.pname); - sprintf(errmsg, "%s@%s tickets.", errmsg, auth_dat.prealm); - return(FAILURE); - } - - /* - * Set real uid to owner of ticket file. The library takes care - * of making the appropriate change. - */ - if (setruid(pwnam->pw_uid) < 0) { - sprintf(errmsg, "Failure setting ruid to %d: %s\n", pwnam->pw_uid, - sys_errlist[errno]); - strcpy(errbuf, errmsg); - error(); - return(FAILURE); - } - - return(RKINIT_SUCCESS); -} - -#ifdef __STDC__ -int get_tickets(int version) -#else -int get_tickets(version) - int version; -#endif /* __STDC__ */ -{ - rkinit_info info; - AUTH_DAT auth_dat; - - int status; - char errmsg[BUFSIZ]; /* error message for client */ - - rkinitd_intkt_info rii; - - SBCLEAR(info); - SBCLEAR(auth_dat); - BCLEAR(errmsg); - SBCLEAR(rii); - - rpc_get_rkinit_info(&info); - - /* - * The validate_user routine makes sure that the principal in question - * is allowed to log in as username, and if so, does a setuid(localuid). - * If there is an access violation or an error in setting the uid, - * an error is returned and the string errmsg is initialized with - * an error message that will be sent back to the client. - */ - if ((status = validate_user(info.aname, info.inst, info.realm, - info.username, errmsg)) != RKINIT_SUCCESS) { - rpc_send_error(errmsg); - exit(0); - } - else - rpc_send_success(); - - /* - * If the name of a ticket file was specified, set it; otherwise, - * just use the default. - */ - if (strlen(info.tktfilename)) - krb_set_tkt_string(info.tktfilename); - - /* - * Call internal kerberos library routine so that we can supply - * our own ticket decryption routine. - */ - - /* - * We need a setjmp here because krb_get_in_tkt ignores the - * return value of decrypt_tkt. Thus if we want any of its - * return values to reach the client, we have to jump out of - * the routine. - */ - - if (setjmp(rii.env) == 0) { - if ((status = krb_get_in_tkt(info.aname, info.inst, info.realm, - info.sname, info.sinst, info.lifetime, - NULL, decrypt_tkt, (char *)&rii))) { - strcpy(errmsg, krb_err_txt[status]); - rpc_send_error(errmsg); - } - else - rpc_send_success(); - } - else - rpc_send_error(errbuf); - - return(RKINIT_SUCCESS); -} diff --git a/eBones/libexec/rkinitd/rkinitd.8 b/eBones/libexec/rkinitd/rkinitd.8 deleted file mode 100644 index c90f92e5a17d2..0000000000000 --- a/eBones/libexec/rkinitd/rkinitd.8 +++ /dev/null @@ -1,42 +0,0 @@ -.\" -.\" $Header: /home/ncvs/src/eBones/libexec/rkinitd/rkinitd.8,v 1.2 1995/09/17 07:58:21 markm Exp $ -.\" $Source: /home/ncvs/src/eBones/libexec/rkinitd/rkinitd.8,v $ -.\" $Author: markm $ -.\" -.\" -.TH RKINITD 8 "November 12, 1989" -.UC 4 -.SH NAME -rkinitd \- server for -.I rkinit, -a remote kerberos ticket establishment utility -.SH SYNOPSIS -.B rkinitd -.SH DESCRIPTION -.I rkinitd -is the server for -.I rkinit. -See -.IR rkinit (1) -for information about -.I rkinit. -.I rkinitd -is started from inetd and must be run as root or be installed -setuid(root) as it needs to be able to read /etc/kerberosIV/srvtab and -change its uid to create tickets. - -.I rkinitd -times out in 60 seconds if the transaction is not completed. - -.I rkinitd -must be running on a machine that is registered for rlogin -service; that is, the host must have a srvtab containing an rcmd. -key where is the value returned by the -.IR krb_get_phost (3) -kerberos library call. - -.SH SEE ALSO -rkinit(1), inetd(8), kerberos(1), kerberos(3) - -.SH AUTHOR -Emanuel Jay Berkenbilt (MIT-Project Athena) diff --git a/eBones/libexec/rkinitd/rkinitd.c b/eBones/libexec/rkinitd/rkinitd.c deleted file mode 100644 index 724414977c24f..0000000000000 --- a/eBones/libexec/rkinitd/rkinitd.c +++ /dev/null @@ -1,137 +0,0 @@ -/* - * $Id: rkinitd.c,v 1.1 1993/12/10 18:54:19 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinitd/RCS/rkinitd.c,v $ - * $Author: dglo $ - * - * This is the main source file for rkinit - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rkinitd.c,v 1.1 1993/12/10 18:54:19 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "rkinitd.h" - -extern int errno; - -static int inetd = TRUE; /* True if we were started by inetd */ - -#ifdef __STDC__ -static void usage(void) -#else -static void usage() -#endif /* __STDC__ */ -{ - syslog(LOG_ERR, "rkinitd usage: rkinitd [-notimeout]\n"); - exit(1); -} - -#ifdef __STDC__ -void error(void) -#else -void error() -#endif /* __STDC__ */ -{ - char errbuf[BUFSIZ]; - - strcpy(errbuf, rkinit_errmsg(0)); - if (strlen(errbuf)) { - if (inetd) - syslog(LOG_ERR, "rkinitd: %s", errbuf); - else - fprintf(stderr, "rkinitd: %s\n", errbuf); - } -} - -int -#ifdef __STDC__ -main(int argc, char *argv[]) -#else -main(argc, argv) - int argc; - char *argv[]; -#endif /* __STDC__ */ -{ - int version; /* Version of the transaction */ - - int notimeout = FALSE; /* Should we not timeout? */ - - static char *envinit[1]; /* Empty environment */ - extern char **environ; /* This process's environment */ - - int status = 0; /* General error code */ - - /* - * Clear the environment so that this process does not inherit - * kerberos ticket variable information from the person who started - * the process (if a person started it...). - */ - environ = envinit; - - /* Initialize com_err error table */ - init_rkin_err_tbl(); - -#ifdef DEBUG - /* This only works if the library was compiled with DEBUG defined */ - rki_i_am_server(); -#endif /* DEBUG */ - - /* - * Make sure that we are running as root or can arrange to be - * running as root. We need both to be able to read /etc/srvtab - * and to be able to change uid to create tickets. - */ - - (void) setuid(0); - if (getuid() != 0) { - syslog(LOG_ERR, "rkinitd: not running as root.\n"); - exit(1); - } - - /* Determine whether to time out */ - if (argc == 2) { - if (strcmp(argv[1], "-notimeout")) - usage(); - else - notimeout = TRUE; - } - else if (argc != 1) - usage(); - - inetd = setup_rpc(notimeout); - - if ((status = choose_version(&version) != RKINIT_SUCCESS)) { - error(); - exit(1); - } - - if ((status = get_tickets(version) != RKINIT_SUCCESS)) { - error(); - exit(1); - } - - exit(0); -} - - diff --git a/eBones/libexec/rkinitd/rkinitd.h b/eBones/libexec/rkinitd/rkinitd.h deleted file mode 100644 index 1a65cba24ae36..0000000000000 --- a/eBones/libexec/rkinitd/rkinitd.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * $Id: rkinitd.h,v 1.1 1993/12/10 19:02:10 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinitd/RCS/rkinitd.h,v $ - * $Author: dglo $ - * - * This header file contains function declarations for use for rkinitd - */ - -#ifndef __RKINITD_H__ -#define __RKINITD_H__ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid_rkinitd_h = "$Id: rkinitd.h,v 1.1 1993/12/10 19:02:10 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#ifdef __STDC__ -#define RK_PROTO(x) x -#else -#define RK_PROTO(x) () -#endif /* __STDC__ */ - -int get_tickets RK_PROTO((int)); -void error RK_PROTO((void)); -int setup_rpc RK_PROTO((int)) ; -void rpc_exchange_version_info RK_PROTO((int *, int *, int, int)); -void rpc_get_rkinit_info RK_PROTO((rkinit_info *)); -void rpc_send_error RK_PROTO((char *)); -void rpc_send_success RK_PROTO((void)); -void rpc_exchange_tkt RK_PROTO((KTEXT, MSG_DAT *)); -void rpc_getauth RK_PROTO((KTEXT, struct sockaddr_in *, struct sockaddr_in *)); -int choose_version RK_PROTO((int *)); - - -#endif /* __RKINITD_H__ */ diff --git a/eBones/libexec/rkinitd/rpc.c b/eBones/libexec/rkinitd/rpc.c deleted file mode 100644 index 97d4f9f85c4e4..0000000000000 --- a/eBones/libexec/rkinitd/rpc.c +++ /dev/null @@ -1,222 +0,0 @@ -/* - * $Id: rpc.c,v 1.1 1993/12/10 18:59:29 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinitd/RCS/rpc.c,v $ - * $Author: dglo $ - * - * This file contains the network parts of the rkinit server. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rpc.c,v 1.1 1993/12/10 18:59:29 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "rkinitd.h" - -#define RKINITD_TIMEOUT 60 - -extern int errno; - -static int in; /* sockets */ -static int out; - -static char errbuf[BUFSIZ]; - -void error(); - -#ifdef __STDC__ -static void timeout(int signal) -#else -static void timeout(signal) - int signal; -#endif /* __STDC__ */ -{ - syslog(LOG_WARNING, "rkinitd timed out.\n"); - exit(1); - - return; -} - -/* - * This function does all the network setup for rkinitd. - * It returns true if we were started from inetd, or false if - * we were started from the commandline. - * It causes the program to exit if there is an error. - */ -#ifdef __STDC__ -int setup_rpc(int notimeout) -#else -int setup_rpc(notimeout) - int notimeout; /* True if we should not timeout */ -#endif /* __STDC__ */ -{ - struct itimerval timer; /* Time structure for timeout */ - - /* For now, support only inetd. */ - in = 0; - out = 1; - - if (! notimeout) { - SBCLEAR(timer); - - /* Set up an itimer structure to send an alarm signal after timeout - seconds. */ - timer.it_interval.tv_sec = RKINITD_TIMEOUT; - timer.it_interval.tv_usec = 0; - timer.it_value = timer.it_interval; - - /* Start the timer. */ - if (setitimer (ITIMER_REAL, &timer, (struct itimerval *)0) < 0) { - sprintf(errbuf, "setitimer: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - error(); - exit(1); - } - - signal(SIGALRM, timeout); - } - - return(TRUE); -} - -#ifdef __STDC__ -void rpc_exchange_version_info(int *c_lversion, int *c_hversion, - int s_lversion, int s_hversion) -#else -void rpc_exchange_version_info(c_lversion, c_hversion, s_lversion, s_hversion) - int *c_lversion; - int *c_hversion; - int s_lversion; - int s_hversion; -#endif /* __STDC__ */ -{ - u_char version_info[VERSION_INFO_SIZE]; - u_int32_t length = sizeof(version_info); - - if (rki_get_packet(in, MT_CVERSION, &length, (char *)version_info) != - RKINIT_SUCCESS) { - error(); - exit(1); - } - - *c_lversion = version_info[0]; - *c_hversion = version_info[1]; - - version_info[0] = s_lversion; - version_info[1] = s_hversion; - - if (rki_send_packet(out, MT_SVERSION, length, (char *)version_info) != - RKINIT_SUCCESS) { - error(); - exit(1); - } -} - -#ifdef __STDC__ -void rpc_get_rkinit_info(rkinit_info *info) -#else -void rpc_get_rkinit_info(info) - rkinit_info *info; -#endif /* __STDC__ */ -{ - u_int32_t length = sizeof(rkinit_info); - - if (rki_get_packet(in, MT_RKINIT_INFO, &length, (char *)info)) { - error(); - exit(1); - } - - info->lifetime = ntohl(info->lifetime); -} - -#ifdef __STDC__ -void rpc_send_error(char *errmsg) -#else -void rpc_send_error(errmsg) - char *errmsg; -#endif /* __STDC__ */ -{ - if (rki_send_packet(out, MT_STATUS, strlen(errmsg), errmsg)) { - error(); - exit(1); - } -} - -#ifdef __STDC__ -void rpc_send_success(void) -#else -void rpc_send_success() -#endif /* __STDC__ */ -{ - if (rki_send_packet(out, MT_STATUS, 0, "")) { - error(); - exit(1); - } -} - -#ifdef __STDC__ -void rpc_exchange_tkt(KTEXT cip, MSG_DAT *scip) -#else -void rpc_exchange_tkt(cip, scip) - KTEXT cip; - MSG_DAT *scip; -#endif /* __STDC__ */ -{ - u_int32_t length = MAX_KTXT_LEN; - - if (rki_send_packet(out, MT_SKDC, cip->length, (char *)cip->dat)) { - error(); - exit(1); - } - - if (rki_get_packet(in, MT_CKDC, &length, (char *)scip->app_data)) { - error(); - exit(1); - } - scip->app_length = length; -} - -#ifdef __STDC__ -void rpc_getauth(KTEXT auth, struct sockaddr_in *caddr, - struct sockaddr_in *saddr) -#else -void rpc_getauth(auth, caddr, saddr) - KTEXT auth; - struct sockaddr_in *caddr; - struct sockaddr_in *saddr; -#endif /* __STDC__ */ -{ - int addrlen = sizeof(struct sockaddr_in); - - if (rki_rpc_get_ktext(in, auth, MT_AUTH)) { - error(); - exit(1); - } - - if (getpeername(in, (struct sockaddr *)caddr, &addrlen) < 0) { - sprintf(errbuf, "getpeername: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - error(); - exit(1); - } - - if (getsockname(out, (struct sockaddr *)saddr, &addrlen) < 0) { - sprintf(errbuf, "getsockname: %s", sys_errlist[errno]); - rkinit_errmsg(errbuf); - error(); - exit(1); - } -} diff --git a/eBones/libexec/rkinitd/util.c b/eBones/libexec/rkinitd/util.c deleted file mode 100644 index 20812051dc48f..0000000000000 --- a/eBones/libexec/rkinitd/util.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * $Id: util.c,v 1.1 1993/12/10 18:59:29 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinitd/RCS/util.c,v $ - * $Author: dglo $ - * - * This file contains general rkinit server utilities. - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: util.c,v 1.1 1993/12/10 18:59:29 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include - -#include "rkinitd.h" - -static char errbuf[BUFSIZ]; - -void rpc_exchange_version_info(); -void error(); - -#ifdef __STDC__ -int choose_version(int *version) -#else -int choose_version(version) - int *version; -#endif /* __STDC__ */ -{ - int c_lversion; /* lowest version number client supports */ - int c_hversion; /* highest version number client supports */ - int status = RKINIT_SUCCESS; - - rpc_exchange_version_info(&c_lversion, &c_hversion, - RKINIT_LVERSION, RKINIT_HVERSION); - - *version = min(RKINIT_HVERSION, c_hversion); - if (*version < max(RKINIT_LVERSION, c_lversion)) { - sprintf(errbuf, - "Can't run version %d client against version %d server.", - c_hversion, RKINIT_HVERSION); - rkinit_errmsg(errbuf); - return(RKINIT_VERSION); - } - - return(status); -} diff --git a/eBones/man/Makefile b/eBones/man/Makefile deleted file mode 100644 index 6c74d1cb3d73a..0000000000000 --- a/eBones/man/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# from: @(#)Makefile 5.4 (Berkeley) 7/25/90 -# $Id$ - -MAN1= kerberos.1 -MAN5= krb.conf.5 krb.realms.5 - -.include diff --git a/eBones/man/kerberos.1 b/eBones/man/kerberos.1 deleted file mode 100644 index c489b880c23c8..0000000000000 --- a/eBones/man/kerberos.1 +++ /dev/null @@ -1,259 +0,0 @@ -.\" from: kerberos.1,v 4.7 89/01/23 11:39:33 jtkohl Exp $ -.\" $Id: kerberos.1,v 1.2 1994/07/19 19:27:33 g89r4222 Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KERBEROS 1 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kerberos \- introduction to the Kerberos system - -.SH DESCRIPTION -The -Kerberos -system authenticates -individual users in a network environment. -After authenticating yourself to -Kerberos, -you can use network utilities such as -.IR rlogin , -.IR rcp , -and -.IR rsh -without -having to present passwords to remote hosts and without having to bother -with -.I \.rhosts -files. -Note that these utilities will work without passwords only if -the remote machines you deal with -support the -Kerberos -system. -All Athena timesharing machines and public workstations support -Kerberos. -.PP -Before you can use -Kerberos, -you must register as an Athena user, -and you must make sure you have been added to -the -Kerberos -database. -You can use the -.I kinit -command to find out. -This command -tries to log you into the -Kerberos -system. -.I kinit -will prompt you for a username and password. -Enter your username and password. -If the utility lets you login without giving you a message, -you have already been registered. -.PP -If you enter your username and -.I kinit -responds with this message: -.nf - -Principal unknown (kerberos) - -.fi -you haven't been registered as a -Kerberos -user. -See your system administrator. -.PP -A Kerberos name contains three parts. -The first is the -.I principal name, -which is usually a user's or service's name. -The second is the -.I instance, -which in the case of a user is usually null. -Some users may have privileged instances, however, -such as ``root'' or ``admin''. -In the case of a service, the instance is the -name of the machine on which it runs; i.e. there -can be an -.I rlogin -service running on the machine ABC, which -is different from the rlogin service running on -the machine XYZ. -The third part of a Kerberos name -is the -.I realm. -The realm corresponds to the Kerberos service providing -authentication for the principal. -For example, at MIT there is a Kerberos running at the -Laboratory for Computer Science and one running at -Project Athena. -.PP -When writing a Kerberos name, the principal name is -separated from the instance (if not null) by a period, -and the realm (if not the local realm) follows, preceded by -an ``@'' sign. -The following are examples of valid Kerberos names: -.sp -.nf -.in +8 -billb -jis.admin -srz@lcs.mit.edu -treese.root@athena.mit.edu -.in -8 -.fi -.PP -When you authenticate yourself with -Kerberos, -through either the workstation -.I toehold -system or the -.I kinit -command, -Kerberos -gives you an initial -Kerberos -.IR ticket . -(A -Kerberos -ticket -is an encrypted protocol message that provides authentication.) -Kerberos -uses this ticket for network utilities -such as -.I rlogin -and -.IR rcp . -The ticket transactions are done transparently, -so you don't have to worry about their management. -.PP -Note, however, that tickets expire. -Privileged tickets, such as root instance tickets, -expire in a few minutes, while tickets that carry more ordinary -privileges may be good for several hours or a day, depending on the -installation's policy. -If your login session extends beyond the time limit, -you will have to re-authenticate yourself to -Kerberos -to get new tickets. -Use the -.IR kinit -command to re-authenticate yourself. -.PP -If you use the -.I kinit -command to get your tickets, -make sure you use the -.I kdestroy -command -to destroy your tickets before you end your login session. -You should probably put the -.I kdestroy -command in your -.I \.logout -file so that your tickets will be destroyed automatically when you logout. -For more information about the -.I kinit -and -.I kdestroy -commands, -see the -.I kinit(1) -and -.I kdestroy(1) -manual pages. -.PP -Currently, -Kerberos -supports the following network services: -.IR rlogin , -.IR rsh , -and -.IR rcp . -Other services are being worked on, -such as the -.IR pop -mail system and NFS (network file system), -but are not yet available. - -.SH "SEE ALSO" -kdestroy(1), kinit(1), klist(1), kpasswd(1), des_crypt(3), kerberos(3), -kadmin(8) -.SH BUGS -Kerberos -will not do authentication forwarding. -In other words, -if you use -.I rlogin -to login to a remote host, -you cannot use -Kerberos -services from that host -until you authenticate yourself explicitly on that host. -Although you may need to authenticate yourself on the remote -host, -be aware that when you do so, -.I rlogin -sends your password across the network in clear text. - -.SH AUTHORS -Steve Miller, MIT Project Athena/Digital Equipment Corporation -.br -Clifford Neuman, MIT Project Athena - -The following people helped out on various aspects of the system: - -Jeff Schiller designed and wrote the administration server and its -user interface, kadmin. -He also wrote the dbm version of the database management system. - -Mark Colan developed the -Kerberos -versions of -.IR rlogin , -.IR rsh , -and -.IR rcp , -as well as contributing work on the servers. - -John Ostlund developed the -Kerberos -versions of -.I passwd -and -.IR userreg . - -Stan Zanarotti pioneered Kerberos in a foreign realm (LCS), -and made many contributions based on that experience. - -Many people contributed code and/or useful ideas, including -Jim Aspnes, -Bob Baldwin, -John Barba, -Richard Basch, -Jim Bloom, -Bill Bryant, -Rob French, -Dan Geer, -David Jedlinsky, -John Kohl, -John Kubiatowicz, -Bob McKie, -Brian Murphy, -Ken Raeburn, -Chris Reed, -Jon Rochlis, -Mike Shanzer, -Bill Sommerfeld, -Jennifer Steiner, -Ted Ts'o, -and -Win Treese. - -.SH RESTRICTIONS - -COPYRIGHT 1985,1986 Massachusetts Institute of Technology diff --git a/eBones/man/krb.conf.5 b/eBones/man/krb.conf.5 deleted file mode 100644 index 4a87007f8da32..0000000000000 --- a/eBones/man/krb.conf.5 +++ /dev/null @@ -1,32 +0,0 @@ -.\" from: krb.conf.5,v 4.1 89/01/23 11:10:34 jtkohl Exp $ -.\" $Id: krb.conf.5,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KRB.CONF 5 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -/etc/kerberosIV/krb.conf \- Kerberos configuration file -.SH DESCRIPTION -.I krb.conf -contains configuration information describing the Kerberos realm and the -Kerberos key distribution center (KDC) servers for known realms. -.PP -.I krb.conf -contains the name of the local realm in the first -line, followed by lines indicating realm/host -entries. The first token is a realm name, and the second is the hostname -of a host running a KDC for that realm. -The words "admin server" following the hostname indicate that -the host also provides an administrative database server. -For example: -.nf -.in +1i -ATHENA.MIT.EDU -ATHENA.MIT.EDU kerberos-1.mit.edu admin server -ATHENA.MIT.EDU kerberos-2.mit.edu -LCS.MIT.EDU kerberos.lcs.mit.edu admin server -.in -1i -.SH SEE ALSO -krb.realms(5), krb_get_krbhst(3), krb_get_lrealm(3) diff --git a/eBones/man/krb.realms.5 b/eBones/man/krb.realms.5 deleted file mode 100644 index 877477f1c6aea..0000000000000 --- a/eBones/man/krb.realms.5 +++ /dev/null @@ -1,39 +0,0 @@ -.\" from: krb.realms.5,v 4.1 89/01/23 11:10:41 jtkohl Exp $ -.\" $Id: krb.realms.5,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KRB.REALMS 5 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -/etc/kerberosIV/krb.realms \- host to Kerberos realm translation file -.SH DESCRIPTION -.I krb.realms -provides a translation from a hostname to the Kerberos realm name for -the services provided by that host. -.PP -Each line of the translation file is in one of the following forms -(domain_name should be of the form .XXX.YYY, e.g. .LCS.MIT.EDU): -.nf -.in +5n -host_name kerberos_realm -domain_name kerberos_realm -.in -5n -.fi -If a hostname exactly matches the -.I host_name -field in a line of the first -form, the corresponding realm is the realm of the host. -If a hostname does not match any -.I host_name -in the file, but its -domain exactly matches the -.I domain_name -field in a line of the second -form, the corresponding realm is the realm of the host. -.PP -If no translation entry applies, the host's realm is considered to be -the hostname's domain portion converted to upper case. -.SH SEE ALSO -krb_realmofhost(3) diff --git a/eBones/patchlevel.h b/eBones/patchlevel.h deleted file mode 100644 index 87e5061c8a8bd..0000000000000 --- a/eBones/patchlevel.h +++ /dev/null @@ -1,6 +0,0 @@ -/*- - * $Id: patchlevel.h,v 1.3 1995/07/18 16:34:26 mark Exp $ - */ - -#define PATCHLEVEL 9 -#define FreeBSD_PL 0.1 diff --git a/eBones/usr.bin/Makefile b/eBones/usr.bin/Makefile deleted file mode 100644 index fa796caeb8f59..0000000000000 --- a/eBones/usr.bin/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.1 1995/09/13 17:24:05 markm Exp $ - -SUBDIR= kadmin kdestroy kinit klist ksrvtgt register rkinit - -.include diff --git a/eBones/usr.bin/Makefile.inc b/eBones/usr.bin/Makefile.inc deleted file mode 100644 index 5506596ac57e0..0000000000000 --- a/eBones/usr.bin/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 - -BINDIR?= /usr/bin - -.include "../Makefile.inc" diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile deleted file mode 100644 index 8f0864c7cbaf5..0000000000000 --- a/eBones/usr.bin/kadmin/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -PROG= kadmin -SRCS= ${KRBOBJDIR}/krb_err.h kadmin.c kadmin_cmds.c -CLEANFILES+= kadmin_cmds.c krb_err.c -CFLAGS+= -DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KRBOBJDIR} -DPADD= ${LIBKRB} ${LIBDES} -LDADD+= -L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -LDADD+= -lss -lcom_err -MAN8= kadmin.8 - -kadmin_cmds.c: kadmin_cmds.ct - test -e kadmin_cmds.ct || ln -s ${.CURDIR}/kadmin_cmds.ct . - mk_cmds kadmin_cmds.ct - -.include diff --git a/eBones/usr.bin/kadmin/kadmin.8 b/eBones/usr.bin/kadmin/kadmin.8 deleted file mode 100644 index 6e15015713260..0000000000000 --- a/eBones/usr.bin/kadmin/kadmin.8 +++ /dev/null @@ -1,158 +0,0 @@ -.\" from: kadmin.8,v 4.2 89/07/25 17:20:02 jtkohl Exp $ -.\" $Id: kadmin.8,v 1.2 1994/07/19 19:27:22 g89r4222 Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KADMIN 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kadmin \- network utility for Kerberos database administration -.SH SYNOPSIS -.B kadmin [-u user] [-r default_realm] [-m] -.SH DESCRIPTION -This utility provides a unified administration interface to -the -Kerberos -master database. -Kerberos -administrators -use -.I kadmin -to register new users and services to the master database, -and to change information about existing database entries. -For instance, an administrator can use -.I kadmin -to change a user's -Kerberos -password. -A Kerberos administrator is a user with an ``admin'' instance -whose name appears on one of the Kerberos administration access control -lists. If the \-u option is used, -.I user -will be used as the administrator instead of the local user. -If the \-r option is used, -.I default_realm -will be used as the default realm for transactions. Otherwise, -the local realm will be used by default. -If the \-m option is used, multiple requests will be permitted -on only one entry of the admin password. Some sites won't -support this option. - -The -.I kadmin -program communicates over the network with the -.I kadmind -program, which runs on the machine housing the Kerberos master -database. -The -.I kadmind -creates new entries and makes modifications to the database. - -When you enter the -.I kadmin -command, -the program displays a message that welcomes you and explains -how to ask for help. -Then -.I kadmin -waits for you to enter commands (which are described below). -It then asks you for your -.I admin -password before accessing the database. - -Use the -.I add_new_key -(or -.I ank -for short) -command to register a new principal -with the master database. -The command requires one argument, -the principal's name. The name -given can be fully qualified using -the standard -.I name.instance@realm -convention. -You are asked to enter your -.I admin -password, -then prompted twice to enter the principal's -new password. If no realm is specified, -the local realm is used unless another was -given on the commandline with the \-r flag. -If no instance is -specified, a null instance is used. If -a realm other than the default realm is specified, -you will need to supply your admin password for -the other realm. - -Use the -.I change_password (cpw) -to change a principal's -Kerberos -password. -The command requires one argument, -the principal's -name. -You are asked to enter your -.I admin -password, -then prompted twice to enter the principal's new password. -The name -given can be fully qualified using -the standard -.I name.instance@realm -convention. - -Use the -.I change_admin_password (cap) -to change your -.I admin -instance password. -This command requires no arguments. -It prompts you for your old -.I admin -password, then prompts you twice to enter the new -.I admin -password. If this is your first command, -the default realm is used. Otherwise, the realm -used in the last command is used. - -Use the -.I destroy_tickets (dest) -command to destroy your admin tickets explicitly. - -Use the -.I list_requests (lr) -command to get a list of possible commands. - -Use the -.I help -command to display -.IR kadmin's -various help messages. -If entered without an argument, -.I help -displays a general help message. -You can get detailed information on specific -.I kadmin -commands -by entering -.I help -.IR command_name . - -To quit the program, type -.IR quit . - -.SH BUGS -The user interface is primitive, and the command names could be better. - -.SH "SEE ALSO" -kerberos(1), kadmind(8), kpasswd(1), ksrvutil(8) -.br -``A Subsystem Utilities Package for UNIX'' by Ken Raeburn -.SH AUTHORS -Jeffrey I. Schiller, MIT Project Athena -.br -Emanuel Jay Berkenbilt, MIT Project Athena diff --git a/eBones/usr.bin/kadmin/kadmin.c b/eBones/usr.bin/kadmin/kadmin.c deleted file mode 100644 index 54ccedcfab7c2..0000000000000 --- a/eBones/usr.bin/kadmin/kadmin.c +++ /dev/null @@ -1,636 +0,0 @@ -/* - * $Source$ - * $Author$ - * - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Kerberos database administrator's tool. - * - * The default behavior of kadmin is if the -m option is given - * on the commandline, multiple requests are allowed to be given - * with one entry of the admin password (until the tickets expire). - * If you do not want this to be an available option, compile with - * NO_MULTIPLE defined. - */ - -#if 0 -#ifndef lint -static char rcsid_kadmin_c[] = -"BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadmin.c,v 4.5 89/09/26 14:17:54 qjb Exp "; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define BAD_PW 1 -#define GOOD_PW 0 -#define FUDGE_VALUE 15 /* for ticket expiration time */ -#define PE_NO 0 -#define PE_YES 1 -#define PE_UNSURE 2 - -/* for get_password, whether it should do the swapping...necessary for - using vals structure, unnecessary for change_pw requests */ -#define DONTSWAP 0 -#define SWAP 1 - -static void do_init(int argc, char *argv[]); -void clean_up(void); -int get_password(unsigned long *low, unsigned long *high, char *prompt, - int byteswap); -int get_admin_password(void); -int princ_exists(char *name, char *instance, char *realm); - -extern ss_request_table admin_cmds; - -static char myname[ANAME_SZ]; -static char default_realm[REALM_SZ]; /* default kerberos realm */ -static char krbrlm[REALM_SZ]; /* current realm being administered */ -#ifndef NO_MULTIPLE -static int multiple = 0; /* Allow multiple requests per ticket */ -#endif - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int sci_idx; - int code; - char tktstring[MAXPATHLEN]; - - void quit(); - - sci_idx = ss_create_invocation("admin", "2.0", (char *) NULL, - &admin_cmds, &code); - if (code) { - ss_perror(sci_idx, code, "creating invocation"); - exit(1); - } - (void) sprintf(tktstring, "/tmp/tkt_adm_%d",getpid()); - krb_set_tkt_string(tktstring); - - do_init(argc, argv); - - printf("Welcome to the Kerberos Administration Program, version 2\n"); - printf("Type \"help\" if you need it.\n"); - ss_listen(sci_idx, &code); - printf("\n"); - quit(); - exit(0); -} - -int -setvals(vals, string) - Kadm_vals *vals; - char *string; -{ - char realm[REALM_SZ]; - int status = KADM_SUCCESS; - - bzero(vals, sizeof(*vals)); - bzero(realm, sizeof(realm)); - - SET_FIELD(KADM_NAME,vals->fields); - SET_FIELD(KADM_INST,vals->fields); - if ((status = kname_parse(vals->name, vals->instance, realm, string))) { - printf("kerberos error: %s\n", krb_err_txt[status]); - return status; - } - if (!realm[0]) - strcpy(realm, default_realm); - if (strcmp(realm, krbrlm)) { - strcpy(krbrlm, realm); - if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm)) - != KADM_SUCCESS) - printf("kadm error for realm %s: %s\n", - krbrlm, error_message(status)); - } - if (status) - return 1; - else - return KADM_SUCCESS; -} - -void -change_password(argc, argv) - int argc; - char *argv[]; -{ - Kadm_vals old, new; - int status; - char pw_prompt[BUFSIZ]; - - if (argc != 2) { - printf("Usage: change_password loginname\n"); - return; - } - - if (setvals(&old, argv[1]) != KADM_SUCCESS) - return; - - new = old; - - SET_FIELD(KADM_DESKEY,new.fields); - - if (princ_exists(old.name, old.instance, krbrlm) != PE_NO) { - /* get the admin's password */ - if (get_admin_password() != GOOD_PW) - return; - - /* get the new password */ - (void) sprintf(pw_prompt, "New password for %s:", argv[1]); - - if (get_password(&new.key_low, &new.key_high, - pw_prompt, SWAP) == GOOD_PW) { - status = kadm_mod(&old, &new); - if (status == KADM_SUCCESS) { - printf("Password changed for %s.\n", argv[1]); - } else { - printf("kadmin: %s\nwhile changing password for %s", - error_message(status), argv[1]); - } - } else - printf("Error reading password; password unchanged\n"); - bzero((char *)&new, sizeof(new)); -#ifndef NO_MULTIPLE - if (!multiple) - clean_up(); -#endif - } - else - printf("kadmin: Principal does not exist.\n"); - return; -} - -/*ARGSUSED*/ -void -change_admin_password(argc, argv) - int argc; - char *argv[]; -{ - des_cblock newkey; - unsigned long low, high; - int status; - char prompt_pw[BUFSIZ]; - - if (argc != 1) { - printf("Usage: change_admin_password\n"); - return; - } - /* get the admin's password */ - if (get_admin_password() != GOOD_PW) - return; - - (void) sprintf(prompt_pw, "New password for %s.admin:",myname); - if (get_password(&low, &high, prompt_pw, DONTSWAP) == GOOD_PW) { - bcopy((char *)&low,(char *) newkey,4); - bcopy((char *)&high, (char *)(((long *) newkey) + 1),4); - low = high = 0L; - if ((status = kadm_change_pw(newkey)) == KADM_SUCCESS) - printf("Admin password changed\n"); - else - printf("kadm error: %s\n",error_message(status)); - bzero((char *)newkey, sizeof(newkey)); - } else - printf("Error reading password; password unchanged\n"); -#ifndef NO_MULTIPLE - if (!multiple) - clean_up(); -#endif - return; -} - -void -add_new_key(argc, argv) - int argc; - char *argv[]; -{ - Kadm_vals new; - char pw_prompt[BUFSIZ]; - int status; - - if (argc != 2) { - printf("Usage: add_new_key user_name.\n"); - return; - } - if (setvals(&new, argv[1]) != KADM_SUCCESS) - return; - - SET_FIELD(KADM_DESKEY,new.fields); - - if (princ_exists(new.name, new.instance, krbrlm) != PE_YES) { - /* get the admin's password */ - if (get_admin_password() != GOOD_PW) - return; - - /* get the new password */ - (void) sprintf(pw_prompt, "Password for %s:", argv[1]); - - if (get_password(&new.key_low, &new.key_high, - pw_prompt, SWAP) == GOOD_PW) { - status = kadm_add(&new); - if (status == KADM_SUCCESS) { - printf("%s added to database.\n", argv[1]); - } else { - printf("kadm error: %s\n",error_message(status)); - } - } else - printf("Error reading password; %s not added\n",argv[1]); - bzero((char *)&new, sizeof(new)); -#ifndef NO_MULTIPLE - if (!multiple) - clean_up(); -#endif - } - else - printf("kadmin: Principal already exists.\n"); - return; -} - -void -get_entry(argc, argv) - int argc; - char *argv[]; -{ - int status; - u_char fields[4]; - Kadm_vals vals; - - if (argc != 2) { - printf("Usage: get_entry username\n"); - return; - } - - bzero(fields, sizeof(fields)); - - SET_FIELD(KADM_NAME,fields); - SET_FIELD(KADM_INST,fields); - SET_FIELD(KADM_EXPDATE,fields); - SET_FIELD(KADM_ATTR,fields); - SET_FIELD(KADM_MAXLIFE,fields); - - if (setvals(&vals, argv[1]) != KADM_SUCCESS) - return; - - - if (princ_exists(vals.name, vals.instance, krbrlm) != PE_NO) { - /* get the admin's password */ - if (get_admin_password() != GOOD_PW) - return; - - if ((status = kadm_get(&vals, fields)) == KADM_SUCCESS) - prin_vals(&vals); - else - printf("kadm error: %s\n",error_message(status)); - -#ifndef NO_MULTIPLE - if (!multiple) - clean_up(); -#endif - } - else - printf("kadmin: Principal does not exist.\n"); - return; -} - - -void -help(argc, argv) - int argc; - char *argv[]; -{ - if (argc == 1) { - printf("Welcome to the Kerberos administration program."); - printf("Type \"?\" to get\n"); - printf("a list of requests that are available. You can"); - printf(" get help on each of\n"); - printf("the commands by typing \"help command_name\"."); - printf(" Some functions of this\n"); - printf("program will require an \"admin\" password"); - printf(" from you. This is a password\n"); - printf("private to you, that is used to authenticate"); - printf(" requests from this\n"); - printf("program. You can change this password with"); - printf(" the \"change_admin_password\"\n"); - printf("(or short form \"cap\") command. Good Luck! \n"); - } else if (!strcmp(argv[1], "change_password") || - !strcmp(argv[1], "cpw")) { - printf("Usage: change_password user_name.\n"); - printf("\n"); - printf("user_name is the name of the user whose password"); - printf(" you wish to change. \n"); - printf("His/her password is changed in the kerberos database\n"); - printf("When this command is issued, first the \"Admin\""); - printf(" password will be prompted\n"); - printf("for and if correct the user's new password will"); - printf(" be prompted for (twice with\n"); - printf("appropriate comparison). Note: No minimum password"); - printf(" length restrictions apply, but\n"); - printf("longer passwords are more secure.\n"); - } else if (!strcmp(argv[1], "change_admin_password") || - !strcmp(argv[1], "cap")) { - printf("Usage: change_admin_password.\n"); - printf("\n"); - printf("This command takes no arguments and is used"); - printf(" to change your private\n"); - printf("\"Admin\" password. It will first prompt for"); - printf(" the (current) \"Admin\"\n"); - printf("password and then ask for the new password"); - printf(" by prompting:\n"); - printf("\n"); - printf("New password for .admin:\n"); - printf("\n"); - printf("Enter the new admin password that you desire"); - printf(" (it will be asked for\n"); - printf("twice to avoid errors).\n"); - } else if (!strcmp(argv[1], "add_new_key") || - !strcmp(argv[1], "ank")) { - printf("Usage: add_new_key user_name.\n"); - printf("\n"); - printf("user_name is the name of a new user to put"); - printf(" in the kerberos database. Your\n"); - printf("\"Admin\" password and the user's password"); - printf(" are prompted for. The user's\n"); - printf("password will be asked for"); - printf(" twice to avoid errors.\n"); - } else if (!strcmp(argv[1], "get_entry") || - !strcmp(argv[1], "get")) { - printf("Usage: get_entry user_name.\n"); - printf("\n"); - printf("user_name is the name of a user whose"); - printf(" entry you wish to review. Your\n"); - printf("\"Admin\" password is prompted for. "); - printf(" The key field is not filled in, for\n"); - printf("security reasons.\n"); - } else if (!strcmp(argv[1], "destroy_tickets") || - !strcmp(argv[1], "dest")) { - printf("Usage: destroy_tickets\n"); - printf("\n"); - printf("Destroy your admin tickets. This will"); - printf(" cause you to be prompted for your\n"); - printf("admin password on your next request.\n"); - } else if (!strcmp(argv[1], "list_requests") || - !strcmp(argv[1], "lr") || - !strcmp(argv[1], "?")) { - printf("Usage: list_requests\n"); - printf("\n"); - printf("This command lists what other commands are"); - printf(" currently available.\n"); - } else if (!strcmp(argv[1], "exit") || - !strcmp(argv[1], "quit") || - !strcmp(argv[1], "q")) { - printf("Usage: quit\n"); - printf("\n"); - printf("This command exits this program.\n"); - } else { - printf("Sorry there is no such command as %s.", argv[1]); - printf(" Type \"help\" for more information. \n"); - } - return; -} - -void -go_home(str,x) -char *str; -int x; -{ - fprintf(stderr, "%s: %s\n", str, error_message(x)); - clean_up(); - exit(1); -} - -static int inited = 0; - -void -usage() -{ - fprintf(stderr, "Usage: kadmin [-u admin_name] [-r default_realm]"); -#ifndef NO_MULTIPLE - fprintf(stderr, " [-m]"); -#endif - fprintf(stderr, "\n"); -#ifndef NO_MULTIPLE - fprintf(stderr, " -m allows multiple admin requests to be "); - fprintf(stderr, "serviced with one entry of admin\n"); - fprintf(stderr, " password.\n"); -#endif - exit(1); -} - -static void -do_init(argc, argv) - int argc; - char *argv[]; -{ - struct passwd *pw; - extern char *optarg; - extern int optind; - int c; -#ifndef NO_MULTIPLE -#define OPTION_STRING "u:r:m" -#else -#define OPTION_STRING "u:r:" -#endif - - bzero(myname, sizeof(myname)); - - if (!inited) { - /* - * This is only as a default/initial realm; we don't care - * about failure. - */ - if (krb_get_lrealm(default_realm, 1) != KSUCCESS) - strcpy(default_realm, KRB_REALM); - - /* - * If we can reach the local realm, initialize to it. Otherwise, - * don't initialize. - */ - if (kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm) != KADM_SUCCESS) - bzero(krbrlm, sizeof(krbrlm)); - else - strcpy(krbrlm, default_realm); - - while ((c = getopt(argc, argv, OPTION_STRING)) != EOF) - switch (c) { - case 'u': - strncpy(myname, optarg, sizeof(myname) - 1); - break; - case 'r': - bzero(default_realm, sizeof(default_realm)); - strncpy(default_realm, optarg, sizeof(default_realm) - 1); - break; -#ifndef NO_MULTIPLE - case 'm': - multiple++; - break; -#endif - default: - usage(); - break; - } - if (optind < argc) - usage(); - if (!myname[0]) { - pw = getpwuid((int) getuid()); - if (!pw) { - fprintf(stderr, - "You aren't in the password file. Who are you?\n"); - exit(1); - } - (void) strcpy(myname, pw->pw_name); - } - inited = 1; - } -} - -#ifdef NOENCRYPTION -#define read_long_pw_string placebo_read_pw_string -#else -#define read_long_pw_string des_read_pw_string -#endif -extern int read_long_pw_string(); - -int -get_admin_password() -{ - int status; - char admin_passwd[MAX_KPW_LEN]; /* Admin's password */ - int ticket_life = 1; /* minimum ticket lifetime */ -#ifndef NO_MULTIPLE - CREDENTIALS c; - - if (multiple) { - /* If admin tickets exist and are valid, just exit. */ - bzero(&c, sizeof(c)); - if (krb_get_cred(PWSERV_NAME, KADM_SINST, krbrlm, &c) == KSUCCESS) - /* - * If time is less than lifetime - FUDGE_VALUE after issue date, - * tickets will probably last long enough for the next - * transaction. - */ - if (time(0) < (c.issue_date + (5 * 60 * c.lifetime) - FUDGE_VALUE)) - return(KADM_SUCCESS); - ticket_life = DEFAULT_TKT_LIFE; - } -#endif - - if (princ_exists(myname, "admin", krbrlm) != PE_NO) { - if (read_long_pw_string(admin_passwd, sizeof(admin_passwd)-1, - "Admin password:", 0)) { - fprintf(stderr, "Error reading admin password.\n"); - goto bad; - } - status = krb_get_pw_in_tkt(myname, "admin", krbrlm, PWSERV_NAME, - KADM_SINST, ticket_life, admin_passwd); - bzero(admin_passwd, sizeof(admin_passwd)); - } - else - status = KDC_PR_UNKNOWN; - - switch(status) { - case GT_PW_OK: - return(GOOD_PW); - case KDC_PR_UNKNOWN: - printf("Principal %s.admin@%s does not exist.\n", myname, krbrlm); - goto bad; - case GT_PW_BADPW: - printf("Incorrect admin password.\n"); - goto bad; - default: - com_err("kadmin", status+krb_err_base, - "while getting password tickets"); - goto bad; - } - - bad: - bzero(admin_passwd, sizeof(admin_passwd)); - (void) dest_tkt(); - return(BAD_PW); -} - -void -clean_up() -{ - (void) dest_tkt(); - return; -} - -void -quit() -{ - printf("Cleaning up and exiting.\n"); - clean_up(); - exit(0); -} - -int -princ_exists(name, instance, realm) - char *name; - char *instance; - char *realm; -{ - int status; - - status = krb_get_pw_in_tkt(name, instance, realm, "krbtgt", realm, 1, ""); - - if ((status == KSUCCESS) || (status == INTK_BADPW)) - return(PE_YES); - else if (status == KDC_PR_UNKNOWN) - return(PE_NO); - else - return(PE_UNSURE); -} - -int -get_password(low, high, prompt, byteswap) -unsigned long *low, *high; -char *prompt; -int byteswap; -{ - char new_passwd[MAX_KPW_LEN]; /* new password */ - des_cblock newkey; - - do { - if (read_long_pw_string(new_passwd, sizeof(new_passwd)-1, prompt, 1)) - return(BAD_PW); - if (strlen(new_passwd) == 0) - printf("Null passwords are not allowed; try again.\n"); - } while (strlen(new_passwd) == 0); - -#ifdef NOENCRYPTION - bzero((char *) newkey, sizeof(newkey)); -#else - des_string_to_key(new_passwd, &newkey); -#endif - bzero(new_passwd, sizeof(new_passwd)); - - bcopy((char *) newkey,(char *)low,4); - bcopy((char *)(((long *) newkey) + 1), (char *)high,4); - - bzero((char *) newkey, sizeof(newkey)); - -#ifdef NOENCRYPTION - *low = 1; -#endif - - if (byteswap != DONTSWAP) { - *low = htonl(*low); - *high = htonl(*high); - } - return(GOOD_PW); -} diff --git a/eBones/usr.bin/kadmin/kadmin_cmds.ct b/eBones/usr.bin/kadmin/kadmin_cmds.ct deleted file mode 100644 index 141ac154e1f13..0000000000000 --- a/eBones/usr.bin/kadmin/kadmin_cmds.ct +++ /dev/null @@ -1,41 +0,0 @@ -# $Source: /usr/cvs/src/eBones/kadmin/kadmin_cmds.ct,v $ -# $Author: mark $ -# $Header: /usr/cvs/src/eBones/kadmin/kadmin_cmds.ct,v 1.1 1995/07/18 16:36:56 mark Exp $ -# -# Copyright 1988 by the Massachusetts Institute of Technology. -# -# For copying and distribution information, please see the file -# . -# -# Command table for Kerberos administration tool -# - command_table admin_cmds; - - request change_password, - "Change a user's password", - change_password, cpw; - - request change_admin_password, "Change your admin password", - change_admin_password, cap; - - request add_new_key, "Add new user to kerberos database", - add_new_key, ank; - - request get_entry, "Get entry from kerberos database", - get_entry, get; - - request clean_up, "Destroy admin tickets", - destroy_tickets, dest; - - request help,"Request help with this program", - help; - -# list_requests is generic -- unrelated to Kerberos - - request ss_list_requests, "List available requests.", - list_requests, lr, "?"; - - request quit, "Exit program.", - quit, exit, q; - - end; diff --git a/eBones/usr.bin/kdestroy/Makefile b/eBones/usr.bin/kdestroy/Makefile deleted file mode 100644 index d61e691c84f5b..0000000000000 --- a/eBones/usr.bin/kdestroy/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:06:04 gibbs Exp $ - -PROG= kdestroy -CFLAGS+=-DKERBEROS -DDEBUG -DBSD42 -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN1= kdestroy.1 - -.include diff --git a/eBones/usr.bin/kdestroy/kdestroy.1 b/eBones/usr.bin/kdestroy/kdestroy.1 deleted file mode 100644 index 709935366e73a..0000000000000 --- a/eBones/usr.bin/kdestroy/kdestroy.1 +++ /dev/null @@ -1,81 +0,0 @@ -.\" from: kdestroy.1,v 4.9 89/01/23 11:39:50 jtkohl Exp $ -.\" $Id: kdestroy.1,v 1.2 1994/07/19 19:27:32 g89r4222 Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KDESTROY 1 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kdestroy \- destroy Kerberos tickets -.SH SYNOPSIS -.B kdestroy -[ -.B \-f -] -[ -.B \-q -] -.SH DESCRIPTION -The -.I kdestroy -utility destroys the user's active -Kerberos -authorization tickets by writing zeros to the file that contains them. -If the ticket file does not exist, -.I kdestroy -displays a message to that effect. -.PP -After overwriting the file, -.I kdestroy -removes the file from the system. -The utility -displays a message indicating the success or failure of the -operation. -If -.I kdestroy -is unable to destroy the ticket file, -the utility will warn you by making your terminal beep. -.PP -In the Athena workstation environment, -the -.I toehold -service automatically destroys your tickets when you -end a workstation session. -If your site does not provide a similar ticket-destroying mechanism, -you can place the -.I kdestroy -command in your -.I .logout -file so that your tickets are destroyed automatically -when you logout. -.PP -The options to -.I kdestroy -are as follows: -.TP 7 -.B \-f -.I kdestroy -runs without displaying the status message. -.TP -.B \-q -.I kdestroy -will not make your terminal beep if it fails to destroy the tickets. -.SH FILES -KRBTKFILE environment variable if set, otherwise -.br -/tmp/tkt[uid] -.SH SEE ALSO -kerberos(1), kinit(1), klist(1) -.SH BUGS -.PP -Only the tickets in the user's current ticket file are destroyed. -Separate ticket files are used to hold root instance and password -changing tickets. These files should probably be destroyed too, or -all of a user's tickets kept in a single ticket file. -.SH AUTHORS -Steve Miller, MIT Project Athena/Digital Equipment Corporation -.br -Clifford Neuman, MIT Project Athena -.br -Bill Sommerfeld, MIT Project Athena diff --git a/eBones/usr.bin/kdestroy/kdestroy.c b/eBones/usr.bin/kdestroy/kdestroy.c deleted file mode 100644 index 926eea52da956..0000000000000 --- a/eBones/usr.bin/kdestroy/kdestroy.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * This program causes Kerberos tickets to be destroyed. - * Options are: - * - * -q[uiet] - no bell even if tickets not destroyed - * -f[orce] - no message printed at all - * - * from: kdestroy.c,v 4.5 88/03/18 15:16:02 steiner Exp $ - * $Id: kdestroy.c,v 1.3 1995/07/18 16:37:44 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kdestroy.c,v 1.3 1995/07/18 16:37:44 mark Exp $"; -#endif lint -#endif - -#include -#include -#ifdef BSD42 -#include -#endif BSD42 - - -static char *pname; - -static void -usage() -{ - fprintf(stderr, "Usage: %s [-f] [-q]\n", pname); - exit(1); -} - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int fflag=0, qflag=0, k_errno; - register char *cp; - - cp = rindex (argv[0], '/'); - if (cp == NULL) - pname = argv[0]; - else - pname = cp+1; - - if (argc > 2) - usage(); - else if (argc == 2) { - if (!strcmp(argv[1], "-f")) - ++fflag; - else if (!strcmp(argv[1], "-q")) - ++qflag; - else usage(); - } - - k_errno = dest_tkt(); - - if (fflag) { - if (k_errno != 0 && k_errno != RET_TKFIL) - exit(1); - else - exit(0); - } else { - if (k_errno == 0) - printf("Tickets destroyed.\n"); - else if (k_errno == RET_TKFIL) - fprintf(stderr, "No tickets to destroy.\n"); - else { - fprintf(stderr, "Tickets NOT destroyed.\n"); - if (!qflag) - fprintf(stderr, "\007"); - exit(1); - } - } - exit(0); -} diff --git a/eBones/usr.bin/kinit/Makefile b/eBones/usr.bin/kinit/Makefile deleted file mode 100644 index 94549dceb4ece..0000000000000 --- a/eBones/usr.bin/kinit/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:06:11 gibbs Exp $ - -PROG= kinit -CFLAGS+=-DKERBEROS -DDEBUG -DBSD42 -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN1= kinit.1 - -.include diff --git a/eBones/usr.bin/kinit/kinit.1 b/eBones/usr.bin/kinit/kinit.1 deleted file mode 100644 index f9a97a738201a..0000000000000 --- a/eBones/usr.bin/kinit/kinit.1 +++ /dev/null @@ -1,133 +0,0 @@ -.\" from: kinit.1,v 4.6 89/01/23 11:39:11 jtkohl Exp $ -.\" $Id: kinit.1,v 1.2 1994/07/19 19:27:36 g89r4222 Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KINIT 1 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kinit \- Kerberos login utility -.SH SYNOPSIS -.B kinit -[ -.B \-irvl -] -.SH DESCRIPTION -The -.I kinit -command is used to login to the -Kerberos -authentication and authorization system. -Note that only registered -Kerberos -users can use the -Kerberos -system. -For information about registering as a -Kerberos -user, -see the -.I kerberos(1) -manual page. -.PP -If you are logged in to a workstation that is running the -.I toehold -service, -you do not have to use -.I kinit. -The -.I toehold -login procedure will log you into -Kerberos -automatically. -You will need to use -.I kinit -only in those situations in which -your original tickets have expired. -(Tickets expire in about a day.) -Note as well that -.I toehold -will automatically destroy your tickets when you logout from the workstation. -.PP -When you use -.I kinit -without options, -the utility -prompts for your username and Kerberos password, -and tries to authenticate your login with the local -Kerberos -server. -.PP -If -Kerberos -authenticates the login attempt, -.I kinit -retrieves your initial ticket and puts it in the ticket file specified by -your KRBTKFILE environment variable. -If this variable is undefined, -your ticket will be stored in the -.IR /tmp -directory, -in the file -.I tktuid , -where -.I uid -specifies your user identification number. -.PP -If you have logged in to -Kerberos -without the benefit of the workstation -.I toehold -system, -make sure you use the -.I kdestroy -command to destroy any active tickets before you end your login session. -You may want to put the -.I kdestroy -command in your -.I \.logout -file so that your tickets will be destroyed automatically when you logout. -.PP -The options to -.I kinit -are as follows: -.TP 7 -.B \-i -.I kinit -prompts you for a -Kerberos -instance. -.TP -.B \-r -.I kinit -prompts you for a -Kerberos -realm. -This option lets you authenticate yourself with a remote -Kerberos -server. -.TP -.B \-v -Verbose mode. -.I kinit -prints the name of the ticket file used, and -a status message indicating the success or failure of -your login attempt. -.TP -.B \-l -.I kinit -prompts you for a ticket lifetime in minutes. Due to protocol -restrictions in Kerberos Version 4, this value must be between 5 and -1275 minutes. -.SH SEE ALSO -.PP -kerberos(1), kdestroy(1), klist(1), toehold(1) -.SH BUGS -The -.B \-r -option has not been fully implemented. -.SH AUTHORS -Steve Miller, MIT Project Athena/Digital Equipment Corporation -.br -Clifford Neuman, MIT Project Athena diff --git a/eBones/usr.bin/kinit/kinit.c b/eBones/usr.bin/kinit/kinit.c deleted file mode 100644 index 66a6f7f2c3d73..0000000000000 --- a/eBones/usr.bin/kinit/kinit.c +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Routine to initialize user to Kerberos. Prompts optionally for - * user, instance and realm. Authenticates user and gets a ticket - * for the Kerberos ticket-granting service for future use. - * - * Options are: - * - * -i[instance] - * -r[realm] - * -v[erbose] - * -l[ifetime] - * - * from: kinit.c,v 4.12 90/03/20 16:11:15 jon Exp $ - * $Id$ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id$"; -#endif lint -#endif - -#include -#include -#include -#include -#include - -#ifndef ORGANIZATION -#define ORGANIZATION "MIT Project Athena" -#endif /*ORGANIZATION*/ - -#ifdef PC -#define LEN 64 /* just guessing */ -#endif PC - -#if defined(BSD42) || defined(__FreeBSD__) || defined(__NetBSD__) -#include -#include -#if defined(ultrix) || defined(sun) -#define LEN 64 -#else -#define LEN MAXHOSTNAMELEN -#endif /* defined(ultrix) || defined(sun) */ -#endif /* BSD42 */ - -#define LIFE 96 /* lifetime of ticket in 5-minute units */ - -char *progname; - -void usage(void); - -void -get_input(s, size, stream) -char *s; -int size; -FILE *stream; -{ - char *p; - - if (fgets(s, size, stream) == NULL) - exit(1); - if ((p = index(s, '\n')) != NULL) - *p = '\0'; -} - -int -main(argc, argv) - int argc; - char *argv[]; -{ - char aname[ANAME_SZ]; - char inst[INST_SZ]; - char realm[REALM_SZ]; - char buf[LEN]; - char *username = NULL; - int iflag, rflag, vflag, lflag, lifetime, k_errno; - register char *cp; - register i; - - *inst = *realm = '\0'; - iflag = rflag = vflag = lflag = 0; - lifetime = LIFE; - progname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv; - - while (--argc) { - if ((*++argv)[0] != '-') { - if (username) - usage(); - username = *argv; - continue; - } - for (i = 1; (*argv)[i] != '\0'; i++) - switch ((*argv)[i]) { - case 'i': /* Instance */ - ++iflag; - continue; - case 'r': /* Realm */ - ++rflag; - continue; - case 'v': /* Verbose */ - ++vflag; - continue; - case 'l': - ++lflag; - continue; - default: - usage(); - exit(1); - } - } - if (username && - (k_errno = kname_parse(aname, inst, realm, username)) - != KSUCCESS) { - fprintf(stderr, "%s: %s\n", progname, krb_err_txt[k_errno]); - iflag = rflag = 1; - username = NULL; - } - if (k_gethostname(buf, LEN)) { - fprintf(stderr, "%s: k_gethostname failed\n", progname); - exit(1); - } - printf("%s (%s)\n", ORGANIZATION, buf); - if (username) { - printf("Kerberos Initialization for \"%s", aname); - if (*inst) - printf(".%s", inst); - if (*realm) - printf("@%s", realm); - printf("\"\n"); - } else { - if (iflag) { - printf("Kerberos Initialization\n"); - printf("Kerberos name: "); - get_input(aname, sizeof(aname), stdin); - } else { - int uid = getuid(); - char *getenv(); - struct passwd *pwd; - - /* default to current user name unless running as root */ - if (uid == 0 && (username = getenv("USER")) && - strcmp(username, "root") != 0) { - strncpy(aname, username, sizeof(aname)); - strncpy(inst, "root", sizeof(inst)); - } else { - pwd = getpwuid(uid); - - if (pwd == (struct passwd *) NULL) { - fprintf(stderr, "Unknown name for your uid\n"); - printf("Kerberos name: "); - get_input(aname, sizeof(aname), stdin); - } else - strncpy(aname, pwd->pw_name, sizeof(aname)); - } - } - - if (!*aname) - exit(0); - if (!k_isname(aname)) { - fprintf(stderr, "%s: bad Kerberos name format\n", - progname); - exit(1); - } - } - /* optional instance */ - if (iflag) { - printf("Kerberos instance: "); - get_input(inst, sizeof(inst), stdin); - if (!k_isinst(inst)) { - fprintf(stderr, "%s: bad Kerberos instance format\n", - progname); - exit(1); - } - } - if (rflag) { - printf("Kerberos realm: "); - get_input(realm, sizeof(realm), stdin); - if (!k_isrealm(realm)) { - fprintf(stderr, "%s: bad Kerberos realm format\n", - progname); - exit(1); - } - } - if (lflag) { - printf("Kerberos ticket lifetime (minutes): "); - get_input(buf, sizeof(buf), stdin); - lifetime = atoi(buf); - if (lifetime < 5) - lifetime = 1; - else - lifetime /= 5; - /* This should be changed if the maximum ticket lifetime */ - /* changes */ - if (lifetime > 255) - lifetime = 255; - } - if (!*realm && krb_get_lrealm(realm, 1)) { - fprintf(stderr, "%s: krb_get_lrealm failed\n", progname); - exit(1); - } - k_errno = krb_get_pw_in_tkt(aname, inst, realm, "krbtgt", realm, - lifetime, 0); - if (vflag) { - printf("Kerberos realm %s:\n", realm); - printf("%s\n", krb_err_txt[k_errno]); - } else if (k_errno) { - fprintf(stderr, "%s: %s\n", progname, krb_err_txt[k_errno]); - exit(1); - } - return 0; -} - -void -usage() -{ - fprintf(stderr, "Usage: %s [-irvl] [name]\n", progname); - exit(1); -} diff --git a/eBones/usr.bin/klist/Makefile b/eBones/usr.bin/klist/Makefile deleted file mode 100644 index ef144105a6731..0000000000000 --- a/eBones/usr.bin/klist/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:06:15 gibbs Exp $ - -PROG= klist -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN1= klist.1 - -.include diff --git a/eBones/usr.bin/klist/klist.1 b/eBones/usr.bin/klist/klist.1 deleted file mode 100644 index af7e31ad20488..0000000000000 --- a/eBones/usr.bin/klist/klist.1 +++ /dev/null @@ -1,84 +0,0 @@ -.\" from: klist.1,v 4.8 89/01/24 14:35:09 jtkohl Exp $ -.\" $Id: klist.1,v 1.1.1.1 1994/09/30 14:50:06 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KLIST 1 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -klist \- list currently held Kerberos tickets -.SH SYNOPSIS -.B klist -[ -\fB\-s \fR|\fB \-t\fR -] [ -.B \-file -name ] [ -.B \-srvtab -] -.br -.SH DESCRIPTION -.I klist -prints the name of the tickets file and the -identity of the principal the tickets are for (as listed in the -tickets file), and -lists the principal names of all Kerberos tickets currently held by -the user, along with the issue and expire time for each authenticator. -Principal names are listed in the form -.I name.instance@realm, -with the '.' omitted if the instance is null, -and the '@' omitted if the realm is null. - -If given the -.B \-s -option, -.I klist -does not print the issue and expire times, the name of the tickets file, -or the identity of the principal. - -If given the -.B \-t -option, -.B klist -checks for the existence of a non-expired ticket-granting-ticket in the -ticket file. If one is present, it exits with status 0, else it exits -with status 1. No output is generated when this option is specified. - -If given the -.B \-file -option, the following argument is used as the ticket file. -Otherwise, if the -.B KRBTKFILE -environment variable is set, it is used. -If this environment variable -is not set, the file -.B /tmp/tkt[uid] -is used, where -.B uid -is the current user-id of the user. - -If given the -.B \-srvtab -option, the file is treated as a service key file, and the names of the -keys contained therein are printed. If no file is -specified with a -.B \-file -option, the default is -.IR /etc/kerberosIV/srvtab . -.SH FILES -.TP 2i -/etc/kerberosIV/krb.conf -to get the name of the local realm -.TP -/tmp/tkt[uid] -as the default ticket file ([uid] is the decimal UID of the user). -.TP -/etc/kerberosIV/srvtab -as the default service key file -.SH SEE ALSO -.PP -kerberos(1), kinit(1), kdestroy(1) -.SH BUGS -When reading a file as a service key file, very little sanity or error -checking is performed. diff --git a/eBones/usr.bin/klist/klist.c b/eBones/usr.bin/klist/klist.c deleted file mode 100644 index 0927dcb7f58f2..0000000000000 --- a/eBones/usr.bin/klist/klist.c +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Lists your current Kerberos tickets. - * Written by Bill Sommerfeld, MIT Project Athena. - * - * from: klist.c,v 4.15 89/08/30 11:19:16 jtkohl Exp $ - * $Id: klist.c,v 1.3 1995/07/18 16:37:59 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: klist.c,v 1.3 1995/07/18 16:37:59 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -int ok_getst(int fd, char *s, int n); -void display_srvtab(char *file); -char *short_date(long *dp); -void usage(void); -void display_tktfile(char *file, int tgt_test, int long_form); - -char *whoami; /* What was I invoked as?? */ - -extern char *krb_err_txt[]; - -/* ARGSUSED */ -int -main(argc, argv) - int argc; - char **argv; -{ - int long_form = 1; - int tgt_test = 0; - int do_srvtab = 0; - char *tkt_file = NULL; - char *cp; - - whoami = (cp = rindex(*argv, '/')) ? cp + 1 : *argv; - - while (*(++argv)) { - if (!strcmp(*argv, "-s")) { - long_form = 0; - continue; - } - if (!strcmp(*argv, "-t")) { - tgt_test = 1; - long_form = 0; - continue; - } - if (!strcmp(*argv, "-l")) { /* now default */ - continue; - } - if (!strcmp(*argv, "-file")) { - if (*(++argv)) { - tkt_file = *argv; - continue; - } else - usage(); - } - if (!strcmp(*argv, "-srvtab")) { - if (tkt_file == NULL) /* if no other file spec'ed, - set file to default srvtab */ - tkt_file = KEYFILE; - do_srvtab = 1; - continue; - } - usage(); - } - - if (do_srvtab) - display_srvtab(tkt_file); - else - display_tktfile(tkt_file, tgt_test, long_form); - exit(0); -} - -void -display_tktfile(file, tgt_test, long_form) -char *file; -int tgt_test, long_form; -{ - char pname[ANAME_SZ]; - char pinst[INST_SZ]; - char prealm[REALM_SZ]; - char buf1[20], buf2[20]; - int k_errno; - CREDENTIALS c; - int header = 1; - - if ((file == NULL) && ((file = getenv("KRBTKFILE")) == NULL)) - file = TKT_FILE; - - if (long_form) - printf("Ticket file: %s\n", file); - - /* - * Since krb_get_tf_realm will return a ticket_file error, - * we will call tf_init and tf_close first to filter out - * things like no ticket file. Otherwise, the error that - * the user would see would be - * klist: can't find realm of ticket file: No ticket file (tf_util) - * instead of - * klist: No ticket file (tf_util) - */ - - /* Open ticket file */ - if ((k_errno = tf_init(file, R_TKT_FIL))) { - if (!tgt_test) - fprintf(stderr, "%s: %s\n", whoami, krb_err_txt[k_errno]); - exit(1); - } - /* Close ticket file */ - (void) tf_close(); - - /* - * We must find the realm of the ticket file here before calling - * tf_init because since the realm of the ticket file is not - * really stored in the principal section of the file, the - * routine we use must itself call tf_init and tf_close. - */ - if ((k_errno = krb_get_tf_realm(file, prealm)) != KSUCCESS) { - if (!tgt_test) - fprintf(stderr, "%s: can't find realm of ticket file: %s\n", - whoami, krb_err_txt[k_errno]); - exit(1); - } - - /* Open ticket file */ - if ((k_errno = tf_init(file, R_TKT_FIL))) { - if (!tgt_test) - fprintf(stderr, "%s: %s\n", whoami, krb_err_txt[k_errno]); - exit(1); - } - /* Get principal name and instance */ - if ((k_errno = tf_get_pname(pname)) || - (k_errno = tf_get_pinst(pinst))) { - if (!tgt_test) - fprintf(stderr, "%s: %s\n", whoami, krb_err_txt[k_errno]); - exit(1); - } - - /* - * You may think that this is the obvious place to get the - * realm of the ticket file, but it can't be done here as the - * routine to do this must open the ticket file. This is why - * it was done before tf_init. - */ - - if (!tgt_test && long_form) - printf("Principal:\t%s%s%s%s%s\n\n", pname, - (pinst[0] ? "." : ""), pinst, - (prealm[0] ? "@" : ""), prealm); - while ((k_errno = tf_get_cred(&c)) == KSUCCESS) { - if (!tgt_test && long_form && header) { - printf("%-15s %-15s %s\n", - " Issued", " Expires", " Principal"); - header = 0; - } - if (tgt_test) { - c.issue_date += ((unsigned char) c.lifetime) * 5 * 60; - if (!strcmp(c.service, TICKET_GRANTING_TICKET) && - !strcmp(c.instance, prealm)) { - if (time(0) < c.issue_date) - exit(0); /* tgt hasn't expired */ - else - exit(1); /* has expired */ - } - continue; /* not a tgt */ - } - if (long_form) { - (void) strcpy(buf1, short_date(&c.issue_date)); - c.issue_date += ((unsigned char) c.lifetime) * 5 * 60; - (void) strcpy(buf2, short_date(&c.issue_date)); - printf("%s %s ", buf1, buf2); - } - printf("%s%s%s%s%s\n", - c.service, (c.instance[0] ? "." : ""), c.instance, - (c.realm[0] ? "@" : ""), c.realm); - } - if (tgt_test) - exit(1); /* no tgt found */ - if (header && long_form && k_errno == EOF) { - printf("No tickets in file.\n"); - } -} - -char * -short_date(dp) - long *dp; -{ - register char *cp; - extern char *ctime(); - cp = ctime(dp) + 4; - cp[15] = '\0'; - return (cp); -} - -void -usage() -{ - fprintf(stderr, - "Usage: %s [ -s | -t ] [ -file filename ] [ -srvtab ]\n", whoami); - exit(1); -} - -void -display_srvtab(file) -char *file; -{ - int stab; - char serv[SNAME_SZ]; - char inst[INST_SZ]; - char rlm[REALM_SZ]; - unsigned char key[8]; - unsigned char vno; - int count; - - printf("Server key file: %s\n", file); - - if ((stab = open(file, O_RDONLY, 0400)) < 0) { - perror(file); - exit(1); - } - printf("%-15s %-15s %-10s %s\n","Service","Instance","Realm", - "Key Version"); - printf("------------------------------------------------------\n"); - - /* argh. getst doesn't return error codes, it silently fails */ - while (((count = ok_getst(stab, serv, SNAME_SZ)) > 0) - && ((count = ok_getst(stab, inst, INST_SZ)) > 0) - && ((count = ok_getst(stab, rlm, REALM_SZ)) > 0)) { - if (((count = read(stab,(char *) &vno,1)) != 1) || - ((count = read(stab,(char *) key,8)) != 8)) { - if (count < 0) - perror("reading from key file"); - else - fprintf(stderr, "key file truncated\n"); - exit(1); - } - printf("%-15s %-15s %-15s %d\n",serv,inst,rlm,vno); - } - if (count < 0) - perror(file); - (void) close(stab); -} - -/* adapted from getst() in librkb */ -/* - * ok_getst() takes a file descriptor, a string and a count. It reads - * from the file until either it has read "count" characters, or until - * it reads a null byte. When finished, what has been read exists in - * the given string "s". If "count" characters were actually read, the - * last is changed to a null, so the returned string is always null- - * terminated. ok_getst() returns the number of characters read, including - * the null terminator. - * - * If there is a read error, it returns -1 (like the read(2) system call) - */ - -int -ok_getst(fd, s, n) - int fd; - register char *s; - int n; -{ - register count = n; - int err; - while ((err = read(fd, s, 1)) > 0 && --count) - if (*s++ == '\0') - return (n - count); - if (err < 0) - return(-1); - *s = '\0'; - return (n - count); -} diff --git a/eBones/usr.bin/ksrvtgt/Makefile b/eBones/usr.bin/ksrvtgt/Makefile deleted file mode 100644 index a00940d1384a1..0000000000000 --- a/eBones/usr.bin/ksrvtgt/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:06:18 gibbs Exp $ - -PROG= ksrvtgt -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN1= ksrvtgt.1 - -.include diff --git a/eBones/usr.bin/ksrvtgt/ksrvtgt.1 b/eBones/usr.bin/ksrvtgt/ksrvtgt.1 deleted file mode 100644 index 129c7457215cb..0000000000000 --- a/eBones/usr.bin/ksrvtgt/ksrvtgt.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" from: ksrvtgt.1,v 4.1 89/01/24 14:36:28 jtkohl Exp $ -.\" $Id: ksrvtgt.1,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KSRVTGT 1 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -ksrvtgt \- fetch and store Kerberos ticket-granting-ticket using a -service key -.SH SYNOPSIS -.B ksrvtgt -name instance [[realm] srvtab] -.SH DESCRIPTION -.I ksrvtgt -retrieves a ticket-granting ticket with a lifetime of five (5) minutes -for the principal -.I name.instance@realm -(or -.I name.instance@localrealm -if -.I realm -is not supplied on the command line), decrypts the response using -the service key found in -.I srvtab -(or in -.B /etc/kerberosIV/srvtab -if -.I srvtab -is not specified on the command line), and stores the ticket in the -standard ticket cache. -.PP -This command is intended primarily for use in shell scripts and other -batch-type facilities. -.SH DIAGNOSTICS -"Generic kerberos failure (kfailure)" can indicate a whole range of -problems, the most common of which is the inability to read the service -key file. -.SH FILES -.TP 2i -/etc/kerberosIV/krb.conf -to get the name of the local realm. -.TP -/tmp/tkt[uid] -The default ticket file. -.TP -/etc/kerberosIV/srvtab -The default service key file. -.SH SEE ALSO -kerberos(1), kinit(1), kdestroy(1) diff --git a/eBones/usr.bin/ksrvtgt/ksrvtgt.c b/eBones/usr.bin/ksrvtgt/ksrvtgt.c deleted file mode 100644 index 0f92394b6bbd3..0000000000000 --- a/eBones/usr.bin/ksrvtgt/ksrvtgt.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Get a ticket-granting-ticket given a service key file (srvtab) - * The lifetime is the shortest allowed [1 five-minute interval] - * - * from: ksrvtgt.c,v 4.3 89/07/28 10:17:28 jtkohl Exp $ - * $Id: ksrvtgt.c,v 1.3 1995/07/18 16:40:07 mark Exp $ - */ - -#ifndef lint -const char rcsid[] = -"$Id: ksrvtgt.c,v 1.3 1995/07/18 16:40:07 mark Exp $"; -#endif /* lint */ - -#include -#include -#include -#include -#include - -int -main(argc,argv) - int argc; - char **argv; -{ - char realm[REALM_SZ + 1]; - register int code; - char srvtab[MAXPATHLEN + 1]; - - bzero(realm, sizeof(realm)); - bzero(srvtab, sizeof(srvtab)); - - if (argc < 3 || argc > 5) { - fprintf(stderr, "Usage: %s name instance [[realm] srvtab]\n", - argv[0]); - exit(1); - } - - if (argc == 4) - (void) strncpy(srvtab, argv[3], sizeof(srvtab) -1); - - if (argc == 5) { - (void) strncpy(realm, argv[3], sizeof(realm) - 1); - (void) strncpy(srvtab, argv[4], sizeof(srvtab) -1); - } - - if (srvtab[0] == 0) - (void) strcpy(srvtab, KEYFILE); - - if (realm[0] == 0) - if (krb_get_lrealm(realm, 1) != KSUCCESS) - (void) strcpy(realm, KRB_REALM); - - code = krb_get_svc_in_tkt(argv[1], argv[2], realm, - "krbtgt", realm, 1, srvtab); - if (code) - fprintf(stderr, "%s\n", krb_err_txt[code]); - exit(code); -} diff --git a/eBones/usr.bin/passwd/kpasswd.c b/eBones/usr.bin/passwd/kpasswd.c deleted file mode 100644 index 90f92474ed058..0000000000000 --- a/eBones/usr.bin/passwd/kpasswd.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * change your password with kerberos - */ - -#ifndef lint -#if 0 -static char rcsid_kpasswd_c[] = - "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kpasswd.c,v 4.3 89/09/26 09:33:02 jtkohl Exp "; -#endif -static const char rcsid[] = - "$Id$"; -#endif lint - -/* - * kpasswd - * change your password with kerberos - */ - -#include -#include -#include -#include -#include "kadm.h" - -#include "extern.h" - -extern void krb_set_tkt_string(); -static void go_home(char *, int); - - -int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag) -{ - char name[ANAME_SZ]; /* name of user */ - char inst[INST_SZ]; /* instance of user */ - char realm[REALM_SZ]; /* realm of user */ - char default_name[ANAME_SZ]; - char default_inst[INST_SZ]; - char default_realm[REALM_SZ]; - int realm_given = 0; /* True if realm was give on cmdline */ - int use_default = 1; /* True if we should use default name */ - struct passwd *pw; - int status; /* return code */ - des_cblock new_key; - int c; - extern char *optarg; - extern int optind; - char tktstring[MAXPATHLEN]; - - void get_pw_new_key(); - -#ifdef NOENCRYPTION -#define read_long_pw_string placebo_read_pw_string -#else -#define read_long_pw_string des_read_pw_string -#endif - int read_long_pw_string(); - - bzero(name, sizeof(name)); - bzero(inst, sizeof(inst)); - bzero(realm, sizeof(realm)); - - if (krb_get_tf_fullname(TKT_FILE, default_name, default_inst, - default_realm) != KSUCCESS) { - pw = getpwuid((int) getuid()); - if (pw) { - strcpy(default_name, pw->pw_name); - } else { - /* seems like a null name is kinda silly */ - strcpy(default_name, ""); - } - strcpy(default_inst, ""); - if (krb_get_lrealm(default_realm, 1) != KSUCCESS) - strcpy(default_realm, KRB_REALM); - } - - if(uflag) { - if (status = kname_parse(name, inst, realm, uflag)) { - errx(2, "Kerberos error: %s", krb_err_txt[status]); - } - if (realm[0]) - realm_given++; - else - if (krb_get_lrealm(realm, 1) != KSUCCESS) - strcpy(realm, KRB_REALM); - } - - if(uname) { - if (k_isname(uname)) { - strncpy(name, uname, sizeof(name) - 1); - } else { - errx(1, "bad name: %s", uname); - } - } - - if(iflag) { - if (k_isinst(iflag)) { - strncpy(inst, iflag, sizeof(inst) - 1); - } else { - errx(1, "bad instance: %s", iflag); - } - } - - if(rflag) { - if (k_isrealm(rflag)) { - strncpy(realm, rflag, sizeof(realm) - 1); - realm_given++; - } else { - errx(1, "bad realm: %s", rflag); - } - } - - if(uname || iflag || rflag || uflag) use_default = 0; - - if (use_default) { - strcpy(name, default_name); - strcpy(inst, default_inst); - strcpy(realm, default_realm); - } else { - if (!name[0]) - strcpy(name, default_name); - if (!realm[0]) - strcpy(realm, default_realm); - } - - (void) sprintf(tktstring, "/tmp/tkt_cpw_%d",getpid()); - krb_set_tkt_string(tktstring); - - get_pw_new_key(new_key, name, inst, realm, realm_given); - - if ((status = kadm_init_link("changepw", KRB_MASTER, realm)) - != KADM_SUCCESS) - com_err("kpasswd", status, "while initializing"); - else if ((status = kadm_change_pw(new_key)) != KADM_SUCCESS) - com_err("kpasswd", status, " attempting to change password."); - - if (status != KADM_SUCCESS) - fprintf(stderr,"Password NOT changed.\n"); - else - printf("Password changed.\n"); - - (void) dest_tkt(); - if (status) - exit(2); - else - exit(0); -} - -void get_pw_new_key(new_key, name, inst, realm, print_realm) - des_cblock new_key; - char *name; - char *inst; - char *realm; - int print_realm; /* True if realm was give on cmdline */ -{ - char ppromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */ - char pword[MAX_KPW_LEN]; /* storage for the password */ - char npromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */ - - char local_realm[REALM_SZ]; - int status; - - /* - * We don't care about failure; this is to determine whether or - * not to print the realm in the prompt for a new password. - */ - (void) krb_get_lrealm(local_realm, 1); - - if (strcmp(local_realm, realm)) - print_realm++; - - (void) sprintf(ppromp,"Old password for %s%s%s%s%s:", - name, *inst ? "." : "", inst, - print_realm ? "@" : "", print_realm ? realm : ""); - if (read_long_pw_string(pword, sizeof(pword)-1, ppromp, 0)) { - fprintf(stderr, "Error reading old password.\n"); - exit(1); - } - - if ((status = krb_get_pw_in_tkt(name, inst, realm, PWSERV_NAME, - KADM_SINST, 1, pword)) != KSUCCESS) { - if (status == INTK_BADPW) { - printf("Incorrect old password.\n"); - exit(0); - } - else { - fprintf(stderr, "Kerberos error: %s\n", krb_err_txt[status]); - exit(1); - } - } - bzero(pword, sizeof(pword)); - do { - (void) sprintf(npromp,"New Password for %s%s%s%s%s:", - name, *inst ? "." : "", inst, - print_realm ? "@" : "", print_realm ? realm : ""); - if (read_long_pw_string(pword, sizeof(pword)-1, npromp, 1)) - go_home("Error reading new password, password unchanged.\n",0); - if (strlen(pword) == 0) - printf("Null passwords are not allowed; try again.\n"); - } while (strlen(pword) == 0); - -#ifdef NOENCRYPTION - bzero((char *) new_key, sizeof(des_cblock)); - new_key[0] = (unsigned char) 1; -#else - (void) des_string_to_key(pword, (des_cblock *)new_key); -#endif - bzero(pword, sizeof(pword)); -} - -static void -go_home(str,x) - char *str; - int x; -{ - fprintf(stderr, str, x); - (void) dest_tkt(); - exit(1); -} diff --git a/eBones/usr.bin/register/Makefile b/eBones/usr.bin/register/Makefile deleted file mode 100644 index 9e4b170386f69..0000000000000 --- a/eBones/usr.bin/register/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/1/93 -# $Id: Makefile,v 1.5 1995/09/14 04:08:57 gibbs Exp $ - -PROG= register -CFLAGS+=-DCRYPT -DDEBUG -DKERBEROS -DPADD= ${LIBKRB} ${LIBDES} ${LIBCRYPT} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -lcrypt -BINOWN= root -BINMODE=4555 - -.include diff --git a/eBones/usr.bin/register/pathnames.h b/eBones/usr.bin/register/pathnames.h deleted file mode 100644 index 611c54f28a242..0000000000000 --- a/eBones/usr.bin/register/pathnames.h +++ /dev/null @@ -1,39 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/1/93 - */ - -#define SERVER_KEYDIR "/etc/kerberosIV/register_keys" -#define CLIENT_KEYFILE "/etc/kerberosIV/.update.key" -#define KEYFILE_BASE ".update.key" -#define _PATH_KPASSWD "/usr/bin/passwd" diff --git a/eBones/usr.bin/register/register.1 b/eBones/usr.bin/register/register.1 deleted file mode 100644 index 0ac298dcaab51..0000000000000 --- a/eBones/usr.bin/register/register.1 +++ /dev/null @@ -1,63 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)register.1 8.1 (Berkeley) 6/1/93 -.\" -.TH REGISTER 1 "June 1, 1993" -.UC 7 -.SH NAME -register \- register with Kerberos -.SH SYNOPSIS -.B register -.SH DESCRIPTION -The -.I register -command -is used to register a new user with Kerberos. -The Kerberos server keeps record of certain trusted hosts -from which it will accept new registrations. -If the host on which -.I register -is run is trusted by Kerberos, the user -is asked for his current password, and then -a new password to be used with Kerberos. -A user may only register with Kerberos one time. -.SH FILES -.br -/etc/kerberosIV/.update.keyxx.xx.xx.xx shared DES key with server -.SH "SEE ALSO" -registerd(8), kerberos(1) -.SH DIAGNOSTICS -\*(lqPrincipal not unique\*(rq -if the user already exists in the Kerberos database. -.br -\*(lqPermission Denied,\*(rq -if the host on which register is being run is untrusted. diff --git a/eBones/usr.bin/register/register.c b/eBones/usr.bin/register/register.c deleted file mode 100644 index d38dcc456b083..0000000000000 --- a/eBones/usr.bin/register/register.c +++ /dev/null @@ -1,316 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#if 0 -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -static char sccsid[] = "@(#)register.c 8.1 (Berkeley) 6/1/93"; -#endif /* not lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "pathnames.h" -#include "register_proto.h" - -#define SERVICE "krbupdate" /* service to add to KDC's database */ -#define PROTOCOL "tcp" - -void die(int); -void type_info(void); -void setup_key(struct sockaddr_in local); -void cleanup(void); -int get_user_info(void); - -char realm[REALM_SZ]; -char krbhst[MAX_HSTNM]; - -static char pname[ANAME_SZ]; -static char iname[INST_SZ]; -static char password[_PASSWORD_LEN]; - -void -main(argc, argv) - int argc; - char **argv; -{ - struct servent *se; - struct hostent *host; - struct sockaddr_in sin, local; - int rval; - int sock, llen; - u_char code; - static struct rlimit rl = { 0, 0 }; - - signal(SIGPIPE, die); - - if (setrlimit(RLIMIT_CORE, &rl) < 0) { - perror("rlimit"); - exit(1); - } - - if ((se = getservbyname(SERVICE, PROTOCOL)) == NULL) { - fprintf(stderr, "couldn't find entry for service %s\n", - SERVICE); - exit(1); - } - if ((rval = krb_get_lrealm(realm,0)) != KSUCCESS) { - fprintf(stderr, "couldn't get local Kerberos realm: %s\n", - krb_err_txt[rval]); - exit(1); - } - - if ((rval = krb_get_krbhst(krbhst, realm, 1)) != KSUCCESS) { - fprintf(stderr, "couldn't get Kerberos host: %s\n", - krb_err_txt[rval]); - exit(1); - } - - if ((host = gethostbyname(krbhst)) == NULL) { - fprintf(stderr, "couldn't get host entry for host %s\n", - krbhst); - exit(1); - } - - sin.sin_family = host->h_addrtype; - (void)bcopy(host->h_addr, (char *) &sin.sin_addr, host->h_length); - sin.sin_port = se->s_port; - - if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - perror("socket"); - exit(1); - } - - if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) { - perror("connect"); - (void)close(sock); - exit(1); - } - - llen = sizeof(local); - if (getsockname(sock, (struct sockaddr *) &local, &llen) < 0) { - perror("getsockname"); - (void)close(sock); - exit(1); - } - - setup_key(local); - - type_info(); - - if (!get_user_info()) { - code = ABORT; - (void)des_write(sock, &code, 1); - cleanup(); - exit(1); - } - - code = APPEND_DB; - if (des_write(sock, &code, 1) != 1) { - perror("write 1"); - cleanup(); - exit(1); - } - - if (des_write(sock, pname, ANAME_SZ) != ANAME_SZ) { - perror("write principal name"); - cleanup(); - exit(1); - } - - if (des_write(sock, iname, INST_SZ) != INST_SZ) { - perror("write instance name"); - cleanup(); - exit(1); - } - - if (des_write(sock, password, 255) != 255) { - perror("write password"); - cleanup(); - exit(1); - } - - /* get return message */ - - { - int cc; - char msgbuf[BUFSIZ]; - - cc = read(sock, msgbuf, BUFSIZ); - if (cc <= 0) { - fprintf(stderr, "protocol error during key verification\n"); - cleanup(); - exit(1); - } - if (strncmp(msgbuf, GOTKEY_MSG, 6) != 0) { - fprintf(stderr, "%s: %s", krbhst, msgbuf); - cleanup(); - exit(1); - } - - cc = des_read(sock, msgbuf, BUFSIZ); - if (cc <= 0) { - fprintf(stderr, "protocol error during read\n"); - cleanup(); - exit(1); - } else { - printf("%s: %s", krbhst, msgbuf); - } - } - - cleanup(); - close(sock); -} - -void -cleanup() -{ - bzero(password, 255); -} - -extern char *crypt(); -extern char *getpass(); - -int -get_user_info() -{ - int uid = getuid(); - int valid = 0, i; - struct passwd *pw; - char *pas, *namep; - - /* NB: we must run setuid-root to get at the real pw file */ - - if ((pw = getpwuid(uid)) == NULL) { - fprintf(stderr, "Who are you?\n"); - return(0); - } - (void)seteuid(uid); - (void)strcpy(pname, pw->pw_name); /* principal name */ - - for (i = 1; i < 3; i++) { - pas = getpass("login password:"); - namep = crypt(pas, pw->pw_passwd); - if (strcmp(namep, pw->pw_passwd)) { - fprintf(stderr, "Password incorrect\n"); - continue; - } else { - valid = 1; - break; - } - } - if (!valid) - return(0); - pas = getpass("Kerberos password (may be the same):"); - while (*pas == NULL) { - printf(" password not allowed\n"); - pas = getpass("Kerberos password (may be the same):"); - } - (void)strcpy(password, pas); /* password */ - pas = getpass("Retype Kerberos password:"); - if (strcmp(password, pas)) { - fprintf(stderr, "Password mismatch -- aborted\n"); - return(0); - } - - iname[0] = NULL; /* null instance name */ - return(1); -} - -void -setup_key(local) - struct sockaddr_in local; -{ - static struct keyfile_data kdata; - static Key_schedule schedule; - int fd; - char namebuf[MAXPATHLEN]; - - (void) sprintf(namebuf, "%s%s", - CLIENT_KEYFILE, - inet_ntoa(local.sin_addr)); - - fd = open(namebuf, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "couldn't open key file %s for local host: ", - namebuf); - perror(""); - exit(1); - } - - if (read(fd, (char *)&kdata, sizeof(kdata)) != sizeof(kdata)) { - fprintf(stderr,"size error reading key file for local host %s\n", - inet_ntoa(local.sin_addr)); - exit(1); - } - key_sched((des_cblock *)kdata.kf_key, schedule); - des_set_key_krb((des_cblock *)kdata.kf_key, schedule); - return; -} - -void -type_info() -{ - printf("Kerberos user registration (realm %s)\n\n", realm); - printf("Please enter your login password followed by your new Kerberos password.\n"); - printf("The Kerberos password you enter now will be used in the future\n"); - printf("as your Kerberos password for all machines in the %s realm.\n", realm); - printf("You will only be allowed to perform this operation once, although you may run\n"); - printf("the %s program from now on to change your Kerberos password.\n\n", _PATH_KPASSWD); -} - -void -die(sig) - int sig; -{ - fprintf(stderr, "\nServer no longer listening\n"); - fflush(stderr); - cleanup(); - exit(1); -} diff --git a/eBones/usr.bin/register/register_proto.h b/eBones/usr.bin/register/register_proto.h deleted file mode 100644 index 54789494071fd..0000000000000 --- a/eBones/usr.bin/register/register_proto.h +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)register_proto.h 8.1 (Berkeley) 6/1/93 - */ - -#define APPEND_DB 0x01 -#define ABORT 0x02 - -#define GOTKEY_MSG "GOTKEY" - -struct keyfile_data { - C_Block kf_key; -}; diff --git a/eBones/usr.bin/rkinit/Makefile b/eBones/usr.bin/rkinit/Makefile deleted file mode 100644 index b910742fe1b05..0000000000000 --- a/eBones/usr.bin/rkinit/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Makefile,v 1.2 1995/01/20 22:08:14 wollman Exp - -PROG= rkinit -SRCS= ${RKINITOBJDIR}/rkinit_err.h rkinit.c -CFLAGS+= -I${KRBOBJDIR} -I${RKINITOBJDIR} -LDADD+= -L${RKINITOBJDIR} -lrkinit -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -LDADD+= -lss -lcom_err - -MAN1= rkinit.1 - -.include diff --git a/eBones/usr.bin/rkinit/rkinit.1 b/eBones/usr.bin/rkinit/rkinit.1 deleted file mode 100644 index 5634d2b7483c9..0000000000000 --- a/eBones/usr.bin/rkinit/rkinit.1 +++ /dev/null @@ -1,206 +0,0 @@ -.\" -.\" $Header: /local/cvsfiles/kerberos/src/appl/rkinit/man/rkinit.1,v 1.1 1991/12/03 23:21:25 eichin Exp $ -.\" $Source: /local/cvsfiles/kerberos/src/appl/rkinit/man/rkinit.1,v $ -.\" $Author: eichin $ -.\" -.\" -.TH RKINIT 1 "November 12, 1989" -.UC 4 -.SH NAME -rkinit \- establish kerberos tickets safely on a remote host -.SH SYNOPSIS -.B rkinit [ host ] -[ -p -.B principal -] [ -l -.B username -] [ -k -.B kerberos_realm -] [ -f -.B ticket_file -] [ -h -.B remote_host -] [ -t -.B ticket_lifetime -] [ -.B \-notimeout -] - -A host name must be specified either as the first command line -argument or following a \-h flag. If redundant command line -arguments are given, the last one to appear takes precedence. - -.SH DESCRIPTION -.I rkinit -is a program that allows a user to establish kerberos tickets on -a remote host registered for -rlogin service. This can be done without the user's kerberos -password ever leaving the client machine. - -In order to establish tickets remotely -without the use of something like -.I rkinit, -one would have to log in to the -remote host and run -.IR kinit (1). -.I rkinit -followed by -.I rlogin -can be thought of as a safe substitute for -.I rlogin -followed -.I kinit. - -.I rkinit -uses the same access checking mechanism as -.I rlogin. -That means that -.I rkinit -can be used to create any tickets for user -.I A -on remote host -.I B -if and only if -.IR A 's -tickets would entitle a login to -.I B. -This means that one can create remote tickets for himself or for -another user if he is in that user's .klogin file. - -.I rkinit -understands the following command line options: - -.TP 4 -.B \-p \fIprincipal\fR -If -.I principal, -in the format -.I name[.inst][@realm] -is specified, the tickets created on the remote host will be the -tickets indicated by the -.I principal -field. If this option is not given, the following defaults are -used: If the user running -.I rkinit -does not have tickets on the client machine, -.I rkinit -will prompt for a password and behave effectively as if the user -had invoked -.I kinit -on the specified -remote host; i.e., -the tickets established will be owned on the remote host -by the user who invoked -.I rkinit -and will be for the local realm of the -remote host. -If the user running -.I rkinit -already has tickets, -.I rkinit -will prompt for a password and create tickets whose principal -matches that of the -tickets that the user already has. - - -.TP -.B \-l \fIusername\fR -If -.I username -is specified, the ticket file on the remote host will be owned by the -user -.I username. -If it is not specified, the tickets will be owned by -the remote user whose login name matches that of the user invoking -.I rkinit. - -.TP -.B \-r \fIrealm\fR -.I realm -is used to tell -.I rkinit -what realm the remote host is in. This -option should not usually have to be used since -.I rkinit -uses -.IR krb_realmofhost (3) -to determine the remote host's kerberos realm. Note that this -is distinct from realm as specified in -.I principal, -which refers to the realm of the remote tickets. - -.TP -.B \-f \fIticket_file\fR -This option is used to specify the name of the ticket file that -should be used on the remote host. Note that if you -specify a location for the ticket file that is other -than the default, you will have to set the environment variable -KRBTKFILE to that filename once you get to the remote host in -order for you to use the tickets. -If a ticket file is not specified, the tickets will -be placed in the -default location as specified by -.IR tkt_file (3). -On a UNIX host, this is /tmp/tkt, where - is the user id of the person who owns the remote ticket file. - -.TP -.B \-h \fIremote_host\fR -.I remote host -is the host on which remote tickets are being obtained. This -option can be used in place of specifying the host as the first -command line argument. - -.TP -.B \-t \fIticket_lifetime\fR -.I ticket lifetime -is the lifetime in minutes of the remote tickets. If it is not -specified, the default ticket life time (as defined in krb.h) is -used. - -.TP -.B \-notimeout -prevents the client from timing out. This is mainly useful only -for debugging since the rkinit server also times out. - -.SH EXAMPLES - -In the following examples, -.B tabetha -and -.B soup -are machines in the -.B ATHENA.MIT.EDU -kerberos realm and -.B local -is a user who can log in -to -.B soup -and has -.B qjb.root@ATHENA.MIT.EDU -in his .klogin file. - - -% rkinit tabetha -.br -Kerberos initialization (tabetha) -.br -Password for qjb@ATHENA.MIT.EDU: -.br -% -.br - -.br -% rkinit soup -p qjb.root -l local -.br -Kerberos initialization (soup): tickets will be owned by local -.br -Password for qjb.root@ATHENA.MIT.EDU: -.br -% - -.SH SEE ALSO -rkinitd(8), kerberos(1), kerberos(3), kinit(1) - -.SH AUTHOR -Emanuel Jay Berkenbilt (MIT-Project Athena) diff --git a/eBones/usr.bin/rkinit/rkinit.c b/eBones/usr.bin/rkinit/rkinit.c deleted file mode 100644 index 35a0eebfaa101..0000000000000 --- a/eBones/usr.bin/rkinit/rkinit.c +++ /dev/null @@ -1,216 +0,0 @@ -/* - * $Id: rkinit.c,v 1.1 1993/12/10 18:41:00 dglo Exp gibbs $ - * $Source: /usr/src/eBones/rkinit/RCS/rkinit.c,v $ - * $Author: dglo $ - * - * This is an rkinit client - */ - -#if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS) -static char *rcsid = "$Id: rkinit.c,v 1.1 1993/12/10 18:41:00 dglo Exp gibbs $"; -#endif /* lint || SABER || LOCORE || RCS_HDRS */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifdef __STDC__ -static void usage(void) -#else -static void usage() -#endif /* __STDC__ */ -{ - fprintf(stderr,"Usage: rkinit [host] options\n"); - fprintf(stderr, - "Options: [-l username] [-k krb_realm] [-p principal] [-f tktfile]\n"); - fprintf(stderr, " [-t lifetime] [-h host] [-notimeout]\n"); - fprintf(stderr, "A host must be specified either with the -h option "); - fprintf(stderr, "or as the first argument.\n"); - - exit(1); -} - -int -#ifdef __STDC__ -main(int argc, char *argv[]) -#else -main(argc, argv) - int argc; - char *argv[]; -#endif /* __STDC__ */ -{ - char *whoami; /* Name of this program */ - - char principal[MAX_K_NAME_SZ]; /* Principal for which to get tickets */ - char *host = NULL; /* Remote host */ - char *username = 0; /* Username of owner of ticket */ - char r_krealm[REALM_SZ]; /* Kerberos realm of remote host */ - char aname[ANAME_SZ]; /* Aname of remote ticket file */ - char inst[INST_SZ]; /* Instance of remote ticket file */ - char realm[REALM_SZ]; /* Realm of remote ticket file */ - char *tktfilename = NULL; /* Name of ticket file on remote host */ - u_long lifetime = DEFAULT_TKT_LIFE; /* Lifetime of remote tickets */ - int timeout = TRUE; /* Should we time out? */ - rkinit_info info; /* Information needed by rkinit */ - - struct passwd *localid; /* To determine local id */ - - int status = 0; /* general error number */ - - int i; - - bzero(r_krealm, sizeof(r_krealm)); - bzero(principal, sizeof(principal)); - bzero(aname, sizeof(aname)); - bzero(inst, sizeof(inst)); - bzero(realm, sizeof(realm)); - - /* Parse commandline arguements. */ - if ((whoami = rindex(argv[0], '/')) == 0) - whoami = argv[0]; - else - whoami++; - - if (argc < 2) usage(); - - if (argv[1][0] != '-') { - host = argv[1]; - i = 2; - } - else - i = 1; - - for (/* i initialized above */; i < argc; i++) { - if (strcmp(argv[i], "-h") == NULL) { - if (++i >= argc) - usage(); - else - host = argv[i]; - } - else if (strcmp(argv[i], "-l") == NULL) { - if (++i >= argc) - usage(); - else - username = argv[i]; - } - else if (strcmp(argv[i], "-k") == NULL) { - if (++i >= argc) - usage(); - else - strncpy(r_krealm, argv[i], sizeof(r_krealm) - 1); - } - else if (strcmp(argv[i], "-p") == NULL) { - if (++i >= argc) - usage(); - else - strncpy(principal, argv[i], sizeof(principal) - 1); - } - else if (strcmp(argv[i], "-f") == NULL) { - if (++i >= argc) - usage(); - else - tktfilename = argv[i]; - } - else if (strcmp(argv[i], "-t") == NULL) { - if (++i >= argc) - usage(); - else { - lifetime = atoi(argv[i])/5; - if (lifetime == 0) - lifetime = 1; - else if (lifetime > 255) - lifetime = 255; - } - } - else if (strcmp(argv[i], "-notimeout") == NULL) - timeout = FALSE; - else - usage(); - } - - if (host == NULL) - usage(); - - /* Initialize the realm of the remote host if necessary */ - if (r_krealm[0] == 0) { - /* - * Try to figure out the realm of the remote host. If the - * remote host is unknown, don't worry about it; the library - * will handle the error better and print a good error message. - */ - struct hostent *hp; - if ((hp = gethostbyname(host))) - strcpy(r_krealm, krb_realmofhost(hp->h_name)); - } - - /* If no username was specified, use local id on client host */ - if (username == 0) { - if ((localid = getpwuid(getuid())) == 0) { - fprintf(stderr, "You can not be found in the password file.\n"); - exit(1); - } - username = localid->pw_name; - } - - /* Find out who will go in the ticket file */ - if (! principal[0]) { - if ((status = krb_get_tf_fullname(TKT_FILE, aname, inst, realm)) - != KSUCCESS) { - /* - * If user has no ticket file and principal was not specified, - * we will try to get tickets for username@remote_realm - */ - strcpy(aname, username); - strcpy(realm, r_krealm); - } - } - else { - if ((status = kname_parse(aname, inst, realm, principal)) - != KSUCCESS) { - fprintf(stderr, "%s\n", krb_err_txt[status]); - exit(1); - } - if (strlen(realm) == 0) { - if (krb_get_lrealm(realm, 1) != KSUCCESS) - strcpy(realm, KRB_REALM); - } - } - - bzero((char *)&info, sizeof(info)); - - strcpy(info.aname, aname); - strcpy(info.inst, inst); - strcpy(info.realm, realm); - strcpy(info.sname, "krbtgt"); - strcpy(info.sinst, realm); - strncpy(info.username, username, sizeof(info.username) - 1); - if (tktfilename) - strncpy(info.tktfilename, tktfilename, sizeof(info.tktfilename) - 1); - info.lifetime = lifetime; - - if ((status = rkinit(host, r_krealm, &info, timeout))) { - com_err(whoami, status, "while obtaining remote tickets:"); - fprintf(stderr, "%s\n", rkinit_errmsg(0)); - exit(1); - } - - exit(0); -} diff --git a/eBones/usr.sbin/Makefile b/eBones/usr.sbin/Makefile deleted file mode 100644 index fa667f358a6ca..0000000000000 --- a/eBones/usr.sbin/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id$ - -SUBDIR= ext_srvtab fix_kdb_keys kadmind kdb_destroy kdb_edit kdb_init \ - kdb_util kerberos kprop ksrvutil kstash make_keypair - -.include diff --git a/eBones/usr.sbin/Makefile.inc b/eBones/usr.sbin/Makefile.inc deleted file mode 100644 index a3ace61925937..0000000000000 --- a/eBones/usr.sbin/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 - -BINDIR?= /usr/sbin - -.include "../Makefile.inc" diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile deleted file mode 100644 index 0808f85a73d90..0000000000000 --- a/eBones/usr.sbin/ext_srvtab/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:09:34 gibbs Exp $ - -PROG= ext_srvtab -CFLAGS+=-DKERBEROS -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD+= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= ext_srvtab.8 - -.include diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.8 b/eBones/usr.sbin/ext_srvtab/ext_srvtab.8 deleted file mode 100644 index 565c3a37f4b8e..0000000000000 --- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.8 +++ /dev/null @@ -1,62 +0,0 @@ -.\" from: ext_srvtab.8,v 4.2 89/07/18 16:53:18 jtkohl Exp $ -.\" $Id: ext_srvtab.8,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH EXT_SRVTAB 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -ext_srvtab \- extract service key files from Kerberos key distribution center database -.SH SYNOPSIS -ext_srvtab [ -.B \-n -] [ -.B \-r realm -] [ -.B hostname ... -] -.SH DESCRIPTION -.I ext_srvtab -extracts service key files from the Kerberos key distribution center -(KDC) database. -.PP -Upon execution, it prompts the user to enter the master key string for -the database. If the -.B \-n -option is specified, the master key is instead fetched from the master -key cache file. -.PP -For each -.I hostname -specified on the command line, -.I ext_srvtab -creates the service key file -.IR hostname -new-srvtab, -containing all the entries in the database with an instance field of -.I hostname. -This new file contains all the keys registered for Kerberos-mediated -service providing programs which use the -.IR krb_get_phost (3) -principal and instance conventions to run on the host -.IR hostname . -If the -.B \-r -option is specified, the realm fields in the extracted file will -match the given realm rather than the local realm. -.SH DIAGNOSTICS -.TP 20n -"verify_master_key: Invalid master key, does not match database." -The master key string entered was incorrect. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.TP -/etc/kerberosIV/master_key -Master key cache file. -.SH SEE ALSO -read_service_key(3), krb_get_phost(3) diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c deleted file mode 100644 index 6f250138cf940..0000000000000 --- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * - * from: ext_srvtab.c,v 4.1 89/07/18 16:49:30 jtkohl Exp $ - * $Id: ext_srvtab.c,v 1.3 1995/07/18 16:35:55 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: ext_srvtab.c,v 1.3 1995/07/18 16:35:55 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define TRUE 1 -#define FALSE 0 - -static C_Block master_key; -static C_Block session_key; -static Key_schedule master_key_schedule; -char progname[] = "ext_srvtab"; -char realm[REALM_SZ]; - -void FWrite(char *p, int size, int n, FILE *f); -void StampOutSecrets(void); -void usage(void); - -int -main(argc, argv) - int argc; - char *argv[]; -{ - FILE *fout; - char fname[1024]; - int fopen_errs = 0; - int arg; - Principal princs[40]; - int more; - int prompt = TRUE; - register int n, i; - - bzero(realm, sizeof(realm)); - - /* Parse commandline arguments */ - if (argc < 2) - usage(); - else { - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-n") == 0) - prompt = FALSE; - else if (strcmp(argv[i], "-r") == 0) { - if (++i >= argc) - usage(); - else { - strcpy(realm, argv[i]); - /* - * This is to humor the broken way commandline - * argument parsing is done. Later, this - * program ignores everything that starts with -. - */ - argv[i][0] = '-'; - } - } - else if (argv[i][0] == '-') - usage(); - else - if (!k_isinst(argv[i])) { - fprintf(stderr, "%s: bad instance name: %s\n", - progname, argv[i]); - usage(); - } - } - } - - if (kdb_get_master_key (prompt, master_key, master_key_schedule) != 0) { - fprintf (stderr, "Couldn't read master key.\n"); - fflush (stderr); - exit(1); - } - - if (kdb_verify_master_key (master_key, master_key_schedule, stderr) < 0) { - exit(1); - } - - /* For each arg, search for instances of arg, and produce */ - /* srvtab file */ - if (!realm[0]) - if (krb_get_lrealm(realm, 1) != KSUCCESS) { - fprintf(stderr, "%s: couldn't get local realm\n", progname); - exit(1); - } - (void) umask(077); - - for (arg = 1; arg < argc; arg++) { - if (argv[arg][0] == '-') - continue; - sprintf(fname, "%s-new-srvtab", argv[arg]); - if ((fout = fopen(fname, "w")) == NULL) { - fprintf(stderr, "Couldn't create file '%s'.\n", fname); - fopen_errs++; - continue; - } - printf("Generating '%s'....\n", fname); - n = kerb_get_principal("*", argv[arg], &princs[0], 40, &more); - if (more) - fprintf(stderr, "More than 40 found...\n"); - for (i = 0; i < n; i++) { - FWrite(princs[i].name, strlen(princs[i].name) + 1, 1, fout); - FWrite(princs[i].instance, strlen(princs[i].instance) + 1, - 1, fout); - FWrite(realm, strlen(realm) + 1, 1, fout); - FWrite(&princs[i].key_version, - sizeof(princs[i].key_version), 1, fout); - bcopy(&princs[i].key_low, session_key, sizeof(long)); - bcopy(&princs[i].key_high, session_key + sizeof(long), - sizeof(long)); - kdb_encrypt_key (session_key, session_key, - master_key, master_key_schedule, DES_DECRYPT); - FWrite(session_key, sizeof session_key, 1, fout); - } - fclose(fout); - } - - StampOutSecrets(); - - exit(fopen_errs); /* 0 errors if successful */ - -} - -void -Die() -{ - StampOutSecrets(); - exit(1); -} - -void -FWrite(p, size, n, f) - char *p; - int size; - int n; - FILE *f; -{ - if (fwrite(p, size, n, f) != n) { - printf("Error writing output file. Terminating.\n"); - Die(); - } -} - -void -StampOutSecrets() -{ - bzero(master_key, sizeof master_key); - bzero(session_key, sizeof session_key); - bzero(master_key_schedule, sizeof master_key_schedule); -} - -void -usage() -{ - fprintf(stderr, - "Usage: %s [-n] [-r realm] instance [instance ...]\n", progname); - exit(1); -} diff --git a/eBones/usr.sbin/fix_kdb_keys/Makefile b/eBones/usr.sbin/fix_kdb_keys/Makefile deleted file mode 100644 index e49afaaf70a70..0000000000000 --- a/eBones/usr.sbin/fix_kdb_keys/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.2 (Berkeley) 3/5/91 -# $Id: Makefile,v 1.2 1996/05/01 17:16:22 markm Exp $ - -PROG= fix_kdb_keys -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= fix_kdb_keys.8 - -.include diff --git a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 b/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 deleted file mode 100644 index 4bc4d623fc0ac..0000000000000 --- a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 +++ /dev/null @@ -1,59 +0,0 @@ -.\" $Id$ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH FIX_KDB_KEYS 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -fix_kdb_keys \- Secure Kerberos database by properly randomising keys -.SH SYNOPSIS -fix_kdb_keys -.SH DESCRIPTION -If you built your Kerberos database before receiving this distribution, -the keys were randomly generated using the vulnerable version of -the Kerberos random number generator. Therefore it is possible for -an attacker to mount an attack to guess these values. If an attacker -can determine the key for the -.I krbtgt -ticket, they can construct tickets claiming to be any Kerberos -principal. Similarly if an attacker can obtain the -.I changepw.kerberos -key, they can change anyone's password. -.PP -This distribution has been patched to use the improved -.IR des_new_random_key() -routines instead of the old and cryptographically suspect -.IR des_random_key(). -.PP -The primary difference is that -.IR des_random_key() -uses a seeding -technique which is predictable and therefore vulnerable. While -.IR des_new_random_key() -uses a feedback mechanism based on the Data Encryption Standard -(DES) and is seeded with a secret (and therefore unknown to an -attacker) value. This value is the secret database master key. -.PP -Running -.I fix_kdb_keys -on the KDC server will change these critical keys to new -values using the newer random number generator. IMPORTANT: When this -is done, all outstanding ticket granting tickets will -immediately become invalid. This will be disruptive to your user -community. It is recommended that this is done late at night or early -in the morning before most users have logged in. Alternatively -pre-announce a definitive time when you will run the program and -inform the users that they will have to get new tickets at that time -(using either -.I kinit -or simply by logging out and then in again). -.SH DIAGNOSTICS -Many, and descriptive. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/master_key -Master key cache file. diff --git a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.c b/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.c deleted file mode 100644 index 3719e784c854b..0000000000000 --- a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.c +++ /dev/null @@ -1,191 +0,0 @@ -/* - * $Source: /afs/net/project/krb4/src/admin/RCS/kdb_edit.c,v $ - * $Author: tytso $ - * - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * - * For copying and distribution information, please see the file - * . - * - * This routine changes the Kerberos encryption keys for principals, - * i.e., users or services. - */ - -/* - * exit returns 0 ==> success -1 ==> error - */ - -#include -#include -#include -#include -#include -#include -#include - -#ifdef NEED_TIME_H -#include -#endif -#include - -#include -#include -#include -/* MKEYFILE is now defined in kdc.h */ -#include - -char prog[32]; -char *progname = prog; -int nflag = 0; -int debug = 0; -extern int krb_debug; - -Principal principal_data; - -static C_Block master_key; -static Key_schedule master_key_schedule; -static long master_key_version; - -static char realm[REALM_SZ]; - -void fatal_error(), cleanup(); -void Usage(); -void change_principal(); - -int main(argc, argv) - int argc; - char *argv[]; -{ - int i; - - prog[sizeof prog - 1] = '\0'; /* make sure terminated */ - strncpy(prog, argv[0], sizeof prog - 1); /* salt away invoking - * program */ - - /* Assume a long is four bytes */ - if (sizeof(long) != 4) { - fprintf(stderr, "%s: size of long is %d.\n", prog, sizeof(long)); - exit(-1); - } - while (--argc > 0 && (*++argv)[0] == '-') - for (i = 1; argv[0][i] != '\0'; i++) { - switch (argv[0][i]) { - - /* debug flag */ - case 'd': - debug = 1; - continue; - - /* debug flag */ - case 'l': - krb_debug |= 1; - continue; - - case 'n': /* read MKEYFILE for master key */ - nflag = 1; - continue; - - default: - fprintf(stderr, "%s: illegal flag \"%c\"\n", progname, argv[0][i]); - Usage(); /* Give message and die */ - } - }; - - if (krb_get_lrealm(realm, 1)) { - fprintf(stderr, "Couldn't get local realm information.\n"); - fatal_error(); - } - - kerb_init(); - if (argc > 0) { - if (kerb_db_set_name(*argv) != 0) { - fprintf(stderr, "Could not open altername database name\n"); - fatal_error(); - } - } - - if (kdb_get_master_key ((nflag == 0), - master_key, master_key_schedule) != 0) { - fprintf (stderr, "Couldn't read master key.\n"); - fatal_error(); - } - - if ((master_key_version = kdb_verify_master_key(master_key, - master_key_schedule, - stdout)) < 0) - fatal_error(); - - des_init_random_number_generator(master_key); - - change_principal("krbtgt", realm); - change_principal("changepw", KRB_MASTER); - - cleanup(); - - printf("\nKerberos database updated successfully. Note that all\n"); - printf("existing ticket-granting tickets have been invalidated.\n\n"); - - return(0); -} - -void change_principal(input_name, input_instance) - char *input_name; - char *input_instance; -{ - int n, more; - C_Block new_key; - - n = kerb_get_principal(input_name, input_instance, &principal_data, - 1, &more); - if (!n) { - fprintf(stderr, "Can't find principal database for %s.%s.\n", - input_name, input_instance); - fatal_error(); - } - if (more) { - fprintf(stderr, "More than one entry for %s.%s.\n", input_name, - input_instance); - fatal_error(); - } - - des_new_random_key(new_key); - - /* seal it under the kerberos master key */ - kdb_encrypt_key (new_key, new_key, - master_key, master_key_schedule, - ENCRYPT); - memcpy(&principal_data.key_low, new_key, 4); - memcpy(&principal_data.key_high, ((long *) new_key) + 1, 4); - memset(new_key, 0, sizeof(new_key)); - - principal_data.key_version++; - - if (kerb_put_principal(&principal_data, 1)) { - fprintf(stderr, "\nError updating Kerberos database"); - fatal_error(); - } - - memset(&principal_data.key_low, 0, 4); - memset(&principal_data.key_high, 0, 4); -} - -void fatal_error() -{ - cleanup(); - exit(1); -} - -void cleanup() -{ - - memset(master_key, 0, sizeof(master_key)); - memset(master_key_schedule, 0, sizeof(master_key_schedule)); - memset(&principal_data, 0, sizeof(principal_data)); -} - -void Usage() -{ - fprintf(stderr, "Usage: %s [-n]\n", progname); - exit(1); -} diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile deleted file mode 100644 index af3bbe7108d3c..0000000000000 --- a/eBones/usr.sbin/kadmind/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $Id$ - -PROG= kadmind -SRCS= admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c -CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KADMOBJDIR} -I${KRBOBJDIR} -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD+= -L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -L${DESOBJDIR} -ldes -L${ACLOBJDIR} -lacl -lcom_err -MAN8= kadmind.8 - -.include diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c deleted file mode 100644 index 72980d434ab17..0000000000000 --- a/eBones/usr.sbin/kadmind/admin_server.c +++ /dev/null @@ -1,474 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Top-level loop of the kerberos Administration server - */ - -#if 0 -#ifndef lint -static char rcsid_admin_server_c[] = -"Id: admin_server.c,v 4.8 90/01/02 13:50:38 jtkohl Exp "; -static const char rcsid[] = - "$Id"; -#endif lint -#endif - -/* - admin_server.c - this holds the main loop and initialization and cleanup code for the server -*/ - -#include -#include -#include -#include -#include -#ifndef sigmask -#define sigmask(m) (1 <<((m)-1)) -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include "kadm_server.h" - -/* Almost all procs and such need this, so it is global */ -admin_params prm; /* The command line parameters struct */ - -char prog[32]; /* WHY IS THIS NEEDED??????? */ -char *progname = prog; -char *acldir = DEFAULT_ACL_DIR; -char krbrlm[REALM_SZ]; -extern Kadm_Server server_parm; - -void cleanexit(int val); -void process_client(int fd, struct sockaddr_in *who); -void kill_children(void); -static void clear_secrets(void); -void byebye(void); -void close_syslog(void); -int kadm_listen(void); - -/* -** Main does the logical thing, it sets up the database and RPC interface, -** as well as handling the creation and maintenance of the syslog file... -*/ -void -main(argc, argv) /* admin_server main routine */ -int argc; -char *argv[]; -{ - int errval; - int c; - extern char *optarg; - - prog[sizeof(prog)-1]='\0'; /* Terminate... */ - (void) strncpy(prog, argv[0], sizeof(prog)-1); - - /* initialize the admin_params structure */ - prm.sysfile = KADM_SYSLOG; /* default file name */ - prm.inter = 1; - - bzero(krbrlm, sizeof(krbrlm)); - - while ((c = getopt(argc, argv, "f:hnd:a:r:")) != EOF) - switch(c) { - case 'f': /* Syslog file name change */ - prm.sysfile = optarg; - break; - case 'n': - prm.inter = 0; - break; - case 'a': /* new acl directory */ - acldir = optarg; - break; - case 'd': - /* put code to deal with alt database place */ - if ((errval = kerb_db_set_name(optarg))) { - fprintf(stderr, "opening database %s: %s", - optarg, error_message(errval)); - exit(1); - } - break; - case 'r': - (void) strncpy(krbrlm, optarg, sizeof(krbrlm) - 1); - break; - case 'h': /* get help on using admin_server */ - default: - printf("Usage: admin_server [-h] [-n] [-r realm] [-d dbname] [-f filename] [-a acldir]\n"); - exit(-1); /* failure */ - } - - if (krbrlm[0] == 0) - if (krb_get_lrealm(krbrlm, 0) != KSUCCESS) { - fprintf(stderr, - "Unable to get local realm. Fix krb.conf or use -r.\n"); - exit(1); - } - - printf("KADM Server %s initializing\n",KADM_VERSTR); - printf("Please do not use 'kill -9' to kill this job, use a\n"); - printf("regular kill instead\n\n"); - - set_logfile(prm.sysfile); - log("Admin server starting"); - - (void) kerb_db_set_lockmode(KERB_DBL_NONBLOCKING); - errval = kerb_init(); /* Open the Kerberos database */ - if (errval) { - fprintf(stderr, "error: kerb_init() failed"); - close_syslog(); - byebye(); - } - /* set up the server_parm struct */ - if ((errval = kadm_ser_init(prm.inter, krbrlm))==KADM_SUCCESS) { - kerb_fini(); /* Close the Kerberos database-- - will re-open later */ - errval = kadm_listen(); /* listen for calls to server from - clients */ - } - if (errval != KADM_SUCCESS) { - fprintf(stderr,"error: %s\n",error_message(errval)); - kerb_fini(); /* Close if error */ - } - close_syslog(); /* Close syslog file, print - closing note */ - byebye(); /* Say bye bye on the terminal - in use */ -} /* procedure main */ - - -/* close the system log file */ -void -close_syslog() -{ - log("Shutting down admin server"); -} - -void -byebye() /* say goodnight gracie */ -{ - printf("Admin Server (kadm server) has completed operation.\n"); -} - -static void -clear_secrets() -{ - bzero((char *)server_parm.master_key, sizeof(server_parm.master_key)); - bzero((char *)server_parm.master_key_schedule, - sizeof(server_parm.master_key_schedule)); - server_parm.master_key_version = 0L; -} - -static exit_now = 0; - -sigtype -doexit() -{ - exit_now = 1; -#ifdef POSIX - return; -#else /* !POSIX */ - return(0); -#endif /* POSIX */ -} - -unsigned pidarraysize = 0; -int *pidarray = (int *)0; - -/* -kadm_listen -listen on the admin servers port for a request -*/ -int -kadm_listen() -{ - extern int errno; - int found; - int admin_fd; - int peer_fd; - fd_set mask, readfds; - struct sockaddr_in peer; - int addrlen; - int pid; - sigtype do_child(); - - (void) signal(SIGINT, doexit); - (void) signal(SIGTERM, doexit); - (void) signal(SIGHUP, doexit); - (void) signal(SIGQUIT, doexit); - (void) signal(SIGPIPE, SIG_IGN); /* get errors on write() */ - (void) signal(SIGALRM, doexit); - (void) signal(SIGCHLD, do_child); - - if ((admin_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) - return KADM_NO_SOCK; - if (bind(admin_fd, (struct sockaddr *)&server_parm.admin_addr, - sizeof(struct sockaddr_in)) < 0) - return KADM_NO_BIND; - (void) listen(admin_fd, 1); - FD_ZERO(&mask); - FD_SET(admin_fd, &mask); - - for (;;) { /* loop nearly forever */ - if (exit_now) { - clear_secrets(); - kill_children(); - return(0); - } - readfds = mask; - if ((found = select(admin_fd+1,&readfds,(fd_set *)0, - (fd_set *)0, (struct timeval *)0)) == 0) - continue; /* no things read */ - if (found < 0) { - if (errno != EINTR) - log("select: %s",error_message(errno)); - continue; - } - if (FD_ISSET(admin_fd, &readfds)) { - /* accept the conn */ - addrlen = sizeof(peer); - if ((peer_fd = accept(admin_fd, (struct sockaddr *)&peer, - &addrlen)) < 0) { - log("accept: %s",error_message(errno)); - continue; - } - addrlen = sizeof(server_parm.admin_addr); - if (getsockname(peer_fd, (struct sockaddr *)&server_parm.admin_addr, - &addrlen)) { - log("getsockname: %s",error_message(errno)); - continue; - } -#ifdef DEBUG - printf("Connection recieved on %s\n", - inet_ntoa(server_parm.admin_addr.sin_addr)); -#endif /* DEBUG */ -#ifndef DEBUG - /* if you want a sep daemon for each server */ - if ((pid = fork())) { - /* parent */ - if (pid < 0) { - log("fork: %s",error_message(errno)); - (void) close(peer_fd); - continue; - } - /* fork succeded: keep tabs on child */ - (void) close(peer_fd); - if (pidarray) { - pidarray = (int *)realloc((char *)pidarray, ++pidarraysize); - pidarray[pidarraysize-1] = pid; - } else { - pidarray = (int *)malloc(pidarraysize = 1); - pidarray[0] = pid; - } - } else { - /* child */ - (void) close(admin_fd); -#endif /* DEBUG */ - /* do stuff */ - process_client (peer_fd, &peer); -#ifndef DEBUG - } -#endif - } else { - log("something else woke me up!"); - return(0); - } - } - /*NOTREACHED*/ - return(0); /* Shut -Wall up - markm */ -} - -#ifdef DEBUG -#define cleanexit(code) {kerb_fini(); return;} -#endif - -void -process_client(fd, who) -int fd; -struct sockaddr_in *who; -{ - u_char *dat; - int dat_len; - u_short dlen; - int retval; - int on = 1; - Principal service; - des_cblock skey; - int more; - int status; - - if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) - log("setsockopt keepalive: %d",errno); - - server_parm.recv_addr = *who; - - if (kerb_init()) { /* Open as client */ - log("can't open krb db"); - cleanexit(1); - } - /* need to set service key to changepw.KRB_MASTER */ - - status = kerb_get_principal(server_parm.sname, server_parm.sinst, &service, - 1, &more); - if (status == -1) { - /* db locked */ - u_long retcode = KADM_DB_INUSE; - char *pdat; - - dat_len = KADM_VERSIZE + sizeof(u_long); - dat = (u_char *) malloc((unsigned)dat_len); - pdat = (char *) dat; - retcode = htonl((u_long) KADM_DB_INUSE); - (void) strncpy(pdat, KADM_ULOSE, KADM_VERSIZE); - bcopy((char *)&retcode, &pdat[KADM_VERSIZE], sizeof(u_long)); - goto out; - } else if (!status) { - log("no service %s.%s",server_parm.sname, server_parm.sinst); - cleanexit(2); - } - - bcopy((char *)&service.key_low, (char *)skey, 4); - bcopy((char *)&service.key_high, (char *)(((long *) skey) + 1), 4); - bzero((char *)&service, sizeof(service)); - kdb_encrypt_key (skey, skey, server_parm.master_key, - server_parm.master_key_schedule, DECRYPT); - (void) krb_set_key((char *)skey, 0); /* if error, will show up when - rd_req fails */ - bzero((char *)skey, sizeof(skey)); - - while (1) { - if ((retval = krb_net_read(fd, (char *)&dlen, sizeof(u_short))) != - sizeof(u_short)) { - if (retval < 0) - log("dlen read: %s",error_message(errno)); - else if (retval) - log("short dlen read: %d",retval); - (void) close(fd); - cleanexit(retval ? 3 : 0); - } - if (exit_now) { - cleanexit(0); - } - dat_len = (int) ntohs(dlen); - dat = (u_char *) malloc((unsigned)dat_len); - if (!dat) { - log("malloc: No memory"); - (void) close(fd); - cleanexit(4); - } - if ((retval = krb_net_read(fd, (char *)dat, dat_len)) != dat_len) { - if (retval < 0) - log("data read: %s",error_message(errno)); - else - log("short read: %d vs. %d", dat_len, retval); - (void) close(fd); - cleanexit(5); - } - if (exit_now) { - cleanexit(0); - } - if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS) - log("processing request: %s", error_message(retval)); - - /* kadm_ser_in did the processing and returned stuff in - dat & dat_len , return the appropriate data */ - - out: - dlen = (u_short) dat_len; - - if (dat_len != (int)dlen) { - clear_secrets(); - abort(); /* XXX */ - } - dlen = htons(dlen); - - if (krb_net_write(fd, (char *)&dlen, sizeof(u_short)) < 0) { - log("writing dlen to client: %s",error_message(errno)); - (void) close(fd); - cleanexit(6); - } - - if (krb_net_write(fd, (char *)dat, dat_len) < 0) { - log(LOG_ERR, "writing to client: %s",error_message(errno)); - (void) close(fd); - cleanexit(7); - } - free((char *)dat); - } - /*NOTREACHED*/ -} - -sigtype -do_child() -{ - /* SIGCHLD brings us here */ - int pid; - register int i, j; - -#ifdef POSIX - int status; -#else - union wait status; -#endif - - pid = wait(&status); - - for (i = 0; i < pidarraysize; i++) - if (pidarray[i] == pid) { - /* found it */ - for (j = i; j < pidarraysize-1; j++) - /* copy others down */ - pidarray[j] = pidarray[j+1]; - pidarraysize--; - if (WEXITSTATUS(status) || WCOREDUMP(status) || WIFSIGNALED(status)) - log("child %d: termsig %d, coredump %d, retcode %d", pid, - WTERMSIG(status), WCOREDUMP(status), WEXITSTATUS(status)); -#ifdef POSIX - return; -#else /* !POSIX */ - return(0); -#endif /* POSIX */ - } - log("child %d not in list: termsig %d, coredump %d, retcode %d", pid, - WTERMSIG(status), WCOREDUMP(status), WEXITSTATUS(status)); -#ifdef POSIX - return; -#else /* !POSIX */ - return(0); -#endif /* POSIX */ -} - -#ifndef DEBUG -void -cleanexit(val) - int val; -{ - kerb_fini(); - clear_secrets(); - exit(val); -} -#endif - -void -kill_children() -{ - register int i; - int osigmask; - - osigmask = sigblock(sigmask(SIGCHLD)); - - for (i = 0; i < pidarraysize; i++) { - kill(pidarray[i], SIGINT); - log("killing child %d", pidarray[i]); - } - sigsetmask(osigmask); - return; -} diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c deleted file mode 100644 index 47dd4b405f62e..0000000000000 --- a/eBones/usr.sbin/kadmind/kadm_funcs.c +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT - * - * Kerberos administration server-side database manipulation routines - */ - -#if 0 -#ifndef lint -static char rcsid_kadm_funcs_c[] = -"Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp "; -static const char rcsid[] = - "$Id$"; -#endif lint -#endif - -/* -kadm_funcs.c -the actual database manipulation code -*/ - -#include -#include -#include -#include -#include -#include -#include -#include "kadm_server.h" - -extern Kadm_Server server_parm; - -int -check_access(pname, pinst, prealm, acltype) -char *pname; -char *pinst; -char *prealm; -enum acl_types acltype; -{ - char checkname[MAX_K_NAME_SZ]; - char filename[MAXPATHLEN]; - extern char *acldir; - - sprintf(checkname, "%s.%s@%s", pname, pinst, prealm); - - switch (acltype) { - case ADDACL: - sprintf(filename, "%s%s", acldir, ADD_ACL_FILE); - break; - case GETACL: - sprintf(filename, "%s%s", acldir, GET_ACL_FILE); - break; - case MODACL: - sprintf(filename, "%s%s", acldir, MOD_ACL_FILE); - break; - } - return(acl_check(filename, checkname)); -} - -int -wildcard(str) -char *str; -{ - if (!strcmp(str, WILDCARD_STR)) - return(1); - return(0); -} - -#define failadd(code) { (void) log("FAILED addding '%s.%s' (%s)", valsin->name, valsin->instance, error_message(code)); return code; } - -int -kadm_add_entry (rname, rinstance, rrealm, valsin, valsout) -char *rname; /* requestors name */ -char *rinstance; /* requestors instance */ -char *rrealm; /* requestors realm */ -Kadm_vals *valsin; -Kadm_vals *valsout; -{ - long numfound; /* check how many we get written */ - int more; /* pointer to more grabbed records */ - Principal data_i, data_o; /* temporary principal */ - u_char flags[4]; - des_cblock newpw; - Principal default_princ; - - if (!check_access(rname, rinstance, rrealm, ADDACL)) { - (void) log("WARNING: '%s.%s@%s' tried to add an entry for '%s.%s'", - rname, rinstance, rrealm, valsin->name, valsin->instance); - return KADM_UNAUTH; - } - - /* Need to check here for "legal" name and instance */ - if (wildcard(valsin->name) || wildcard(valsin->instance)) { - failadd(KADM_ILL_WILDCARD); - } - - (void) log("request to add an entry for '%s.%s' from '%s.%s@%s'", - valsin->name, valsin->instance, rname, rinstance, rrealm); - - numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, - &default_princ, 1, &more); - if (numfound == -1) { - failadd(KADM_DB_INUSE); - } else if (numfound != 1) { - failadd(KADM_UK_RERROR); - } - - kadm_vals_to_prin(valsin->fields, &data_i, valsin); - (void) strncpy(data_i.name, valsin->name, ANAME_SZ); - (void) strncpy(data_i.instance, valsin->instance, INST_SZ); - - if (!IS_FIELD(KADM_EXPDATE,valsin->fields)) - data_i.exp_date = default_princ.exp_date; - if (!IS_FIELD(KADM_ATTR,valsin->fields)) - data_i.attributes = default_princ.attributes; - if (!IS_FIELD(KADM_MAXLIFE,valsin->fields)) - data_i.max_life = default_princ.max_life; - - bzero((char *)&default_princ, sizeof(default_princ)); - - /* convert to host order */ - data_i.key_low = ntohl(data_i.key_low); - data_i.key_high = ntohl(data_i.key_high); - - - bcopy(&data_i.key_low,newpw,4); - bcopy(&data_i.key_high,(char *)(((long *) newpw) + 1),4); - - /* encrypt new key in master key */ - kdb_encrypt_key (newpw, newpw, server_parm.master_key, - server_parm.master_key_schedule, ENCRYPT); - bcopy(newpw,&data_i.key_low,4); - bcopy((char *)(((long *) newpw) + 1), &data_i.key_high,4); - bzero((char *)newpw, sizeof(newpw)); - - data_o = data_i; - numfound = kerb_get_principal(valsin->name, valsin->instance, - &data_o, 1, &more); - if (numfound == -1) { - failadd(KADM_DB_INUSE); - } else if (numfound) { - failadd(KADM_INUSE); - } else { - data_i.key_version++; - data_i.kdc_key_ver = server_parm.master_key_version; - (void) strncpy(data_i.mod_name, rname, sizeof(data_i.mod_name)-1); - (void) strncpy(data_i.mod_instance, rinstance, - sizeof(data_i.mod_instance)-1); - - numfound = kerb_put_principal(&data_i, 1); - if (numfound == -1) { - failadd(KADM_DB_INUSE); - } else if (numfound) { - failadd(KADM_UK_SERROR); - } else { - numfound = kerb_get_principal(valsin->name, valsin->instance, - &data_o, 1, &more); - if ((numfound!=1) || (more!=0)) { - failadd(KADM_UK_RERROR); - } - bzero((char *)flags, sizeof(flags)); - SET_FIELD(KADM_NAME,flags); - SET_FIELD(KADM_INST,flags); - SET_FIELD(KADM_EXPDATE,flags); - SET_FIELD(KADM_ATTR,flags); - SET_FIELD(KADM_MAXLIFE,flags); - kadm_prin_to_vals(flags, valsout, &data_o); - (void) log("'%s.%s' added.", valsin->name, valsin->instance); - return KADM_DATA; /* Set all the appropriate fields */ - } - } -} -#undef failadd - -#define failget(code) { (void) log("FAILED retrieving '%s.%s' (%s)", valsin->name, valsin->instance, error_message(code)); return code; } - -int -kadm_get_entry (rname, rinstance, rrealm, valsin, flags, valsout) -char *rname; /* requestors name */ -char *rinstance; /* requestors instance */ -char *rrealm; /* requestors realm */ -Kadm_vals *valsin; /* what they wannt to get */ -u_char *flags; /* which fields we want */ -Kadm_vals *valsout; /* what data is there */ -{ - long numfound; /* check how many were returned */ - int more; /* To point to more name.instances */ - Principal data_o; /* Data object to hold Principal */ - - - if (!check_access(rname, rinstance, rrealm, GETACL)) { - (void) log("WARNING: '%s.%s@%s' tried to get '%s.%s's entry", - rname, rinstance, rrealm, valsin->name, valsin->instance); - return KADM_UNAUTH; - } - - if (wildcard(valsin->name) || wildcard(valsin->instance)) { - failget(KADM_ILL_WILDCARD); - } - - (void) log("retrieve '%s.%s's entry for '%s.%s@%s'", - valsin->name, valsin->instance, rname, rinstance, rrealm); - - /* Look up the record in the database */ - numfound = kerb_get_principal(valsin->name, valsin->instance, - &data_o, 1, &more); - if (numfound == -1) { - failget(KADM_DB_INUSE); - } else if (numfound) { /* We got the record, let's return it */ - kadm_prin_to_vals(flags, valsout, &data_o); - (void) log("'%s.%s' retrieved.", valsin->name, valsin->instance); - return KADM_DATA; /* Set all the appropriate fields */ - } else { - failget(KADM_NOENTRY); /* Else whimper and moan */ - } -} -#undef failget - -#define failmod(code) { (void) log("FAILED modifying '%s.%s' (%s)", valsin1->name, valsin1->instance, error_message(code)); return code; } - -int -kadm_mod_entry (rname, rinstance, rrealm, valsin1, valsin2, valsout) -char *rname; /* requestors name */ -char *rinstance; /* requestors instance */ -char *rrealm; /* requestors realm */ -Kadm_vals *valsin1, *valsin2; /* holds the parameters being - passed in */ -Kadm_vals *valsout; /* the actual record which is returned */ -{ - long numfound; - int more; - Principal data_o, temp_key; - u_char fields[4]; - des_cblock newpw; - - if (wildcard(valsin1->name) || wildcard(valsin1->instance)) { - failmod(KADM_ILL_WILDCARD); - } - - if (!check_access(rname, rinstance, rrealm, MODACL)) { - (void) log("WARNING: '%s.%s@%s' tried to change '%s.%s's entry", - rname, rinstance, rrealm, valsin1->name, valsin1->instance); - return KADM_UNAUTH; - } - - (void) log("request to modify '%s.%s's entry from '%s.%s@%s' ", - valsin1->name, valsin1->instance, rname, rinstance, rrealm); - - numfound = kerb_get_principal(valsin1->name, valsin1->instance, - &data_o, 1, &more); - if (numfound == -1) { - failmod(KADM_DB_INUSE); - } else if (numfound) { - kadm_vals_to_prin(valsin2->fields, &temp_key, valsin2); - (void) strncpy(data_o.name, valsin1->name, ANAME_SZ); - (void) strncpy(data_o.instance, valsin1->instance, INST_SZ); - if (IS_FIELD(KADM_EXPDATE,valsin2->fields)) - data_o.exp_date = temp_key.exp_date; - if (IS_FIELD(KADM_ATTR,valsin2->fields)) - data_o.attributes = temp_key.attributes; - if (IS_FIELD(KADM_MAXLIFE,valsin2->fields)) - data_o.max_life = temp_key.max_life; - if (IS_FIELD(KADM_DESKEY,valsin2->fields)) { - data_o.key_version++; - data_o.kdc_key_ver = server_parm.master_key_version; - - - /* convert to host order */ - temp_key.key_low = ntohl(temp_key.key_low); - temp_key.key_high = ntohl(temp_key.key_high); - - - bcopy(&temp_key.key_low,newpw,4); - bcopy(&temp_key.key_high,(char *)(((long *) newpw) + 1),4); - - /* encrypt new key in master key */ - kdb_encrypt_key (newpw, newpw, server_parm.master_key, - server_parm.master_key_schedule, ENCRYPT); - bcopy(newpw,&data_o.key_low,4); - bcopy((char *)(((long *) newpw) + 1), &data_o.key_high,4); - bzero((char *)newpw, sizeof(newpw)); - } - bzero((char *)&temp_key, sizeof(temp_key)); - - (void) strncpy(data_o.mod_name, rname, sizeof(data_o.mod_name)-1); - (void) strncpy(data_o.mod_instance, rinstance, - sizeof(data_o.mod_instance)-1); - more = kerb_put_principal(&data_o, 1); - - bzero((char *)&data_o, sizeof(data_o)); - - if (more == -1) { - failmod(KADM_DB_INUSE); - } else if (more) { - failmod(KADM_UK_SERROR); - } else { - numfound = kerb_get_principal(valsin1->name, valsin1->instance, - &data_o, 1, &more); - if ((more!=0)||(numfound!=1)) { - failmod(KADM_UK_RERROR); - } - bzero((char *) fields, sizeof(fields)); - SET_FIELD(KADM_NAME,fields); - SET_FIELD(KADM_INST,fields); - SET_FIELD(KADM_EXPDATE,fields); - SET_FIELD(KADM_ATTR,fields); - SET_FIELD(KADM_MAXLIFE,fields); - kadm_prin_to_vals(fields, valsout, &data_o); - (void) log("'%s.%s' modified.", valsin1->name, valsin1->instance); - return KADM_DATA; /* Set all the appropriate fields */ - } - } - else { - failmod(KADM_NOENTRY); - } -} -#undef failmod - -#define failchange(code) { (void) log("FAILED changing key for '%s.%s@%s' (%s)", rname, rinstance, rrealm, error_message(code)); return code; } - -int -kadm_change (rname, rinstance, rrealm, newpw) -char *rname; -char *rinstance; -char *rrealm; -des_cblock newpw; -{ - long numfound; - int more; - Principal data_o; - des_cblock local_pw; - - if (strcmp(server_parm.krbrlm, rrealm)) { - (void) log("change key request from wrong realm, '%s.%s@%s'!\n", - rname, rinstance, rrealm); - return(KADM_WRONG_REALM); - } - - if (wildcard(rname) || wildcard(rinstance)) { - failchange(KADM_ILL_WILDCARD); - } - (void) log("'%s.%s@%s' wants to change its password", - rname, rinstance, rrealm); - - bcopy(newpw, local_pw, sizeof(local_pw)); - - /* encrypt new key in master key */ - kdb_encrypt_key (local_pw, local_pw, server_parm.master_key, - server_parm.master_key_schedule, ENCRYPT); - - numfound = kerb_get_principal(rname, rinstance, - &data_o, 1, &more); - if (numfound == -1) { - failchange(KADM_DB_INUSE); - } else if (numfound) { - bcopy(local_pw,&data_o.key_low,4); - bcopy((char *)(((long *) local_pw) + 1), &data_o.key_high,4); - data_o.key_version++; - data_o.kdc_key_ver = server_parm.master_key_version; - (void) strncpy(data_o.mod_name, rname, sizeof(data_o.mod_name)-1); - (void) strncpy(data_o.mod_instance, rinstance, - sizeof(data_o.mod_instance)-1); - more = kerb_put_principal(&data_o, 1); - bzero((char *) local_pw, sizeof(local_pw)); - bzero((char *) &data_o, sizeof(data_o)); - if (more == -1) { - failchange(KADM_DB_INUSE); - } else if (more) { - failchange(KADM_UK_SERROR); - } else { - (void) log("'%s.%s@%s' password changed.", rname, rinstance, rrealm); - return KADM_SUCCESS; - } - } - else { - failchange(KADM_NOENTRY); - } -} -#undef failchange diff --git a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c deleted file mode 100644 index 0fa1acefc43a0..0000000000000 --- a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Kerberos administration server-side support functions - */ - -#if 0 -#ifndef lint -static char rcsid_module_c[] = -"BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v 4.4 89/09/26 09:29:36 jtkohl Exp "; -#endif lint -#endif - -/* -kadm_ser_wrap.c -unwraps wrapped packets and calls the appropriate server subroutine -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "kadm_server.h" - -Kadm_Server server_parm; - -/* -kadm_ser_init -set up the server_parm structure -*/ -int -kadm_ser_init(inter, realm) -int inter; /* interactive or from file */ -char realm[]; -{ - struct servent *sep; - struct hostent *hp; - char hostname[MAXHOSTNAMELEN]; - - init_kadm_err_tbl(); - init_krb_err_tbl(); - if (gethostname(hostname, sizeof(hostname))) - return KADM_NO_HOSTNAME; - - strcpy(server_parm.sname, PWSERV_NAME); - strcpy(server_parm.sinst, KRB_MASTER); - strcpy(server_parm.krbrlm, realm); - - server_parm.admin_fd = -1; - /* setting up the addrs */ - if ((sep = getservbyname(KADM_SNAME, "tcp")) == NULL) - return KADM_NO_SERV; - bzero((char *)&server_parm.admin_addr,sizeof(server_parm.admin_addr)); - server_parm.admin_addr.sin_family = AF_INET; - if ((hp = gethostbyname(hostname)) == NULL) - return KADM_NO_HOSTNAME; - server_parm.admin_addr.sin_addr.s_addr = INADDR_ANY; - server_parm.admin_addr.sin_port = sep->s_port; - /* setting up the database */ - if (kdb_get_master_key((inter==1),server_parm.master_key, - server_parm.master_key_schedule) != 0) - return KADM_NO_MAST; - if ((server_parm.master_key_version = - kdb_verify_master_key(server_parm.master_key, - server_parm.master_key_schedule,stderr))<0) - return KADM_NO_VERI; - return KADM_SUCCESS; -} - -static void -errpkt(dat, dat_len, code) -u_char **dat; -int *dat_len; -int code; -{ - u_long retcode; - char *pdat; - - free((char *)*dat); /* free up req */ - *dat_len = KADM_VERSIZE + sizeof(u_long); - *dat = (u_char *) malloc((unsigned)*dat_len); - pdat = (char *) *dat; - retcode = htonl((u_long) code); - (void) strncpy(pdat, KADM_ULOSE, KADM_VERSIZE); - bcopy((char *)&retcode, &pdat[KADM_VERSIZE], sizeof(u_long)); - return; -} - -/* -kadm_ser_in -unwrap the data stored in dat, process, and return it. -*/ -int -kadm_ser_in(dat,dat_len) -u_char **dat; -int *dat_len; -{ - u_char *in_st; /* pointer into the sent packet */ - int in_len,retc; /* where in packet we are, for - returns */ - u_long r_len; /* length of the actual packet */ - KTEXT_ST authent; /* the authenticator */ - AUTH_DAT ad; /* who is this, klink */ - u_long ncksum; /* checksum of encrypted data */ - des_key_schedule sess_sched; /* our schedule */ - MSG_DAT msg_st; - u_char *retdat, *tmpdat; - int retval, retlen; - - if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { - errpkt(dat, dat_len, KADM_BAD_VER); - return KADM_BAD_VER; - } - in_len = KADM_VERSIZE; - /* get the length */ - if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) - return KADM_LENGTH_ERROR; - in_len += retc; - authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(u_long); - bcopy((char *)(*dat) + in_len, (char *)authent.dat, authent.length); - authent.mbz = 0; - /* service key should be set before here */ - if ((retc = krb_rd_req(&authent, server_parm.sname, server_parm.sinst, - server_parm.recv_addr.sin_addr.s_addr, &ad, (char *)0))) - { - errpkt(dat, dat_len,retc + krb_err_base); - return retc + krb_err_base; - } - -#define clr_cli_secrets() {bzero((char *)sess_sched, sizeof(sess_sched)); bzero((char *)ad.session, sizeof(ad.session));} - - in_st = *dat + *dat_len - r_len; -#ifdef NOENCRYPTION - ncksum = 0; -#else - ncksum = quad_cksum((des_cblock *)in_st, (des_cblock *)0, (long) r_len, - 0, (des_cblock *)ad.session); -#endif - if (ncksum!=ad.checksum) { /* yow, are we correct yet */ - clr_cli_secrets(); - errpkt(dat, dat_len,KADM_BAD_CHK); - return KADM_BAD_CHK; - } -#ifdef NOENCRYPTION - bzero(sess_sched, sizeof(sess_sched)); -#else - des_key_sched((des_cblock *)ad.session, sess_sched); -#endif - if ((retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session, - &server_parm.recv_addr, - &server_parm.admin_addr, &msg_st))) { - clr_cli_secrets(); - errpkt(dat, dat_len,retc + krb_err_base); - return retc + krb_err_base; - } - switch (msg_st.app_data[0]) { - case CHANGE_PW: - retval = kadm_ser_cpw(msg_st.app_data+1,(int) msg_st.app_length,&ad, - &retdat, &retlen); - break; - case ADD_ENT: - retval = kadm_ser_add(msg_st.app_data+1,(int) msg_st.app_length,&ad, - &retdat, &retlen); - break; - case GET_ENT: - retval = kadm_ser_get(msg_st.app_data+1,(int) msg_st.app_length,&ad, - &retdat, &retlen); - break; - case MOD_ENT: - retval = kadm_ser_mod(msg_st.app_data+1,(int) msg_st.app_length,&ad, - &retdat, &retlen); - break; - default: - clr_cli_secrets(); - errpkt(dat, dat_len, KADM_NO_OPCODE); - return KADM_NO_OPCODE; - } - /* Now seal the response back into a priv msg */ - free((char *)*dat); - tmpdat = (u_char *) malloc((unsigned)(retlen + KADM_VERSIZE + - sizeof(u_long))); - (void) strncpy((char *)tmpdat, KADM_VERSTR, KADM_VERSIZE); - retval = htonl((u_long)retval); - bcopy((char *)&retval, (char *)tmpdat + KADM_VERSIZE, sizeof(u_long)); - if (retlen) { - bcopy((char *)retdat, (char *)tmpdat + KADM_VERSIZE + sizeof(u_long), - retlen); - free((char *)retdat); - } - /* slop for mk_priv stuff */ - *dat = (u_char *) malloc((unsigned) (retlen + KADM_VERSIZE + - sizeof(u_long) + 200)); - if ((*dat_len = krb_mk_priv(tmpdat, *dat, - (u_long) (retlen + KADM_VERSIZE + - sizeof(u_long)), - sess_sched, - ad.session, &server_parm.admin_addr, - &server_parm.recv_addr)) < 0) { - clr_cli_secrets(); - errpkt(dat, dat_len, KADM_NO_ENCRYPT); - return KADM_NO_ENCRYPT; - } - clr_cli_secrets(); - return KADM_SUCCESS; -} diff --git a/eBones/usr.sbin/kadmind/kadm_server.c b/eBones/usr.sbin/kadmind/kadm_server.c deleted file mode 100644 index c6cbc6ac4e8c1..0000000000000 --- a/eBones/usr.sbin/kadmind/kadm_server.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Kerberos administration server-side subroutines - */ - -#if 0 -#ifndef lint -static char rcsid_kadm_server_c[] = -"Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.c,v 4.2 89/09/26 09:30:23 jtkohl Exp "; -#endif lint -#endif - -#include -#include -#include -#include "kadm_server.h" - -/* -kadm_ser_cpw - the server side of the change_password routine - recieves : KTEXT, {key} - returns : CKSUM, RETCODE - acl : caller can change only own password - -Replaces the password (i.e. des key) of the caller with that specified in key. -Returns no actual data from the master server, since this is called by a user -*/ -int -kadm_ser_cpw(dat, len, ad, datout, outlen) -u_char *dat; -int len; -AUTH_DAT *ad; -u_char **datout; -int *outlen; -{ - unsigned long keylow, keyhigh; - des_cblock newkey; - int stvlen; - - /* take key off the stream, and change the database */ - - if ((stvlen = stv_long(dat, &keyhigh, 0, len)) < 0) - return(KADM_LENGTH_ERROR); - if (stv_long(dat, &keylow, stvlen, len) < 0) - return(KADM_LENGTH_ERROR); - - keylow = ntohl(keylow); - keyhigh = ntohl(keyhigh); - bcopy((char *)&keyhigh, (char *)(((long *)newkey) + 1), 4); - bcopy((char *)&keylow, (char *)newkey, 4); - *datout = 0; - *outlen = 0; - - return(kadm_change(ad->pname, ad->pinst, ad->prealm, newkey)); -} - -/* -kadm_ser_add - the server side of the add_entry routine - recieves : KTEXT, {values} - returns : CKSUM, RETCODE, {values} - acl : su, sms (as alloc) - -Adds and entry containing values to the database -returns the values of the entry, so if you leave certain fields blank you will - be able to determine the default values they are set to -*/ -int -kadm_ser_add(dat,len,ad, datout, outlen) -u_char *dat; -int len; -AUTH_DAT *ad; -u_char **datout; -int *outlen; -{ - Kadm_vals values, retvals; - int status; - - if ((status = stream_to_vals(dat, &values, len)) < 0) - return(KADM_LENGTH_ERROR); - if ((status = kadm_add_entry(ad->pname, ad->pinst, ad->prealm, - &values, &retvals)) == KADM_DATA) { - *outlen = vals_to_stream(&retvals,datout); - return KADM_SUCCESS; - } else { - *outlen = 0; - return status; - } -} - -/* -kadm_ser_mod - the server side of the mod_entry routine - recieves : KTEXT, {values, values} - returns : CKSUM, RETCODE, {values} - acl : su, sms (as register or dealloc) - -Modifies all entries corresponding to the first values so they match the - second values. -returns the values for the changed entries -*/ -int -kadm_ser_mod(dat,len,ad, datout, outlen) -u_char *dat; -int len; -AUTH_DAT *ad; -u_char **datout; -int *outlen; -{ - Kadm_vals vals1, vals2, retvals; - int wh; - int status; - - if ((wh = stream_to_vals(dat, &vals1, len)) < 0) - return KADM_LENGTH_ERROR; - if ((status = stream_to_vals(dat+wh,&vals2, len-wh)) < 0) - return KADM_LENGTH_ERROR; - if ((status = kadm_mod_entry(ad->pname, ad->pinst, ad->prealm, &vals1, - &vals2, &retvals)) == KADM_DATA) { - *outlen = vals_to_stream(&retvals,datout); - return KADM_SUCCESS; - } else { - *outlen = 0; - return status; - } -} - -/* -kadm_ser_get - recieves : KTEXT, {values, flags} - returns : CKSUM, RETCODE, {count, values, values, values} - acl : su - -gets the fields requested by flags from all entries matching values -returns this data for each matching recipient, after a count of how many such - matches there were -*/ -int -kadm_ser_get(dat,len,ad, datout, outlen) -u_char *dat; -int len; -AUTH_DAT *ad; -u_char **datout; -int *outlen; -{ - Kadm_vals values, retvals; - u_char fl[FLDSZ]; - int loop,wh; - int status; - - if ((wh = stream_to_vals(dat, &values, len)) < 0) - return KADM_LENGTH_ERROR; - if (wh + FLDSZ > len) - return KADM_LENGTH_ERROR; - for (loop=FLDSZ-1; loop>=0; loop--) - fl[loop] = dat[wh++]; - if ((status = kadm_get_entry(ad->pname, ad->pinst, ad->prealm, - &values, fl, &retvals)) == KADM_DATA) { - *outlen = vals_to_stream(&retvals,datout); - return KADM_SUCCESS; - } else { - *outlen = 0; - return status; - } -} - diff --git a/eBones/usr.sbin/kadmind/kadm_server.h b/eBones/usr.sbin/kadmind/kadm_server.h deleted file mode 100644 index 1708107029a83..0000000000000 --- a/eBones/usr.sbin/kadmind/kadm_server.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * $Source: /usr/cvs/src/eBones/kadmind/kadm_server.h,v $ - * $Author: mark $ - * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp - * - * Copyright 1988 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * Definitions for Kerberos administration server & client - */ - -#ifndef KADM_SERVER_DEFS -#define KADM_SERVER_DEFS - -/* - * kadm_server.h - * Header file for the fourth attempt at an admin server - * Doug Church, December 28, 1989, MIT Project Athena - * ps. Yes that means this code belongs to athena etc... - * as part of our ongoing attempt to copyright all greek names - */ - -#include -#include -#include - -typedef struct { - struct sockaddr_in admin_addr; - struct sockaddr_in recv_addr; - int recv_addr_len; - int admin_fd; /* our link to clients */ - char sname[ANAME_SZ]; - char sinst[INST_SZ]; - char krbrlm[REALM_SZ]; - C_Block master_key; - C_Block session_key; - Key_schedule master_key_schedule; - long master_key_version; -} Kadm_Server; - -/* the default syslog file */ -#define KADM_SYSLOG "/var/log/kadmind.syslog" - -#define DEFAULT_ACL_DIR "/etc/kerberosIV" -#define ADD_ACL_FILE "/admin_acl.add" -#define GET_ACL_FILE "/admin_acl.get" -#define MOD_ACL_FILE "/admin_acl.mod" - -int kadm_ser_in(unsigned char **dat, int *dat_len); -int kadm_ser_init(int inter, char realm[]); -int kadm_ser_cpw(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, - int *outlen); -int kadm_ser_add(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, - int *outlen); -int kadm_ser_mod(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, - int *outlen); -int kadm_ser_get(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, - int *outlen); -int kadm_change (char *rname, char *rinstance, char *rrealm, - des_cblock newpw); -int kadm_add_entry(char *rname, char *rinstance, char *rrealm, - Kadm_vals *valsin, Kadm_vals *valsout); -int kadm_mod_entry(char *rname, char *rinstance, char *rrealm, - Kadm_vals *valsin1, Kadm_vals *valsin2, Kadm_vals *valsout); -int kadm_get_entry(char *rname, char *rinstance, char *rrealm, - Kadm_vals *valsin, u_char *flags, Kadm_vals *valsout); - -#endif KADM_SERVER_DEFS diff --git a/eBones/usr.sbin/kadmind/kadmind.8 b/eBones/usr.sbin/kadmind/kadmind.8 deleted file mode 100644 index 1eb10d7934428..0000000000000 --- a/eBones/usr.sbin/kadmind/kadmind.8 +++ /dev/null @@ -1,117 +0,0 @@ -.\" from: kadmind.8,v 4.1 89/07/25 17:28:33 jtkohl Exp $ -.\" $Id: kadmind.8,v 1.1.1.1 1994/09/30 14:50:06 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KADMIND 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kadmind \- network daemon for Kerberos database administration -.SH SYNOPSIS -.B kadmind -[ -.B \-n -] [ -.B \-h -] [ -.B \-r realm -] [ -.B \-f filename -] [ -.B \-d dbname -] [ -.B \-a acldir -] -.SH DESCRIPTION -.I kadmind -is the network database server for the Kerberos password-changing and -administration tools. -.PP -Upon execution, it prompts the user to enter the master key string for -the database. -.PP -If the -.B \-n -option is specified, the master key is instead fetched from the master -key cache file. -.PP -If the -.B \-r -.I realm -option is specified, the admin server will pretend that its -local realm is -.I realm -instead of the actual local realm of the host it is running on. -This makes it possible to run a server for a foreign kerberos -realm. -.PP -If the -.B \-f -.I filename -option is specified, then that file is used to hold the log information -instead of the default. -.PP -If the -.B \-d -.I dbname -option is specified, then that file is used as the database name instead -of the default. -.PP -If the -.B \-a -.I acldir -option is specified, then -.I acldir -is used as the directory in which to search for access control lists -instead of the default. -.PP -If the -.B \-h -option is specified, -.I kadmind -prints out a short summary of the permissible control arguments, and -then exits. -.PP -When performing requests on behalf of clients, -.I kadmind -checks access control lists (ACLs) to determine the authorization of the client -to perform the requested action. -Currently three distinct access types are supported: -.TP 1i -Addition -(.add ACL file). If a principal is on this list, it may add new -principals to the database. -.TP -Retrieval -(.get ACL file). If a principal is on this list, it may retrieve -database entries. NOTE: A principal's private key is never returned by -the get functions. -.TP -Modification -(.mod ACL file). If a principal is on this list, it may modify entries -in the database. -.PP -A principal is always granted authorization to change its own password. -.SH FILES -.TP 20n -/var/log/kadmind.syslog -Default log file. -.TP -/etc/kerberosIV/admin_acl.{add,get,mod} -Access control list files -.TP -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.TP -/etc/kerberosIV/master_key -Master key cache file. -.SH "SEE ALSO" -kerberos(1), kpasswd(1), kadmin(8), acl_check(3) -.SH AUTHORS -Douglas A. Church, MIT Project Athena -.br -John T. Kohl, Project Athena/Digital Equipment Corporation diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile deleted file mode 100644 index f92eb0e2b8e10..0000000000000 --- a/eBones/usr.sbin/kdb_destroy/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.4 1995/09/13 17:24:23 markm Exp $ - -PROG= kdb_destroy -CFLAGS+=-DKERBEROS -DDEBUG -MAN8= kdb_destroy.8 - -.include diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.8 b/eBones/usr.sbin/kdb_destroy/kdb_destroy.8 deleted file mode 100644 index 2e5787603f0bd..0000000000000 --- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.8 +++ /dev/null @@ -1,36 +0,0 @@ -.\" from: kdb_destroy.8,v 4.1 89/01/23 11:08:02 jtkohl Exp $ -.\" $Id: kdb_destroy.8,v 1.1.1.1 1994/09/30 14:50:06 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KDB_DESTROY 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kdb_destroy \- destroy Kerberos key distribution center database -.SH SYNOPSIS -kdb_destroy -.SH DESCRIPTION -.I kdb_destroy -deletes a Kerberos key distribution center database. -.PP -The user is prompted to verify that the database should be destroyed. A -response beginning with `y' or `Y' confirms deletion. -Any other response aborts deletion. -.SH DIAGNOSTICS -.TP 20n -"Database cannot be deleted at /kerberos/principal" -The attempt to delete the database failed (probably due to a system or -access permission error). -.TP -"Database not deleted." -The user aborted the deletion. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.SH SEE ALSO -kdb_init(8) diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c deleted file mode 100644 index 57e1a80a6b9c9..0000000000000 --- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * from: kdb_destroy.c,v 4.0 89/01/24 21:49:02 jtkohl Exp $ - * $Id: kdb_destroy.c,v 1.5 1995/08/04 06:35:45 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kdb_destroy.c,v 1.5 1995/08/04 06:35:45 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#define _DBM_ -#endif - -void -main() -{ - char answer[10]; /* user input */ -#ifdef _DBM_ - char dbm[256]; /* database path and name */ - char *file; /* database file names */ -#else - char dbm[256]; /* database path and name */ - char dbm1[256]; /* database path and name */ - char *file1, *file2; /* database file names */ -#endif - - strcpy(dbm, DBM_FILE); -#ifdef _DBM_ - file = strcat(dbm, ".db"); -#else - strcpy(dbm1, DBM_FILE); - file1 = strcat(dbm, ".dir"); - file2 = strcat(dbm1, ".pag"); -#endif - - printf("You are about to destroy the Kerberos database "); - printf("on this machine.\n"); - printf("Are you sure you want to do this (y/n)? "); - fgets(answer, sizeof(answer), stdin); - - if (answer[0] == 'y' || answer[0] == 'Y') { -#ifdef _DBM_ - if (unlink(file) == 0) -#else - if (unlink(file1) == 0 && unlink(file2) == 0) -#endif - fprintf(stderr, "Database deleted at %s\n", DBM_FILE); - else - fprintf(stderr, "Database cannot be deleted at %s\n", - DBM_FILE); - } else - fprintf(stderr, "Database not deleted.\n"); -} diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile deleted file mode 100644 index 34dd94af8a03e..0000000000000 --- a/eBones/usr.sbin/kdb_edit/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# From: @(#)Makefile 5.2 (Berkeley) 2/14/91 -# $Id: Makefile,v 1.5 1995/09/14 04:09:47 gibbs Exp $ - -PROG= kdb_edit -CFLAGS+=-DKERBEROS -DDEBUG -I. -SRCS= kdb_edit.c maketime.c -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= kdb_edit.8 - -.include diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.8 b/eBones/usr.sbin/kdb_edit/kdb_edit.8 deleted file mode 100644 index 44a0fa61ed70d..0000000000000 --- a/eBones/usr.sbin/kdb_edit/kdb_edit.8 +++ /dev/null @@ -1,58 +0,0 @@ -.\" from: kdb_edit.8,v 4.1 89/01/23 11:08:55 jtkohl Exp $ -.\" $Id: kdb_edit.8,v 1.2 1995/02/08 10:54:20 jkh Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KDB_EDIT 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kdb_edit \- Kerberos key distribution center database editing utility -.SH SYNOPSIS -kdb_edit [ -.B \-n -] -.SH DESCRIPTION -.I kdb_edit -is used to create or change principals stored in the Kerberos key -distribution center (KDC) database. -.PP -When executed, -.I kdb_edit -prompts for the master key string and verifies that it matches the -master key stored in the database. -If the -.B \-n -option is specified, the master key is instead fetched from the master -key cache file. -.PP -Once the master key has been verified, -.I kdb_edit -begins a prompt loop. The user is prompted for the principal and -instance to be modified. If the entry is not found the user may create -it. -Once an entry is found or created, the user may set the password, -expiration date, maximum ticket lifetime, and attributes. -Default expiration dates, maximum ticket lifetimes, and attributes are -presented in brackets; if the user presses return the default is selected. -There is no default password. -The password "RANDOM" and an empty password are interpreted specially, -if entered the user may have the program select a random DES key for the -principal. -.PP -Upon successfully creating or changing the entry, ``Edit O.K.'' is -printed. -.SH DIAGNOSTICS -.TP 20n -"verify_master_key: Invalid master key, does not match database." -The master key string entered was incorrect. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.TP -/etc/kerberosIV/master_key -Master key cache file. diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.c b/eBones/usr.sbin/kdb_edit/kdb_edit.c deleted file mode 100644 index f08316e38463a..0000000000000 --- a/eBones/usr.sbin/kdb_edit/kdb_edit.c +++ /dev/null @@ -1,479 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * This routine changes the Kerberos encryption keys for principals, - * i.e., users or services. - * - * from: kdb_edit.c,v 4.2 90/01/09 16:05:09 raeburn Exp $ - * $Id$ - */ - -/* - * exit returns 0 ==> success -1 ==> error - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id$"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include "time.h" -#include -#include -#include -/* MKEYFILE is now defined in kdc.h */ -#include - -void Usage(void); -void cleanup(void); -void sig_exit(int sig, int code, struct sigcontext *scp); -void no_core_dumps(void); -int change_principal(void); - -#define zaptime(foo) bzero((char *)(foo), sizeof(*(foo))) - -char prog[32]; -char *progname = prog; -int nflag = 0; -int cflag; -int lflag; -int uflag; -int debug; -extern kerb_debug; - -Key_schedule KS; -C_Block new_key; -unsigned char *input; - -unsigned char *ivec; -int i, j; -int more; - -char *in_ptr; -char input_name[ANAME_SZ]; -char input_instance[INST_SZ]; -char input_string[ANAME_SZ]; - -#define MAX_PRINCIPAL 10 -Principal principal_data[MAX_PRINCIPAL]; - -static Principal old_principal; -static Principal default_princ; - -static C_Block master_key; -static C_Block session_key; -static Key_schedule master_key_schedule; -static char pw_str[255]; -static long master_key_version; - -/* - * gets replacement - */ -static char * s_gets(char * str, int len) -{ - int i; - char *s; - - if((s = fgets(str, len, stdin)) == NULL) - return(s); - if(str[i = (strlen(str)-1)] == '\n') - str[i] = '\0'; - return(s); -} - -int -main(argc, argv) - int argc; - char *argv[]; - -{ - /* Local Declarations */ - - long n; - - prog[sizeof prog - 1] = '\0'; /* make sure terminated */ - strncpy(prog, argv[0], sizeof prog - 1); /* salt away invoking - * program */ - - /* Assume a long is four bytes */ - if (sizeof(long) != 4) { - fprintf(stdout, "%s: size of long is %d.\n", prog, sizeof(long)); - exit(-1); - } - /* Assume <=32 signals */ - if (NSIG > 32) { - fprintf(stderr, "%s: more than 32 signals defined.\n", prog); - exit(-1); - } - while (--argc > 0 && (*++argv)[0] == '-') - for (i = 1; argv[0][i] != '\0'; i++) { - switch (argv[0][i]) { - - /* debug flag */ - case 'd': - debug = 1; - continue; - - /* debug flag */ - case 'l': - kerb_debug |= 1; - continue; - - case 'n': /* read MKEYFILE for master key */ - nflag = 1; - continue; - - default: - fprintf(stderr, "%s: illegal flag \"%c\"\n", - progname, argv[0][i]); - Usage(); /* Give message and die */ - } - }; - - fprintf(stdout, "Opening database...\n"); - fflush(stdout); - kerb_init(); - if (argc > 0) { - if (kerb_db_set_name(*argv) != 0) { - fprintf(stderr, "Could not open altername database name\n"); - exit(1); - } - } - -#ifdef notdef - no_core_dumps(); /* diddle signals to avoid core dumps! */ - - /* ignore whatever is reasonable */ - signal(SIGHUP, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGTSTP, SIG_IGN); - -#endif - - if (kdb_get_master_key ((nflag == 0), - master_key, master_key_schedule) != 0) { - fprintf (stdout, "Couldn't read master key.\n"); - fflush (stdout); - exit (-1); - } - - if ((master_key_version = kdb_verify_master_key(master_key, - master_key_schedule, - stdout)) < 0) - exit (-1); - - des_init_random_number_generator(master_key); - - /* lookup the default values */ - n = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, - &default_princ, 1, &more); - if (n != 1) { - fprintf(stderr, - "%s: Kerberos error on default value lookup, %ld found.\n", - progname, n); - exit(-1); - } - fprintf(stdout, "Previous or default values are in [brackets] ,\n"); - fprintf(stdout, "enter return to leave the same, or new value.\n"); - - while (change_principal()) { - } - - cleanup(); - return(0); /* make -Wall shut up - MRVM */ -} - -int -change_principal() -{ - static char temp[255]; - int creating = 0; - int editpw = 0; - int changed = 0; - long temp_long; - int n; - struct tm *tp, edate, *localtime(); - long maketime(); - - fprintf(stdout, "\nPrincipal name: "); - fflush(stdout); - if (!s_gets(input_name, ANAME_SZ-1) || *input_name == '\0') - return 0; - fprintf(stdout, "Instance: "); - fflush(stdout); - /* instance can be null */ - s_gets(input_instance, INST_SZ-1); - j = kerb_get_principal(input_name, input_instance, principal_data, - MAX_PRINCIPAL, &more); - if (!j) { - fprintf(stdout, "\n\07\07, Create [y] ? "); - s_gets(temp, sizeof(temp)-1); /* Default case should work, it didn't */ - if (temp[0] != 'y' && temp[0] != 'Y' && temp[0] != '\0') - return -1; - /* make a new principal, fill in defaults */ - j = 1; - creating = 1; - strcpy(principal_data[0].name, input_name); - strcpy(principal_data[0].instance, input_instance); - principal_data[0].old = NULL; - principal_data[0].exp_date = default_princ.exp_date; - principal_data[0].max_life = default_princ.max_life; - principal_data[0].attributes = default_princ.attributes; - principal_data[0].kdc_key_ver = (unsigned char) master_key_version; - principal_data[0].key_version = 0; /* bumped up later */ - } - tp = localtime(&principal_data[0].exp_date); - (void) sprintf(principal_data[0].exp_date_txt, "%4d-%02d-%02d", - tp->tm_year > 1900 ? tp->tm_year : tp->tm_year + 1900, - tp->tm_mon + 1, tp->tm_mday); /* January is 0, not 1 */ - for (i = 0; i < j; i++) { - for (;;) { - fprintf(stdout, - "\nPrincipal: %s, Instance: %s, kdc_key_ver: %d", - principal_data[i].name, principal_data[i].instance, - principal_data[i].kdc_key_ver); - editpw = 1; - changed = 0; - if (!creating) { - /* - * copy the existing data so we can use the old values - * for the qualifier clause of the replace - */ - principal_data[i].old = (char *) &old_principal; - bcopy(&principal_data[i], &old_principal, - sizeof(old_principal)); - printf("\nChange password [n] ? "); - s_gets(temp, sizeof(temp)-1); - if (strcmp("y", temp) && strcmp("Y", temp)) - editpw = 0; - } - /* password */ - if (editpw) { -#ifdef NOENCRYPTION - placebo_read_pw_string(pw_str, sizeof pw_str, - "\nNew Password: ", TRUE); -#else - des_read_pw_string(pw_str, sizeof pw_str, - "\nNew Password: ", TRUE); -#endif - if (pw_str[0] == '\0' || !strcmp(pw_str, "RANDOM")) { - printf("\nRandom password [y] ? "); - s_gets(temp, sizeof(temp)-1); - if (!strcmp("n", temp) || !strcmp("N", temp)) { - /* no, use literal */ -#ifdef NOENCRYPTION - bzero(new_key, sizeof(C_Block)); - new_key[0] = 127; -#else - string_to_key(pw_str, &new_key); -#endif - bzero(pw_str, sizeof pw_str); /* "RANDOM" */ - } else { -#ifdef NOENCRYPTION - bzero(new_key, sizeof(C_Block)); - new_key[0] = 127; -#else - des_new_random_key(new_key); /* yes, random */ -#endif - bzero(pw_str, sizeof pw_str); - } - } else if (!strcmp(pw_str, "NULL")) { - printf("\nNull Key [y] ? "); - s_gets(temp, sizeof(temp)-1); - if (!strcmp("n", temp) || !strcmp("N", temp)) { - /* no, use literal */ -#ifdef NOENCRYPTION - bzero(new_key, sizeof(C_Block)); - new_key[0] = 127; -#else - string_to_key(pw_str, &new_key); -#endif - bzero(pw_str, sizeof pw_str); /* "NULL" */ - } else { - - principal_data[i].key_low = 0; - principal_data[i].key_high = 0; - goto null_key; - } - } else { -#ifdef NOENCRYPTION - bzero(new_key, sizeof(C_Block)); - new_key[0] = 127; -#else - string_to_key(pw_str, &new_key); -#endif - bzero(pw_str, sizeof pw_str); - } - - /* seal it under the kerberos master key */ - kdb_encrypt_key (new_key, new_key, - master_key, master_key_schedule, - ENCRYPT); - bcopy(new_key, &principal_data[i].key_low, 4); - bcopy(((long *) new_key) + 1, - &principal_data[i].key_high, 4); - bzero(new_key, sizeof(new_key)); - null_key: - /* set master key version */ - principal_data[i].kdc_key_ver = - (unsigned char) master_key_version; - /* bump key version # */ - principal_data[i].key_version++; - fprintf(stdout, - "\nPrincipal's new key version = %d\n", - principal_data[i].key_version); - fflush(stdout); - changed = 1; - } - /* expiration date */ - fprintf(stdout, "Expiration date (enter yyyy-mm-dd) [ %s ] ? ", - principal_data[i].exp_date_txt); - zaptime(&edate); - while (s_gets(temp, sizeof(temp)-1) && ((n = strlen(temp)) > - sizeof(principal_data[0].exp_date_txt))) { - bad_date: - fprintf(stdout, "\07\07Date Invalid\n"); - fprintf(stdout, - "Expiration date (enter yyyy-mm-dd) [ %s ] ? ", - principal_data[i].exp_date_txt); - zaptime(&edate); - } - - if (*temp) { - if (sscanf(temp, "%d-%d-%d", &edate.tm_year, - &edate.tm_mon, &edate.tm_mday) != 3) - goto bad_date; - (void) strcpy(principal_data[i].exp_date_txt, temp); - edate.tm_mon--; /* January is 0, not 1 */ - edate.tm_hour = 23; /* nearly midnight at the end of the */ - edate.tm_min = 59; /* specified day */ - if (!(principal_data[i].exp_date = maketime(&edate, 1))) - goto bad_date; - changed = 1; - } - - /* maximum lifetime */ - fprintf(stdout, "Max ticket lifetime (*5 minutes) [ %d ] ? ", - principal_data[i].max_life); - while (s_gets(temp, sizeof(temp)-1) && *temp) { - if (sscanf(temp, "%ld", &temp_long) != 1) - goto bad_life; - if (temp_long > 255 || (temp_long < 0)) { - bad_life: - fprintf(stdout, "\07\07Invalid, choose 0-255\n"); - fprintf(stdout, - "Max ticket lifetime (*5 minutes) [ %d ] ? ", - principal_data[i].max_life); - continue; - } - changed = 1; - /* dont clobber */ - principal_data[i].max_life = (unsigned short) temp_long; - break; - } - - /* attributes */ - fprintf(stdout, "Attributes [ %d ] ? ", - principal_data[i].attributes); - while (s_gets(temp, sizeof(temp)-1) && *temp) { - if (sscanf(temp, "%ld", &temp_long) != 1) - goto bad_att; - if (temp_long > 65535 || (temp_long < 0)) { - bad_att: - fprintf(stdout, "\07\07Invalid, choose 0-65535\n"); - fprintf(stdout, "Attributes [ %d ] ? ", - principal_data[i].attributes); - continue; - } - changed = 1; - /* dont clobber */ - principal_data[i].attributes = - (unsigned short) temp_long; - break; - } - - /* - * remaining fields -- key versions and mod info, should - * not be directly manipulated - */ - if (changed) { - if (kerb_put_principal(&principal_data[i], 1)) { - fprintf(stdout, - "\nError updating Kerberos database"); - } else { - fprintf(stdout, "Edit O.K."); - } - } else { - fprintf(stdout, "Unchanged"); - } - - - bzero(&principal_data[i].key_low, 4); - bzero(&principal_data[i].key_high, 4); - fflush(stdout); - break; - } - } - if (more) { - fprintf(stdout, "\nThere were more tuples found "); - fprintf(stdout, "than there were space for"); - } - return 1; -} - -void -no_core_dumps() -{ - - signal(SIGQUIT, (sig_t)sig_exit); - signal(SIGILL, (sig_t)sig_exit); - signal(SIGTRAP, (sig_t)sig_exit); - signal(SIGIOT, (sig_t)sig_exit); - signal(SIGEMT, (sig_t)sig_exit); - signal(SIGFPE, (sig_t)sig_exit); - signal(SIGBUS, (sig_t)sig_exit); - signal(SIGSEGV, (sig_t)sig_exit); - signal(SIGSYS, (sig_t)sig_exit); -} - -void -sig_exit(sig, code, scp) - int sig, code; - struct sigcontext *scp; -{ - cleanup(); - fprintf(stderr, - "\nSignal caught, sig = %d code = %d old pc = 0x%X \nexiting", - sig, code, scp->sc_pc); - exit(-1); -} - -void -cleanup() -{ - - bzero(master_key, sizeof(master_key)); - bzero(session_key, sizeof(session_key)); - bzero(master_key_schedule, sizeof(master_key_schedule)); - bzero(principal_data, sizeof(principal_data)); - bzero(new_key, sizeof(new_key)); - bzero(pw_str, sizeof(pw_str)); -} - -void -Usage() -{ - fprintf(stderr, "Usage: %s [-n]\n", progname); - exit(1); -} diff --git a/eBones/usr.sbin/kdb_edit/maketime.c b/eBones/usr.sbin/kdb_edit/maketime.c deleted file mode 100644 index 5e0ee00ee0e4a..0000000000000 --- a/eBones/usr.sbin/kdb_edit/maketime.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 1990 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Convert a struct tm * to a UNIX time. - * - * from: maketime.c,v 4.2 90/01/09 15:54:51 raeburn Exp $ - * $Id: maketime.c,v 1.3 1995/07/18 16:37:29 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: maketime.c,v 1.1 1994/03/21 16:23:54 piero Exp "; -#endif lint -#endif - -#include - -#define daysinyear(y) (((y) % 4) ? 365 : (((y) % 100) ? 366 : (((y) % 400) ? 365 : 366))) - -#define SECSPERDAY 24*60*60 -#define SECSPERHOUR 60*60 -#define SECSPERMIN 60 - -static int cumdays[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, - 365}; - -static int leapyear[] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -static int nonleapyear[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - -long -maketime(tp, local) -register struct tm *tp; -int local; -{ - register long retval; - int foo; - int *marray; - - if (tp->tm_mon < 0 || tp->tm_mon > 11 || - tp->tm_hour < 0 || tp->tm_hour > 23 || - tp->tm_min < 0 || tp->tm_min > 59 || - tp->tm_sec < 0 || tp->tm_sec > 59) /* out of range */ - return 0; - - retval = 0; - if (tp->tm_year < 1900) - foo = tp->tm_year + 1900; - else - foo = tp->tm_year; - - if (foo < 1901 || foo > 2038) /* year is too small/large */ - return 0; - - if (daysinyear(foo) == 366) { - if (tp->tm_mon > 1) - retval+= SECSPERDAY; /* add leap day */ - marray = leapyear; - } else - marray = nonleapyear; - - if (tp->tm_mday < 0 || tp->tm_mday > marray[tp->tm_mon]) - return 0; /* out of range */ - - while (--foo >= 1970) - retval += daysinyear(foo) * SECSPERDAY; - - retval += cumdays[tp->tm_mon] * SECSPERDAY; - retval += (tp->tm_mday-1) * SECSPERDAY; - retval += tp->tm_hour * SECSPERHOUR + tp->tm_min * SECSPERMIN + tp->tm_sec; - - if (local) { - /* need to use local time, so we retrieve timezone info */ - struct timezone tz; - struct timeval tv; - if (gettimeofday(&tv, &tz) < 0) { - /* some error--give up? */ - return(retval); - } - retval += tz.tz_minuteswest * SECSPERMIN; - } - return(retval); -} diff --git a/eBones/usr.sbin/kdb_edit/time.h b/eBones/usr.sbin/kdb_edit/time.h deleted file mode 100644 index ae84e2e24585e..0000000000000 --- a/eBones/usr.sbin/kdb_edit/time.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Structure for use by time manipulating subroutines. - * The following library routines use it: - * libc: ctime, localtime, gmtime, asctime - * libcx: partime, maketime (may not be installed yet) - */ - -/* - * from: time.h,v 1.1 82/05/06 11:34:29 wft Exp $ - * $Id: time.h,v 1.3 1995/07/18 16:37:31 mark Exp $ - */ - -struct tm { /* See defines below for allowable ranges */ - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; - int tm_zon; /* NEW: mins westward of Greenwich */ - int tm_ampm; /* NEW: 1 if AM, 2 if PM */ -}; - -#define LCLZONE (5*60) /* Until V7 ftime(2) works, this defines local zone*/ -#define TMNULL (-1) /* Items not specified are given this value - * in order to distinguish null specs from zero - * specs. This is only used by partime and - * maketime. */ - - /* Indices into TM structure */ -#define TM_SEC 0 /* 0-59 */ -#define TM_MIN 1 /* 0-59 */ -#define TM_HOUR 2 /* 0-23 */ -#define TM_MDAY 3 /* 1-31 day of month */ -#define TM_DAY TM_MDAY /* " synonym */ -#define TM_MON 4 /* 0-11 */ -#define TM_YEAR 5 /* (year-1900) (year) */ -#define TM_WDAY 6 /* 0-6 day of week (0 = Sunday) */ -#define TM_YDAY 7 /* 0-365 day of year */ -#define TM_ISDST 8 /* 0 Std, 1 DST */ - /* New stuff */ -#define TM_ZON 9 /* 0-(24*60) minutes west of Greenwich */ -#define TM_AMPM 10 /* 1 AM, 2 PM */ diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile deleted file mode 100644 index 71447cae208bd..0000000000000 --- a/eBones/usr.sbin/kdb_init/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:09:52 gibbs Exp $ - -PROG= kdb_init -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= kdb_init.8 - -.include diff --git a/eBones/usr.sbin/kdb_init/kdb_init.8 b/eBones/usr.sbin/kdb_init/kdb_init.8 deleted file mode 100644 index d884d00b8b282..0000000000000 --- a/eBones/usr.sbin/kdb_init/kdb_init.8 +++ /dev/null @@ -1,45 +0,0 @@ -.\" from: kdb_init.8,v 4.1 89/01/23 11:09:02 jtkohl Exp $ -.\" $Id: kdb_init.8,v 1.1.1.1 1994/09/30 14:50:06 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KDB_INIT 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kdb_init \- Initialize Kerberos key distribution center database -.SH SYNOPSIS -kdb_init [ -.B realm -] -.SH DESCRIPTION -.I kdb_init -initializes a Kerberos key distribution center database, creating the -necessary principals. -.PP -If the optional -.I realm -argument is not present, -.I kdb_init -prompts for a realm name (defaulting to the definition in -/usr/include/kerberosIV/krb.h). -After determining the realm to be created, it prompts for -a master key password. The master key password is used to encrypt -every encryption key stored in the database. -.SH DIAGNOSTICS -.TP 20n -"/etc/kerberosIV/principal: File exists" -An attempt was made to create a database on a machine which already had -an existing database. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.TP -/usr/include/kerberosIV/krb.h -Include file defining default realm -.SH SEE ALSO -kdb_destroy(8) diff --git a/eBones/usr.sbin/kdb_init/kdb_init.c b/eBones/usr.sbin/kdb_init/kdb_init.c deleted file mode 100644 index 7f9190a51889d..0000000000000 --- a/eBones/usr.sbin/kdb_init/kdb_init.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * program to initialize the database, reports error if database file - * already exists. - * - * from: kdb_init.c,v 4.0 89/01/24 21:50:45 jtkohl Exp $ - * $Id$ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id$"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#define TRUE 1 - -enum ap_op { - NULL_KEY, /* setup null keys */ - MASTER_KEY, /* use master key as new key */ - RANDOM_KEY, /* choose a random key */ -}; - -int add_principal(char *name, char *instance, enum ap_op aap_op); - -int debug = 0; -char *progname; -C_Block master_key; -Key_schedule master_key_schedule; - -int -main(argc, argv) - int argc; - char *argv[]; -{ - char realm[REALM_SZ]; - char *cp; - int code; - char *database; - - progname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv; - - if (argc > 3) { - fprintf(stderr, "Usage: %s [realm-name] [database-name]\n", argv[0]); - exit(1); - } - if (argc == 3) { - database = argv[2]; - --argc; - } else - database = DBM_FILE; - - /* Do this first, it'll fail if the database exists */ - if ((code = kerb_db_create(database)) != 0) { - fprintf(stderr, "Couldn't create database: %s\n", - sys_errlist[code]); - exit(1); - } - kerb_db_set_name(database); - - if (argc == 2) - strncpy(realm, argv[1], REALM_SZ); - else { - fprintf(stderr, "Realm name [default %s ]: ", KRB_REALM); - if (fgets(realm, sizeof(realm), stdin) == NULL) { - fprintf(stderr, "\nEOF reading realm\n"); - exit(1); - } - if ((cp = index(realm, '\n'))) - *cp = '\0'; - if (!*realm) /* no realm given */ - strcpy(realm, KRB_REALM); - } - if (!k_isrealm(realm)) { - fprintf(stderr, "%s: Bad kerberos realm name \"%s\"\n", - progname, realm); - exit(1); - } - printf("You will be prompted for the database Master Password.\n"); - printf("It is important that you NOT FORGET this password.\n"); - fflush(stdout); - - if (kdb_get_master_key (TRUE, master_key, master_key_schedule) != 0) { - fprintf (stderr, "Couldn't read master key.\n"); - exit (-1); - } - des_init_random_number_generator(master_key); - - if ( - add_principal(KERB_M_NAME, KERB_M_INST, MASTER_KEY) || - add_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, NULL_KEY) || - add_principal("krbtgt", realm, RANDOM_KEY) || - add_principal("changepw", KRB_MASTER, RANDOM_KEY) - ) { - fprintf(stderr, "\n%s: couldn't initialize database.\n", - progname); - exit(1); - } - - /* play it safe */ - bzero (master_key, sizeof (C_Block)); - bzero (master_key_schedule, sizeof (Key_schedule)); - exit(0); -} - -/* use a return code to indicate success or failure. check the return */ -/* values of the routines called by this routine. */ - -int -add_principal(name, instance, aap_op) - char *name, *instance; - enum ap_op aap_op; -{ - Principal principal; - struct tm *tm; - C_Block new_key; - - bzero(&principal, sizeof(principal)); - strncpy(principal.name, name, ANAME_SZ); - strncpy(principal.instance, instance, INST_SZ); - switch (aap_op) { - case NULL_KEY: - principal.key_low = 0; - principal.key_high = 0; - break; - case RANDOM_KEY: -#ifdef NOENCRYPTION - bzero(new_key, sizeof(C_Block)); - new_key[0] = 127; -#else - des_new_random_key(new_key); -#endif - kdb_encrypt_key (new_key, new_key, master_key, master_key_schedule, - ENCRYPT); - bcopy(new_key, &principal.key_low, 4); - bcopy(((long *) new_key) + 1, &principal.key_high, 4); - break; - case MASTER_KEY: - bcopy (master_key, new_key, sizeof (C_Block)); - kdb_encrypt_key (new_key, new_key, master_key, master_key_schedule, - ENCRYPT); - bcopy(new_key, &principal.key_low, 4); - bcopy(((long *) new_key) + 1, &principal.key_high, 4); - break; - } - principal.exp_date = 946702799; /* Happy new century */ - strncpy(principal.exp_date_txt, "12/31/99", DATE_SZ); - principal.mod_date = time(0); - - tm = localtime(&principal.mod_date); - principal.attributes = 0; - principal.max_life = 255; - - principal.kdc_key_ver = 1; - principal.key_version = 1; - - strncpy(principal.mod_name, "db_creation", ANAME_SZ); - strncpy(principal.mod_instance, "", INST_SZ); - principal.old = 0; - - kerb_db_put_principal(&principal, 1); - - /* let's play it safe */ - bzero (new_key, sizeof (C_Block)); - bzero (&principal.key_low, 4); - bzero (&principal.key_high, 4); - return 0; -} diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile deleted file mode 100644 index 88368dfd33843..0000000000000 --- a/eBones/usr.sbin/kdb_util/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# From: @(#)Makefile 5.2 (Berkeley) 2/14/91 -# $Id: Makefile,v 1.5 1995/09/14 04:09:56 gibbs Exp $ - -PROG= kdb_util -CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit -SRCS= kdb_util.c maketime.c -.PATH: ${.CURDIR}/../kdb_edit -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= kdb_util.8 - -.include diff --git a/eBones/usr.sbin/kdb_util/kdb_util.8 b/eBones/usr.sbin/kdb_util/kdb_util.8 deleted file mode 100644 index 4183ef363b977..0000000000000 --- a/eBones/usr.sbin/kdb_util/kdb_util.8 +++ /dev/null @@ -1,64 +0,0 @@ -.\" from: kdb_util.8,v 4.1 89/01/23 11:09:11 jtkohl Exp $ -.\" $Id: kdb_util.8,v 1.1.1.1 1994/09/30 14:50:06 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KDB_UTIL 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kdb_util \- Kerberos key distribution center database utility -.SH SYNOPSIS -kdb_util -.B operation filename -.SH DESCRIPTION -.I kdb_util -allows the Kerberos key distribution center (KDC) database administrator to -perform utility functions on the database. -.PP -.I Operation -must be one of the following: -.TP 10n -.I load -initializes the KDC database with the records described by the -text contained in the file -.IR filename . -Any existing database is overwritten. -.TP -.I dump -dumps the KDC database into a text representation in the file -.IR filename . -.TP -.I slave_dump -performs a database dump like the -.I dump -operation, and additionally creates a semaphore file signalling the -propagation software that an update is available for distribution to -slave KDC databases. -.TP -.I new_master_key -prompts for the old and new master key strings, and then dumps the KDC -database into a text representation in the file -.IR filename . -The keys in the text representation are encrypted in the new master key. -.TP -.I convert_old_db -prompts for the master key string, and then dumps the KDC database into -a text representation in the file -.IR filename . -The existing database is assumed to be encrypted using the old format -(encrypted by the key schedule of the master key); the dumped database -is encrypted using the new format (encrypted directly with master key). -.PP -.SH DIAGNOSTICS -.TP 20n -"verify_master_key: Invalid master key, does not match database." -The master key string entered was incorrect. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -.IR filename .dump_ok -semaphore file created by -.IR slave_dump. diff --git a/eBones/usr.sbin/kdb_util/kdb_util.c b/eBones/usr.sbin/kdb_util/kdb_util.c deleted file mode 100644 index 5dbe509e1afe2..0000000000000 --- a/eBones/usr.sbin/kdb_util/kdb_util.c +++ /dev/null @@ -1,523 +0,0 @@ -/* - * Copyright 1987, 1988 by the Massachusetts Institute of Technology. - * For copying and distribution information, please see the file - * . - * - * Kerberos database manipulation utility. This program allows you to - * dump a kerberos database to an ascii readable file and load this - * file into the database. Read locking of the database is done during a - * dump operation. NO LOCKING is done during a load operation. Loads - * should happen with other processes shutdown. - * - * Written July 9, 1987 by Jeffrey I. Schiller - * - * from: kdb_util.c,v 4.4 90/01/09 15:57:20 raeburn Exp $ - * $Id: kdb_util.c,v 1.5 1995/08/03 17:15:57 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kdb_util.c,v 1.5 1995/08/03 17:15:57 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define TRUE 1 - -Principal aprinc; - -static des_cblock master_key, new_master_key; -static des_key_schedule master_key_schedule, new_master_key_schedule; - -#define zaptime(foo) bzero((char *)(foo), sizeof(*(foo))) - -char * progname; - -void convert_old_format_db (char *db_file, FILE *out); -void convert_new_master_key (char *db_file, FILE *out); -void update_ok_file (char *file_name); -void print_time(FILE *file, unsigned long timeval); -void load_db (char *db_file, FILE *input_file); -int dump_db (char *db_file, FILE *output_file, void (*cv_key)()); - -int -main(argc, argv) - int argc; - char **argv; -{ - FILE *file; - enum { - OP_LOAD, - OP_DUMP, - OP_SLAVE_DUMP, - OP_NEW_MASTER, - OP_CONVERT_OLD_DB, - } op; - char *file_name; - char *prog = argv[0]; - char *db_name; - - progname = prog; - - if (argc != 3 && argc != 4) { - fprintf(stderr, "Usage: %s operation file-name [database name].\n", - argv[0]); - exit(1); - } - if (argc == 3) - db_name = DBM_FILE; - else - db_name = argv[3]; - - if (kerb_db_set_name (db_name) != 0) { - perror("Can't open database"); - exit(1); - } - - if (!strcmp(argv[1], "load")) - op = OP_LOAD; - else if (!strcmp(argv[1], "dump")) - op = OP_DUMP; - else if (!strcmp(argv[1], "slave_dump")) - op = OP_SLAVE_DUMP; - else if (!strcmp(argv[1], "new_master_key")) - op = OP_NEW_MASTER; - else if (!strcmp(argv[1], "convert_old_db")) - op = OP_CONVERT_OLD_DB; - else { - fprintf(stderr, - "%s: %s is an invalid operation.\n", prog, argv[1]); - fprintf(stderr, - "%s: Valid operations are \"dump\", \"slave_dump\",", argv[0]); - fprintf(stderr, - "\"load\", \"new_master_key\", and \"convert_old_db\".\n"); - exit(1); - } - - file_name = argv[2]; - file = fopen(file_name, op == OP_LOAD ? "r" : "w"); - if (file == NULL) { - fprintf(stderr, "%s: Unable to open %s\n", prog, argv[2]); - (void) fflush(stderr); - perror("open"); - exit(1); - } - - switch (op) { - case OP_DUMP: - if ((dump_db (db_name, file, (void (*)()) 0) == EOF) || - (fclose(file) == EOF)) { - fprintf(stderr, "error on file %s:", file_name); - perror(""); - exit(1); - } - break; - case OP_SLAVE_DUMP: - if ((dump_db (db_name, file, (void (*)()) 0) == EOF) || - (fclose(file) == EOF)) { - fprintf(stderr, "error on file %s:", file_name); - perror(""); - exit(1); - } - update_ok_file (file_name); - break; - case OP_LOAD: - load_db (db_name, file); - break; - case OP_NEW_MASTER: - convert_new_master_key (db_name, file); - printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name); - break; - case OP_CONVERT_OLD_DB: - convert_old_format_db (db_name, file); - printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name); - break; - } - exit(0); - } - -void -clear_secrets () -{ - bzero((char *)master_key, sizeof (des_cblock)); - bzero((char *)master_key_schedule, sizeof (Key_schedule)); - bzero((char *)new_master_key, sizeof (des_cblock)); - bzero((char *)new_master_key_schedule, sizeof (Key_schedule)); -} - -/* cv_key is a procedure which takes a principle and changes its key, - either for a new method of encrypting the keys, or a new master key. - if cv_key is null no transformation of key is done (other than net byte - order). */ - -struct callback_args { - void (*cv_key)(); - FILE *output_file; -}; - -static int dump_db_1(arg, principal) - char *arg; - Principal *principal; -{ /* replace null strings with "*" */ - struct callback_args *a = (struct callback_args *)arg; - - if (principal->instance[0] == '\0') { - principal->instance[0] = '*'; - principal->instance[1] = '\0'; - } - if (principal->mod_name[0] == '\0') { - principal->mod_name[0] = '*'; - principal->mod_name[1] = '\0'; - } - if (principal->mod_instance[0] == '\0') { - principal->mod_instance[0] = '*'; - principal->mod_instance[1] = '\0'; - } - if (a->cv_key != NULL) { - (*a->cv_key) (principal); - } - fprintf(a->output_file, "%s %s %d %d %d %d %lx %lx", - principal->name, - principal->instance, - principal->max_life, - principal->kdc_key_ver, - principal->key_version, - principal->attributes, - htonl (principal->key_low), - htonl (principal->key_high)); - print_time(a->output_file, principal->exp_date); - print_time(a->output_file, principal->mod_date); - fprintf(a->output_file, " %s %s\n", - principal->mod_name, - principal->mod_instance); - return 0; -} - -int -dump_db (db_file, output_file, cv_key) - char *db_file; - FILE *output_file; - void (*cv_key)(); -{ - struct callback_args a; - - a.cv_key = cv_key; - a.output_file = output_file; - - kerb_db_iterate (dump_db_1, (char *)&a); - return fflush(output_file); -} - -void -load_db (db_file, input_file) - char *db_file; - FILE *input_file; -{ - char exp_date_str[50]; - char mod_date_str[50]; - int temp1, temp2, temp3; - long time_explode(); - int code; - char *temp_db_file; - temp1 = strlen(db_file)+2; - temp_db_file = malloc (temp1); - strcpy(temp_db_file, db_file); - strcat(temp_db_file, "~"); - - /* Create the database */ - if ((code = kerb_db_create(temp_db_file)) != 0) { - fprintf(stderr, "Couldn't create temp database %s: %s\n", - temp_db_file, sys_errlist[code]); - exit(1); - } - kerb_db_set_name(temp_db_file); - for (;;) { /* explicit break on eof from fscanf */ - bzero((char *)&aprinc, sizeof(aprinc)); - if (fscanf(input_file, - "%s %s %d %d %d %hd %lx %lx %s %s %s %s\n", - aprinc.name, - aprinc.instance, - &temp1, - &temp2, - &temp3, - &aprinc.attributes, - &aprinc.key_low, - &aprinc.key_high, - exp_date_str, - mod_date_str, - aprinc.mod_name, - aprinc.mod_instance) == EOF) - break; - aprinc.key_low = ntohl (aprinc.key_low); - aprinc.key_high = ntohl (aprinc.key_high); - aprinc.max_life = (unsigned char) temp1; - aprinc.kdc_key_ver = (unsigned char) temp2; - aprinc.key_version = (unsigned char) temp3; - aprinc.exp_date = time_explode(exp_date_str); - aprinc.mod_date = time_explode(mod_date_str); - if (aprinc.instance[0] == '*') - aprinc.instance[0] = '\0'; - if (aprinc.mod_name[0] == '*') - aprinc.mod_name[0] = '\0'; - if (aprinc.mod_instance[0] == '*') - aprinc.mod_instance[0] = '\0'; - if (kerb_db_put_principal(&aprinc, 1) != 1) { - fprintf(stderr, "Couldn't store %s.%s: %s; load aborted\n", - aprinc.name, aprinc.instance, - sys_errlist[errno]); - exit(1); - }; - } - if ((code = kerb_db_rename(temp_db_file, db_file)) != 0) - perror("database rename failed"); - (void) fclose(input_file); - free(temp_db_file); -} - -void -print_time(file, timeval) - FILE *file; - unsigned long timeval; -{ - struct tm *tm; - struct tm *gmtime(); - tm = gmtime((long *)&timeval); - fprintf(file, " %04d%02d%02d%02d%02d", - tm->tm_year < 1900 ? tm->tm_year + 1900: tm->tm_year, - tm->tm_mon + 1, - tm->tm_mday, - tm->tm_hour, - tm->tm_min); -} - -/*ARGSUSED*/ -void -update_ok_file (file_name) - char *file_name; -{ - /* handle slave locking/failure stuff */ - char *file_ok; - int fd; - static char ok[]=".dump_ok"; - - if ((file_ok = (char *)malloc(strlen(file_name) + strlen(ok) + 1)) - == NULL) { - fprintf(stderr, "kdb_util: out of memory.\n"); - (void) fflush (stderr); - perror ("malloc"); - exit (1); - } - strcpy(file_ok, file_name); - strcat(file_ok, ok); - if ((fd = open(file_ok, O_WRONLY|O_CREAT|O_TRUNC, 0400)) < 0) { - fprintf(stderr, "Error creating 'ok' file, '%s'", file_ok); - perror(""); - (void) fflush (stderr); - exit (1); - } - free(file_ok); - close(fd); -} - -void -convert_key_new_master (p) - Principal *p; -{ - des_cblock key; - - /* leave null keys alone */ - if ((p->key_low == 0) && (p->key_high == 0)) return; - - /* move current key to des_cblock for encryption, special case master key - since that's changing */ - if ((strncmp (p->name, KERB_M_NAME, ANAME_SZ) == 0) && - (strncmp (p->instance, KERB_M_INST, INST_SZ) == 0)) { - bcopy((char *)new_master_key, (char *) key, sizeof (des_cblock)); - (p->key_version)++; - } else { - bcopy((char *)&(p->key_low), (char *)key, 4); - bcopy((char *)&(p->key_high), (char *) (((long *) key) + 1), 4); - kdb_encrypt_key (key, key, master_key, master_key_schedule, DECRYPT); - } - - kdb_encrypt_key (key, key, new_master_key, new_master_key_schedule, ENCRYPT); - - bcopy((char *)key, (char *)&(p->key_low), 4); - bcopy((char *)(((long *) key) + 1), (char *)&(p->key_high), 4); - bzero((char *)key, sizeof (key)); /* a little paranoia ... */ - - (p->kdc_key_ver)++; -} - -void -convert_new_master_key (db_file, out) - char *db_file; - FILE *out; -{ - - printf ("\n\nEnter the CURRENT master key."); - if (kdb_get_master_key (TRUE, master_key, master_key_schedule) != 0) { - fprintf (stderr, "get_master_key: Couldn't get master key.\n"); - clear_secrets (); - exit (-1); - } - - if (kdb_verify_master_key (master_key, master_key_schedule, stderr) < 0) { - clear_secrets (); - exit (-1); - } - - printf ("\n\nNow enter the NEW master key. Do not forget it!!"); - if (kdb_get_master_key (TRUE, new_master_key, new_master_key_schedule) != 0) { - fprintf (stderr, "get_master_key: Couldn't get new master key.\n"); - clear_secrets (); - exit (-1); - } - - dump_db (db_file, out, convert_key_new_master); -} - -void -convert_key_old_db (p) - Principal *p; -{ - des_cblock key; - - /* leave null keys alone */ - if ((p->key_low == 0) && (p->key_high == 0)) return; - - bcopy((char *)&(p->key_low), (char *)key, 4); - bcopy((char *)&(p->key_high), (char *)(((long *) key) + 1), 4); - -#ifndef NOENCRYPTION - des_pcbc_encrypt((des_cblock *)key,(des_cblock *)key, - (long)sizeof(des_cblock),master_key_schedule, - (des_cblock *)master_key_schedule,DECRYPT); -#endif - - /* make new key, new style */ - kdb_encrypt_key (key, key, master_key, master_key_schedule, ENCRYPT); - - bcopy((char *)key, (char *)&(p->key_low), 4); - bcopy((char *)(((long *) key) + 1), (char *)&(p->key_high), 4); - bzero((char *)key, sizeof (key)); /* a little paranoia ... */ -} - -void -convert_old_format_db (db_file, out) - char *db_file; - FILE *out; -{ - des_cblock key_from_db; - Principal principal_data[1]; - int n, more; - - if (kdb_get_master_key (TRUE, master_key, master_key_schedule) != 0L) { - fprintf (stderr, "verify_master_key: Couldn't get master key.\n"); - clear_secrets(); - exit (-1); - } - - /* can't call kdb_verify_master_key because this is an old style db */ - /* lookup the master key version */ - n = kerb_get_principal(KERB_M_NAME, KERB_M_INST, principal_data, - 1 /* only one please */, &more); - if ((n != 1) || more) { - fprintf(stderr, "verify_master_key: " - "Kerberos error on master key lookup, %d found.\n", - n); - exit (-1); - } - - /* set up the master key */ - fprintf(stderr, "Current Kerberos master key version is %d.\n", - principal_data[0].kdc_key_ver); - - /* - * now use the master key to decrypt (old style) the key in the db, had better - * be the same! - */ - bcopy((char *)&principal_data[0].key_low, (char *)key_from_db, 4); - bcopy((char *)&principal_data[0].key_high, - (char *)(((long *) key_from_db) + 1), 4); -#ifndef NOENCRYPTION - des_pcbc_encrypt((des_cblock *)key_from_db,(des_cblock *)key_from_db, - (long)sizeof(key_from_db),master_key_schedule, - (des_cblock *)master_key_schedule,DECRYPT); -#endif - /* the decrypted database key had better equal the master key */ - n = bcmp((char *) master_key, (char *) key_from_db, - sizeof(master_key)); - bzero((char *)key_from_db, sizeof(key_from_db)); - - if (n) { - fprintf(stderr, "\n\07\07verify_master_key: Invalid master key, "); - fprintf(stderr, "does not match database.\n"); - exit (-1); - } - - fprintf(stderr, "Master key verified.\n"); - (void) fflush(stderr); - - dump_db (db_file, out, convert_key_old_db); -} - -long -time_explode(cp) -register char *cp; -{ - char wbuf[5]; - struct tm tp; - long maketime(); - int local; - - zaptime(&tp); /* clear out the struct */ - - if (strlen(cp) > 10) { /* new format */ - (void) strncpy(wbuf, cp, 4); - wbuf[4] = 0; - tp.tm_year = atoi(wbuf); - cp += 4; /* step over the year */ - local = 0; /* GMT */ - } else { /* old format: local time, - year is 2 digits, assuming 19xx */ - wbuf[0] = *cp++; - wbuf[1] = *cp++; - wbuf[2] = 0; - tp.tm_year = 1900 + atoi(wbuf); - local = 1; /* local */ - } - - wbuf[0] = *cp++; - wbuf[1] = *cp++; - wbuf[2] = 0; - tp.tm_mon = atoi(wbuf)-1; - - wbuf[0] = *cp++; - wbuf[1] = *cp++; - tp.tm_mday = atoi(wbuf); - - wbuf[0] = *cp++; - wbuf[1] = *cp++; - tp.tm_hour = atoi(wbuf); - - wbuf[0] = *cp++; - wbuf[1] = *cp++; - tp.tm_min = atoi(wbuf); - - - return(maketime(&tp, local)); -} diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile deleted file mode 100644 index 84a12fbd367e9..0000000000000 --- a/eBones/usr.sbin/kerberos/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.6 1995/09/14 04:10:15 gibbs Exp $ - -PROG= kerberos -SRCS= kerberos.c cr_err_reply.c -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -NOMAN= noman - -.include diff --git a/eBones/usr.sbin/kerberos/cr_err_reply.c b/eBones/usr.sbin/kerberos/cr_err_reply.c deleted file mode 100644 index 89ee5f6cbfdba..0000000000000 --- a/eBones/usr.sbin/kerberos/cr_err_reply.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: cr_err_reply.c,v 4.10 89/01/10 11:34:42 steiner Exp $ - * $Id: cr_err_reply.c,v 1.2 1995/07/18 16:37:49 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: cr_err_reply.c,v 1.2 1995/07/18 16:37:49 mark Exp $"; -#endif /* lint */ -#endif - -#include -#include -#include -#include - -extern int req_act_vno; /* this is defined in the kerberos - * server code */ - -/* - * This routine is used by the Kerberos authentication server to - * create an error reply packet to send back to its client. - * - * It takes a pointer to the packet to be built, the name, instance, - * and realm of the principal, the client's timestamp, an error code - * and an error string as arguments. Its return value is undefined. - * - * The packet is built in the following format: - * - * type variable data - * or constant - * ---- ----------- ---- - * - * unsigned char req_ack_vno protocol version number - * - * unsigned char AUTH_MSG_ERR_REPLY protocol message type - * - * [least significant HOST_BYTE_ORDER sender's (server's) byte - * bit of above field] order - * - * string pname principal's name - * - * string pinst principal's instance - * - * string prealm principal's realm - * - * unsigned long time_ws client's timestamp - * - * unsigned long e error code - * - * string e_string error text - */ - -void -cr_err_reply(pkt,pname,pinst,prealm,time_ws,e,e_string) - KTEXT pkt; - char *pname; /* Principal's name */ - char *pinst; /* Principal's instance */ - char *prealm; /* Principal's authentication domain */ - u_long time_ws; /* Workstation time */ - u_long e; /* Error code */ - char *e_string; /* Text of error */ -{ - u_char *v = (u_char *) pkt->dat; /* Prot vers number */ - u_char *t = (u_char *)(pkt->dat+1); /* Prot message type */ - - /* Create fixed part of packet */ - *v = (unsigned char) req_act_vno; /* KRB_PROT_VERSION; */ - *t = (unsigned char) AUTH_MSG_ERR_REPLY; - *t |= HOST_BYTE_ORDER; - - /* Add the basic info */ - (void) strcpy((char *) (pkt->dat+2),pname); - pkt->length = 3 + strlen(pname); - (void) strcpy((char *)(pkt->dat+pkt->length),pinst); - pkt->length += 1 + strlen(pinst); - (void) strcpy((char *)(pkt->dat+pkt->length),prealm); - pkt->length += 1 + strlen(prealm); - /* ws timestamp */ - bcopy((char *) &time_ws,(char *)(pkt->dat+pkt->length),4); - pkt->length += 4; - /* err code */ - bcopy((char *) &e,(char *)(pkt->dat+pkt->length),4); - pkt->length += 4; - /* err text */ - (void) strcpy((char *)(pkt->dat+pkt->length),e_string); - pkt->length += 1 + strlen(e_string); - - /* And return */ - return; -} diff --git a/eBones/usr.sbin/kerberos/kerberos.c b/eBones/usr.sbin/kerberos/kerberos.c deleted file mode 100644 index 185e79773b7a9..0000000000000 --- a/eBones/usr.sbin/kerberos/kerberos.c +++ /dev/null @@ -1,816 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * For copying and distribution information, please see the file - * . - * - * from: kerberos.c,v 4.19 89/11/01 17:18:07 qjb Exp $ - * $Id$ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id$"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -void cr_err_reply(KTEXT pkt, char *pname, char *pinst, char *prealm, - u_long time_ws, u_long e, char *e_string); -void kerb_err_reply(struct sockaddr_in *client, KTEXT pkt, long err, - char *string); -void setup_disc(void); -void kerberos(struct sockaddr_in *client, KTEXT pkt); -int check_princ(char *p_name, char *instance, unsigned lifetime, Principal *p); -int set_tgtkey(char *r); - -struct sockaddr_in s_in = {AF_INET}; -int f; - -/* XXX several files in libkdb know about this */ -char *progname; - -static Key_schedule master_key_schedule; -static C_Block master_key; - -static struct timeval kerb_time; -static Principal a_name_data; /* for requesting user */ -static Principal s_name_data; /* for services requested */ -static C_Block session_key; -static u_char master_key_version; -static char k_instance[INST_SZ]; -static char *lt; -static int more; - -static int mflag; /* Are we invoked manually? */ -static int lflag; /* Have we set an alterate log file? */ -static char *log_file; /* name of alt. log file */ -static int nflag; /* don't check max age */ -static int rflag; /* alternate realm specified */ - -/* fields within the received request packet */ -static u_char req_msg_type; -static u_char req_version; -static char *req_name_ptr; -static char *req_inst_ptr; -static char *req_realm_ptr; -static u_long req_time_ws; - -int req_act_vno = KRB_PROT_VERSION; /* Temporary for version skew */ - -static char local_realm[REALM_SZ]; - -/* statistics */ -static long q_bytes; /* current bytes remaining in queue */ -static long q_n; /* how many consecutive non-zero - * q_bytes */ -static long max_q_bytes; -static long max_q_n; -static long n_auth_req; -static long n_appl_req; -static long n_packets; - -static long max_age = -1; -static long pause_int = -1; - -static void check_db_age(); -static void hang(); - -/* - * Print usage message and exit. - */ -static void usage() -{ - fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]%s%s\n", progname, - " [-a max_age] [-l log_file] [-r realm]" - ," [database_pathname]" - ); - exit(1); -} - - -int -main(argc, argv) - int argc; - char **argv; -{ - struct sockaddr_in from; - register int n; - int on = 1; - int child; - struct servent *sp; - int fromlen; - static KTEXT_ST pkt_st; - KTEXT pkt = &pkt_st; - int kerror; - int c; - extern char *optarg; - extern int optind; - - progname = argv[0]; - - while ((c = getopt(argc, argv, "snmp:a:l:r:")) != EOF) { - switch(c) { - case 's': - /* - * Set parameters to slave server defaults. - */ - if (max_age == -1 && !nflag) - max_age = ONE_DAY; /* 24 hours */ - if (pause_int == -1) - pause_int = FIVE_MINUTES; /* 5 minutes */ - if (lflag == 0) { - log_file = KRBSLAVELOG; - lflag++; - } - break; - case 'n': - max_age = -1; /* don't check max age. */ - nflag++; - break; - case 'm': - mflag++; /* running manually; prompt for master key */ - break; - case 'p': - /* Set pause interval. */ - if (!isdigit(optarg[0])) - usage(); - pause_int = atoi(optarg); - if ((pause_int < 5) || (pause_int > ONE_HOUR)) { - fprintf(stderr, "pause_int must be between 5 and 3600 seconds.\n"); - usage(); - } - break; - case 'a': - /* Set max age. */ - if (!isdigit(optarg[0])) - usage(); - max_age = atoi(optarg); - if ((max_age < ONE_HOUR) || (max_age > THREE_DAYS)) { - fprintf(stderr, "max_age must be between one hour and three days, in seconds\n"); - usage(); - } - break; - case 'l': - /* Set alternate log file */ - lflag++; - log_file = optarg; - break; - case 'r': - /* Set realm name */ - rflag++; - strcpy(local_realm, optarg); - break; - default: - usage(); - break; - } - } - - if (optind == (argc-1)) { - if (kerb_db_set_name(argv[optind]) != 0) { - fprintf(stderr, "Could not set alternate database name\n"); - exit(1); - } - optind++; - } - - if (optind != argc) - usage(); - - printf("Kerberos server starting\n"); - - if ((!nflag) && (max_age != -1)) - printf("\tMaximum database age: %ld seconds\n", max_age); - if (pause_int != -1) - printf("\tSleep for %ld seconds on error\n", pause_int); - else - printf("\tSleep forever on error\n"); - if (mflag) - printf("\tMaster key will be entered manually\n"); - - printf("\tLog file is %s\n", lflag ? log_file : KRBLOG); - - if (lflag) - kset_logfile(log_file); - - /* find our hostname, and use it as the instance */ - if (gethostname(k_instance, INST_SZ)) { - fprintf(stderr, "%s: gethostname error\n", progname); - exit(1); - } - - if ((sp = getservbyname("kerberos", "udp")) == 0) { - fprintf(stderr, "%s: udp/kerberos unknown service\n", progname); - exit(1); - } - s_in.sin_port = sp->s_port; - - if ((f = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - fprintf(stderr, "%s: Can't open socket\n", progname); - exit(1); - } - if (setsockopt(f, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) - fprintf(stderr, "%s: setsockopt (SO_REUSEADDR)\n", progname); - - if (bind(f, (struct sockaddr *) &s_in, S_AD_SZ) < 0) { - fprintf(stderr, "%s: Can't bind socket\n", progname); - exit(1); - } - /* do all the database and cache inits */ - if ((n = kerb_init())) { - if (mflag) { - printf("Kerberos db and cache init "); - printf("failed = %d ...exiting\n", n); - exit(-1); - } else { - klog(L_KRB_PERR, - "Kerberos db and cache init failed = %d ...exiting", n); - hang(); - } - } - - /* Make sure database isn't stale */ - check_db_age(); - - /* setup master key */ - if (kdb_get_master_key (mflag, master_key, master_key_schedule) != 0) { - klog (L_KRB_PERR, "kerberos: couldn't get master key.\n"); - exit (-1); - } - kerror = kdb_verify_master_key (master_key, master_key_schedule, stdout); - if (kerror < 0) { - klog (L_KRB_PERR, "Can't verify master key."); - bzero (master_key, sizeof (master_key)); - bzero (master_key_schedule, sizeof (master_key_schedule)); - exit (-1); - } - des_init_random_number_generator(master_key); - - master_key_version = (u_char) kerror; - - fprintf(stdout, "\nCurrent Kerberos master key version is %d\n", - master_key_version); - - if (!rflag) { - /* Look up our local realm */ - krb_get_lrealm(local_realm, 1); - } - fprintf(stdout, "Local realm: %s\n", local_realm); - fflush(stdout); - - if (set_tgtkey(local_realm)) { - /* Ticket granting service unknown */ - klog(L_KRB_PERR, "Ticket granting ticket service unknown"); - fprintf(stderr, "Ticket granting ticket service unknown\n"); - exit(1); - } - if (mflag) { - if ((child = fork()) != 0) { - printf("Kerberos started, PID=%d\n", child); - exit(0); - } - setup_disc(); - } - /* receive loop */ - for (;;) { - fromlen = S_AD_SZ; - n = recvfrom(f, pkt->dat, MAX_PKT_LEN, 0, (struct sockaddr *) &from, - &fromlen); - if (n > 0) { - pkt->length = n; - pkt->mbz = 0; /* force zeros to catch runaway strings */ - /* see what is left in the input queue */ - ioctl(f, FIONREAD, &q_bytes); - gettimeofday(&kerb_time, NULL); - q_n++; - max_q_n = max(max_q_n, q_n); - n_packets++; - klog(L_NET_INFO, - "q_byt %d, q_n %d, rd_byt %d, mx_q_b %d, mx_q_n %d, n_pkt %d", - q_bytes, q_n, n, max_q_bytes, max_q_n, n_packets, 0); - max_q_bytes = max(max_q_bytes, q_bytes); - if (!q_bytes) - q_n = 0; /* reset consecutive packets */ - kerberos(&from, pkt); - } else - klog(L_NET_ERR, - "%s: bad recvfrom n = %d errno = %d", progname, n, errno, 0); - } -} - -void -kerberos(client, pkt) - struct sockaddr_in *client; - KTEXT pkt; -{ - static KTEXT_ST rpkt_st; - KTEXT rpkt = &rpkt_st; - static KTEXT_ST ciph_st; - KTEXT ciph = &ciph_st; - static KTEXT_ST tk_st; - KTEXT tk = &tk_st; - static KTEXT_ST auth_st; - KTEXT auth = &auth_st; - AUTH_DAT ad_st; - AUTH_DAT *ad = &ad_st; - - - static struct in_addr client_host; - static int msg_byte_order; - static u_char k_flags; - u_long lifetime; - int i; - C_Block key; - Key_schedule key_s; - char *ptr; - - - - lifetime = DEFAULT_TKT_LIFE; - - ciph->length = 0; - - client_host = client->sin_addr; - - /* eval macros and correct the byte order and alignment as needed */ - req_version = pkt_version(pkt); /* 1 byte, version */ - req_msg_type = pkt_msg_type(pkt); /* 1 byte, Kerberos msg type */ - - req_act_vno = req_version; - - /* check packet version */ - if (req_version != KRB_PROT_VERSION) { - lt = klog(L_KRB_PERR, - "KRB prot version mismatch: KRB =%d request = %d", - KRB_PROT_VERSION, req_version, 0); - /* send an error reply */ - kerb_err_reply(client, pkt, KERB_ERR_PKT_VER, lt); - return; - } - - /* set up and correct for byte order and alignment */ - req_name_ptr = (char *) pkt_a_name(pkt); - req_inst_ptr = (char *) pkt_a_inst(pkt); - req_realm_ptr = (char *) pkt_a_realm(pkt); - bcopy(pkt_time_ws(pkt), &req_time_ws, sizeof(req_time_ws)); - - msg_byte_order = req_msg_type & 1; - - if (msg_byte_order != HOST_BYTE_ORDER) { - swap_u_long(req_time_ws) - } - klog(L_KRB_PINFO, - "Prot version: %d, Byte order: %d, Message type: %d", - req_version, msg_byte_order, req_msg_type); - - switch (req_msg_type & ~1) { - - case AUTH_MSG_KDC_REQUEST: - { - u_long req_life; /* Requested liftime */ - char *service; /* Service name */ - char *instance; /* Service instance */ - n_auth_req++; - tk->length = 0; - k_flags = 0; /* various kerberos flags */ - - - ptr = (char *) pkt_time_ws(pkt) + 4; - - req_life = (u_long) (*ptr++); - - service = ptr; - instance = ptr + strlen(service) + 1; - - rpkt = &rpkt_st; - klog(L_INI_REQ, - "Initial ticket request Host: %s User: \"%s\" \"%s\"", - inet_ntoa(client_host), req_name_ptr, req_inst_ptr, 0); - - if ((i = check_princ(req_name_ptr, req_inst_ptr, 0, - &a_name_data))) { - kerb_err_reply(client, pkt, i, lt); - return; - } - tk->length = 0; /* init */ - if (strcmp(service, "krbtgt")) - klog(L_NTGT_INTK, - "INITIAL request from %s.%s for %s.%s", - req_name_ptr, req_inst_ptr, service, instance, 0); - /* this does all the checking */ - if ((i = check_princ(service, instance, lifetime, - &s_name_data))) { - kerb_err_reply(client, pkt, i, lt); - return; - } - /* Bound requested lifetime with service and user */ - lifetime = min(req_life, ((u_long) s_name_data.max_life)); - lifetime = min(lifetime, ((u_long) a_name_data.max_life)); - -#ifdef NOENCRYPTION - bzero(session_key, sizeof(C_Block)); -#else - des_new_random_key(session_key); -#endif - /* unseal server's key from master key */ - bcopy(&s_name_data.key_low, key, 4); - bcopy(&s_name_data.key_high, ((long *) key) + 1, 4); - kdb_encrypt_key(key, key, master_key, - master_key_schedule, DECRYPT); - /* construct and seal the ticket */ - krb_create_ticket(tk, k_flags, a_name_data.name, - a_name_data.instance, local_realm, - client_host.s_addr, session_key, lifetime, kerb_time.tv_sec, - s_name_data.name, s_name_data.instance, key); - bzero(key, sizeof(key)); - bzero(key_s, sizeof(key_s)); - - /* - * get the user's key, unseal it from the server's key, and - * use it to seal the cipher - */ - - /* a_name_data.key_low a_name_data.key_high */ - bcopy(&a_name_data.key_low, key, 4); - bcopy(&a_name_data.key_high, ((long *) key) + 1, 4); - - /* unseal the a_name key from the master key */ - kdb_encrypt_key(key, key, master_key, - master_key_schedule, DECRYPT); - - create_ciph(ciph, session_key, s_name_data.name, - s_name_data.instance, local_realm, lifetime, - s_name_data.key_version, tk, kerb_time.tv_sec, key); - - /* clear session key */ - bzero(session_key, sizeof(session_key)); - - bzero(key, sizeof(key)); - - - - /* always send a reply packet */ - rpkt = create_auth_reply(req_name_ptr, req_inst_ptr, - req_realm_ptr, req_time_ws, 0, a_name_data.exp_date, - a_name_data.key_version, ciph); - sendto(f, rpkt->dat, rpkt->length, 0, (struct sockaddr *) client, - S_AD_SZ); - bzero(&a_name_data, sizeof(a_name_data)); - bzero(&s_name_data, sizeof(s_name_data)); - break; - } - case AUTH_MSG_APPL_REQUEST: - { - u_long time_ws; /* Workstation time */ - u_long req_life; /* Requested liftime */ - char *service; /* Service name */ - char *instance; /* Service instance */ - int kerno; /* Kerberos error number */ - char tktrlm[REALM_SZ]; - - n_appl_req++; - tk->length = 0; - k_flags = 0; /* various kerberos flags */ - kerno = KSUCCESS; - - auth->length = 4 + strlen(pkt->dat + 3); - auth->length += (int) *(pkt->dat + auth->length) + - (int) *(pkt->dat + auth->length + 1) + 2; - - bcopy(pkt->dat, auth->dat, auth->length); - - strncpy(tktrlm, auth->dat + 3, REALM_SZ); - if (set_tgtkey(tktrlm)) { - lt = klog(L_ERR_UNK, - "FAILED realm %s unknown. Host: %s ", - tktrlm, inet_ntoa(client_host)); - kerb_err_reply(client, pkt, kerno, lt); - return; - } - kerno = krb_rd_req(auth, "ktbtgt", tktrlm, client_host.s_addr, - ad, 0); - - if (kerno) { - klog(L_ERR_UNK, "FAILED krb_rd_req from %s: %s", - inet_ntoa(client_host), krb_err_txt[kerno]); - kerb_err_reply(client, pkt, kerno, "krb_rd_req failed"); - return; - } - ptr = (char *) pkt->dat + auth->length; - - bcopy(ptr, &time_ws, 4); - ptr += 4; - - req_life = (u_long) (*ptr++); - - service = ptr; - instance = ptr + strlen(service) + 1; - - klog(L_APPL_REQ, "APPL Request %s.%s@%s on %s for %s.%s", - ad->pname, ad->pinst, ad->prealm, inet_ntoa(client_host), - service, instance, 0); - - if (strcmp(ad->prealm, tktrlm)) { - kerb_err_reply(client, pkt, KERB_ERR_PRINCIPAL_UNKNOWN, - "Can't hop realms"); - return; - } - if (!strcmp(service, "changepw")) { - kerb_err_reply(client, pkt, KERB_ERR_PRINCIPAL_UNKNOWN, - "Can't authorize password changed based on TGT"); - return; - } - kerno = check_princ(service, instance, req_life, - &s_name_data); - if (kerno) { - kerb_err_reply(client, pkt, kerno, lt); - return; - } - /* Bound requested lifetime with service and user */ - lifetime = min(req_life, - (ad->life - ((kerb_time.tv_sec - ad->time_sec) / 300))); - lifetime = min(lifetime, ((u_long) s_name_data.max_life)); - - /* unseal server's key from master key */ - bcopy(&s_name_data.key_low, key, 4); - bcopy(&s_name_data.key_high, ((long *) key) + 1, 4); - kdb_encrypt_key(key, key, master_key, - master_key_schedule, DECRYPT); - /* construct and seal the ticket */ - -#ifdef NOENCRYPTION - bzero(session_key, sizeof(C_Block)); -#else - des_new_random_key(session_key); -#endif - - krb_create_ticket(tk, k_flags, ad->pname, ad->pinst, - ad->prealm, client_host.s_addr, - session_key, lifetime, kerb_time.tv_sec, - s_name_data.name, s_name_data.instance, - key); - bzero(key, sizeof(key)); - bzero(key_s, sizeof(key_s)); - - create_ciph(ciph, session_key, service, instance, - local_realm, - lifetime, s_name_data.key_version, tk, - kerb_time.tv_sec, ad->session); - - /* clear session key */ - bzero(session_key, sizeof(session_key)); - - bzero(ad->session, sizeof(ad->session)); - - rpkt = create_auth_reply(ad->pname, ad->pinst, - ad->prealm, time_ws, - 0, 0, 0, ciph); - sendto(f, rpkt->dat, rpkt->length, 0, (struct sockaddr *) client, - S_AD_SZ); - bzero(&s_name_data, sizeof(s_name_data)); - break; - } - - -#ifdef notdef_DIE - case AUTH_MSG_DIE: - { - lt = klog(L_DEATH_REQ, - "Host: %s User: \"%s\" \"%s\" Kerberos killed", - inet_ntoa(client_host), req_name_ptr, req_inst_ptr, 0); - exit(0); - } -#endif notdef_DIE - - default: - { - lt = klog(L_KRB_PERR, - "Unknown message type: %d from %s port %u", - req_msg_type, inet_ntoa(client_host), - ntohs(client->sin_port)); - break; - } - } -} - - -/* - * setup_disc - * - * disconnect all descriptors, remove ourself from the process - * group that spawned us. - */ - -void -setup_disc() -{ - - int s; - - for (s = 0; s < 3; s++) { - (void) close(s); - } - - (void) open("/dev/null", 0); - (void) dup2(0, 1); - (void) dup2(0, 2); - - s = open("/dev/tty", 2); - - if (s >= 0) { - ioctl(s, TIOCNOTTY, (struct sgttyb *) 0); - (void) close(s); - } - (void) chdir("/tmp"); -} - - -/* - * kerb_er_reply creates an error reply packet and sends it to the - * client. - */ - -void -kerb_err_reply(client, pkt, err, string) - struct sockaddr_in *client; - KTEXT pkt; - long err; - char *string; - -{ - static KTEXT_ST e_pkt_st; - KTEXT e_pkt = &e_pkt_st; - static char e_msg[128]; - - strcpy(e_msg, "\nKerberos error -- "); - strcat(e_msg, string); - cr_err_reply(e_pkt, req_name_ptr, req_inst_ptr, req_realm_ptr, - req_time_ws, err, e_msg); - sendto(f, e_pkt->dat, e_pkt->length, 0, (struct sockaddr *) client, - S_AD_SZ); - -} - -/* - * Make sure that database isn't stale. - * - * Exit if it is; we don't want to tell lies. - */ - -static void check_db_age() -{ - long age; - - if (max_age != -1) { - /* Requires existance of kerb_get_db_age() */ - gettimeofday(&kerb_time, 0); - age = kerb_get_db_age(); - if (age == 0) { - klog(L_KRB_PERR, "Database currently being updated!"); - hang(); - } - if ((age + max_age) < kerb_time.tv_sec) { - klog(L_KRB_PERR, "Database out of date!"); - hang(); - /* NOTREACHED */ - } - } -} - -int -check_princ(p_name, instance, lifetime, p) - char *p_name; - char *instance; - unsigned lifetime; - - Principal *p; -{ - static int n; - static int more; - - n = kerb_get_principal(p_name, instance, p, 1, &more); - klog(L_ALL_REQ, - "Principal: \"%s\", Instance: \"%s\" Lifetime = %d n = %d", - p_name, instance, lifetime, n, 0); - - if (n < 0) { - lt = klog(L_KRB_PERR, "Database unavailable!"); - hang(); - } - - /* - * if more than one p_name, pick one, randomly create a session key, - * compute maximum lifetime, lookup authorizations if applicable, - * and stuff into cipher. - */ - if (n == 0) { - /* service unknown, log error, skip to next request */ - lt = klog(L_ERR_UNK, "UNKNOWN \"%s\" \"%s\"", p_name, - instance, 0); - return KERB_ERR_PRINCIPAL_UNKNOWN; - } - if (more) { - /* not unique, log error */ - lt = klog(L_ERR_NUN, "Principal NOT UNIQUE \"%s\" \"%s\"", - p_name, instance, 0); - return KERB_ERR_PRINCIPAL_NOT_UNIQUE; - } - /* If the user's key is null, we want to return an error */ - if ((p->key_low == 0) && (p->key_high == 0)) { - /* User has a null key */ - lt = klog(L_ERR_NKY, "Null key \"%s\" \"%s\"", p_name, - instance, 0); - return KERB_ERR_NULL_KEY; - } - if (master_key_version != p->kdc_key_ver) { - /* log error reply */ - lt = klog(L_ERR_MKV, - "Key vers incorrect, KRB = %d, \"%s\" \"%s\" = %d", - master_key_version, p->name, p->instance, p->kdc_key_ver, - 0); - return KERB_ERR_NAME_MAST_KEY_VER; - } - /* make sure the service hasn't expired */ - if ((u_long) p->exp_date < (u_long) kerb_time.tv_sec) { - /* service did expire, log it */ - lt = klog(L_ERR_SEXP, - "EXPIRED \"%s\" \"%s\" %s", p->name, p->instance, - stime(&(p->exp_date)), 0); - return KERB_ERR_NAME_EXP; - } - /* ok is zero */ - return 0; -} - - -/* Set the key for krb_rd_req so we can check tgt */ -int -set_tgtkey(r) - char *r; /* Realm for desired key */ -{ - int n; - static char lastrealm[REALM_SZ]; - Principal p_st; - Principal *p = &p_st; - C_Block key; - - if (!strcmp(lastrealm, r)) - return (KSUCCESS); - - log("Getting key for %s", r); - - n = kerb_get_principal("krbtgt", r, p, 1, &more); - if (n == 0) - return (KFAILURE); - - /* unseal tgt key from master key */ - bcopy(&p->key_low, key, 4); - bcopy(&p->key_high, ((long *) key) + 1, 4); - kdb_encrypt_key(key, key, master_key, - master_key_schedule, DECRYPT); - krb_set_key(key, 0); - strcpy(lastrealm, r); - return (KSUCCESS); -} - -static void -hang() -{ - if (pause_int == -1) { - klog(L_KRB_PERR, "Kerberos will pause so as not to loop init"); - for (;;) - pause(); - } else { - char buf[256]; - sprintf(buf, "Kerberos will wait %ld seconds before dying so as not to loop init", pause_int); - klog(L_KRB_PERR, buf); - sleep(pause_int); - klog(L_KRB_PERR, "Do svedania....\n"); - exit(1); - } -} diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile deleted file mode 100644 index c036b16997058..0000000000000 --- a/eBones/usr.sbin/kprop/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/09/14 04:11:01 gibbs Exp $ - -PROG= kprop -DPADD= ${LIBKRB} ${LIBDES} -LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -NOMAN= noman - -.include diff --git a/eBones/usr.sbin/kprop/kprop.c b/eBones/usr.sbin/kprop/kprop.c deleted file mode 100644 index ebd80dd0a9ac5..0000000000000 --- a/eBones/usr.sbin/kprop/kprop.c +++ /dev/null @@ -1,573 +0,0 @@ -/* - * - * Copyright 1987 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, - * please see the file . - * - */ - -#if 0 -#ifndef lint -static char rcsid_kprop_c[] = -"$Id$"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "kprop.h" - -/* for those broken Unixes without this defined... should be in sys/param.h */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif - -static char kprop_version[KPROP_PROT_VERSION_LEN] = KPROP_PROT_VERSION; - -int debug = 0; - -char my_realm[REALM_SZ]; -int princ_data_size = 3 * sizeof(long) + 3 * sizeof(unsigned char); -short transfer_mode, net_transfer_mode; -int force_flag; -static char ok[] = ".dump_ok"; - -extern char *krb_get_phost(char *); - -struct slave_host { - u_long net_addr; - char *name; - char *instance; - char *realm; - int not_time_yet; - int succeeded; - struct slave_host *next; -}; - -void Death(char *s); -int get_slaves(struct slave_host **psl, char *file, time_t ok_mtime); -int prop_to_slaves(struct slave_host *sl, int fd, char *fslv); - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int fd, i; - char *floc, *floc_ok; - char *fslv; - struct stat stbuf, stbuf_ok; - long l_init, l_final; - char *pc; - int l_diff; - static struct slave_host *slave_host_list = NULL; - struct slave_host *sh; - - transfer_mode = KPROP_TRANSFER_PRIVATE; - - time(&l_init); - pc = ctime(&l_init); - pc[strlen(pc) - 1] = '\0'; - printf("\nStart slave propagation: %s\n", pc); - - floc = (char *) NULL; - fslv = (char *) NULL; - - if (krb_get_lrealm(my_realm,1) != KSUCCESS) - Death ("Getting my kerberos realm. Check krb.conf"); - - for (i = 1; i < argc; i++) - switch (argv[i][0]) { - case '-': - if (strcmp (argv[i], "-private") == 0) - transfer_mode = KPROP_TRANSFER_PRIVATE; -#ifdef not_safe_yet - else if (strcmp (argv[i], "-safe") == 0) - transfer_mode = KPROP_TRANSFER_SAFE; - else if (strcmp (argv[i], "-clear") == 0) - transfer_mode = KPROP_TRANSFER_CLEAR; -#endif - else if (strcmp (argv[i], "-realm") == 0) { - i++; - if (i < argc) - strcpy(my_realm, argv[i]); - else - goto usage; - } else if (strcmp (argv[i], "-force") == 0) - force_flag++; - else { - fprintf (stderr, "kprop: unknown control argument %s.\n", - argv[i]); - exit (1); - } - break; - default: - /* positional arguments are marginal at best ... */ - if (floc == (char *) NULL) - floc = argv[i]; - else { - if (fslv == (char *) NULL) - fslv = argv[i]; - else { - usage: - /* already got floc and fslv, what is this? */ - fprintf(stderr, - "\nUsage: kprop [-force] [-realm realm] [-private|-safe|-clear] data_file slaves_file\n\n"); - exit(1); - } - } - } - if ((floc == (char *)NULL) || (fslv == (char *)NULL)) - goto usage; - - if ((floc_ok = (char *) malloc(strlen(floc) + strlen(ok) + 1)) - == NULL) { - Death(floc); - } - strcat(strcpy(floc_ok, floc), ok); - - if ((fd = open(floc, O_RDONLY)) < 0) { - Death(floc); - } - if (flock(fd, LOCK_EX | LOCK_NB)) { - Death(floc); - } - if (stat(floc, &stbuf)) { - Death(floc); - } - if (stat(floc_ok, &stbuf_ok)) { - Death(floc_ok); - } - if (stbuf.st_mtime > stbuf_ok.st_mtime) { - fprintf(stderr, "kprop: '%s' more recent than '%s'.\n", - floc, floc_ok); - exit(1); - } - if (!get_slaves(&slave_host_list, fslv, stbuf_ok.st_mtime)) { - fprintf(stderr, - "kprop: can't read slave host file '%s'.\n", fslv); - exit(1); - } -#ifdef KPROP_DBG - { - struct slave_host *sh; - int i; - fprintf(stderr, "\n\n"); - fflush(stderr); - for (sh = slave_host_list; sh; sh = sh->next) { - fprintf(stderr, "slave %d: %s, %s", i++, sh->name, - inet_ntoa(sh->net_addr)); - fflush(stderr); - } - } -#endif /* KPROP_DBG */ - - if (!prop_to_slaves(slave_host_list, fd, fslv)) { - fprintf(stderr, - "kprop: propagation failed.\n"); - exit(1); - } - if (flock(fd, LOCK_UN)) { - Death(floc); - } - fprintf(stderr, "\n\n"); - for (sh = slave_host_list; sh; sh = sh->next) { - fprintf(stderr, "%s:\t\t%s\n", sh->name, - (sh->not_time_yet? "Not time yet" : (sh->succeeded ? "Succeeded" : "FAILED"))); - } - - time(&l_final); - l_diff = l_final - l_init; - printf("propagation finished, %d:%02d:%02d elapsed\n", - l_diff / 3600, (l_diff % 3600) / 60, l_diff % 60); - - exit(0); -} - -void -Death(s) - char *s; -{ - fprintf(stderr, "kprop: "); - perror(s); - exit(1); -} - -/* The master -> slave protocol looks like this: - 1) 8 byte version string - 2) 2 bytes of "transfer mode" (net byte order of course) - 3) ticket/authentication send by sendauth - 4) 4 bytes of "block" length (u_long) - 5) data - - 4 and 5 repeat til EOF ... -*/ - -int -prop_to_slaves(sl, fd, fslv) - struct slave_host *sl; - int fd; - char *fslv; -{ - char buf[KPROP_BUFSIZ]; - char obuf[KPROP_BUFSIZ + 64 /* leave room for private msg overhead */ ]; - struct servent *sp; - struct sockaddr_in sin, my_sin; - int i, n, s; - struct slave_host *cs; /* current slave */ - char path[256], my_host_name[MAXHOSTNAMELEN], *p_my_host_name; - char kprop_service_instance[INST_SZ]; - char *pc; - u_long cksum, get_data_checksum(); - u_long length, nlength; - long kerror; - KTEXT_ST ticket; - CREDENTIALS cred; - MSG_DAT msg_dat; - static char tkstring[] = "/tmp/kproptktXXXXXX"; - - Key_schedule session_sched; - - (void) mktemp(tkstring); - krb_set_tkt_string(tkstring); - - if ((sp = getservbyname("krb_prop", "tcp")) == 0) { - fprintf(stderr, "tcp/krb_prop: service unknown.\n"); - exit(1); - } - - bzero(&sin, sizeof sin); - sin.sin_family = AF_INET; - sin.sin_port = sp->s_port; - - strcpy(path, fslv); - if ((pc = rindex(path, '/'))) { - pc += 1; - } else { - pc = path; - } - - for (i = 0; i < 5; i++) { /* try each slave five times max */ - for (cs = sl; cs; cs = cs->next) { - if (!cs->succeeded) { - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - perror("kprop: socket"); - exit(1); - } - bcopy(&cs->net_addr, &sin.sin_addr, - sizeof cs->net_addr); - /* for krb_mk_{priv, safe} */ - bzero (&my_sin, sizeof my_sin); - n = sizeof my_sin; - if ((kerror = krb_get_local_addr (&my_sin)) != KSUCCESS) { - fprintf (stderr, "kprop: can't get local address: %s\n", - krb_err_txt[kerror]); - close (s); - continue; /*** NEXT SLAVE ***/ - } - if (bind(s, (struct sockaddr *) &my_sin, sizeof my_sin) < 0) { - fprintf(stderr, "Unable to bind local address: "); - perror("bind"); - close(s); - continue; - } - if (connect(s, (struct sockaddr *) &sin, sizeof sin) < 0) { - fprintf(stderr, "%s: ", cs->name); - perror("connect"); - close(s); - continue; /*** NEXT SLAVE ***/ - } - - /* Get ticket */ - kerror = krb_mk_req (&ticket, KPROP_SERVICE_NAME, - cs->instance, cs->realm, (u_long) 0); - /* if ticket has expired try to get a new one, but - * first get a TGT ... - */ - if (kerror != MK_AP_OK) { - if (gethostname (my_host_name, sizeof(my_host_name)) != 0) { - fprintf (stderr, "%s:", cs->name); - perror ("getting my hostname"); - close (s); - break; /* next one can't work either! */ - } - /* get canonical kerberos service instance name */ - p_my_host_name = krb_get_phost (my_host_name); - /* copy it to make sure gethostbyname static doesn't - * screw us. */ - strcpy (kprop_service_instance, p_my_host_name); - kerror = krb_get_svc_in_tkt (KPROP_SERVICE_NAME, -#if 0 - kprop_service_instance, -#else - KRB_MASTER, -#endif - my_realm, - TGT_SERVICE_NAME, - my_realm, - 96, - KPROP_SRVTAB); - if (kerror != INTK_OK) { - fprintf (stderr, - "%s: %s. While getting initial ticket\n", - cs->name, krb_err_txt[kerror]); - close (s); - goto punt; - } - kerror = krb_mk_req (&ticket, KPROP_SERVICE_NAME, - cs->instance, cs->realm, (u_long) 0); - } - if (kerror != MK_AP_OK) { - fprintf (stderr, "%s: %s. Calling krb_mk_req.", - cs->name, krb_err_txt[kerror]); - close (s); - continue; /*** NEXT SLAVE ***/ - } - - if (write(s, kprop_version, sizeof(kprop_version)) - != sizeof(kprop_version)) { - fprintf (stderr, "%s: ", cs->name); - perror ("write (version) error"); - close (s); - continue; /*** NEXT SLAVE ***/ - } - - net_transfer_mode = htons (transfer_mode); - if (write(s, &net_transfer_mode, sizeof(net_transfer_mode)) - != sizeof(net_transfer_mode)) { - fprintf (stderr, "%s: ", cs->name); - perror ("write (transfer_mode) error"); - close (s); - continue; /*** NEXT SLAVE ***/ - } - - kerror = krb_get_cred (KPROP_SERVICE_NAME, cs->instance, - cs->realm, &cred); - if (kerror != KSUCCESS) { - fprintf (stderr, "%s: %s. Getting session key.", - cs->name, krb_err_txt[kerror]); - close (s); - continue; /*** NEXT SLAVE ***/ - } -#ifdef NOENCRYPTION - bzero((char *)session_sched, sizeof(session_sched)); -#else - if (key_sched ((C_Block *)cred.session, session_sched)) { - fprintf (stderr, "%s: can't make key schedule.", - cs->name); - close (s); - continue; /*** NEXT SLAVE ***/ - } -#endif - /* SAFE (quad_cksum) and CLEAR are just not good enough */ - cksum = 0; -#ifdef not_working_yet - if (transfer_mode != KPROP_TRANSFER_PRIVATE) { - cksum = get_data_checksum(fd, session_sched); - lseek(fd, 0L, 0); - } - else -#endif - { - struct stat st; - fstat (fd, &st); - cksum = st.st_size; - } - kerror = krb_sendauth(KOPT_DO_MUTUAL, - s, - &ticket, - KPROP_SERVICE_NAME, - cs->instance, - cs->realm, - cksum, - &msg_dat, - &cred, - session_sched, - &my_sin, - &sin, - KPROP_PROT_VERSION); - if (kerror != KSUCCESS) { - fprintf (stderr, "%s: %s. Calling krb_sendauth.", - cs->name, krb_err_txt[kerror]); - close (s); - continue; /*** NEXT SLAVE ***/ - } - - while ((n = read(fd, buf, sizeof buf))) { - if (n < 0) { - perror("input file read error"); - exit(1); - } - switch (transfer_mode) { - case KPROP_TRANSFER_PRIVATE: - case KPROP_TRANSFER_SAFE: - if (transfer_mode == KPROP_TRANSFER_PRIVATE) - length = krb_mk_priv (buf, obuf, n, - session_sched, cred.session, - &my_sin, &sin); - else - length = krb_mk_safe (buf, obuf, n, - (C_Block *)cred.session, - &my_sin, &sin); - if (length == -1) { - fprintf (stderr, "%s: %s failed.", - cs->name, - (transfer_mode == KPROP_TRANSFER_PRIVATE) - ? "krb_rd_priv" : "krb_rd_safe"); - close (s); - continue; /*** NEXT SLAVE ***/ - } - nlength = htonl(length); - if (write(s, &nlength, sizeof nlength) - != sizeof nlength) { - fprintf (stderr, "%s: ", cs->name); - perror ("write error"); - close (s); - continue; /*** NEXT SLAVE ***/ - } - if (write(s, obuf, length) != length) { - fprintf(stderr, "%s: ", cs->name); - perror("write error"); - close(s); - continue; /*** NEXT SLAVE ***/ - } - break; - case KPROP_TRANSFER_CLEAR: - if (write(s, buf, n) != n) { - fprintf(stderr, "%s: ", cs->name); - perror("write error"); - close(s); - continue; /*** NEXT SLAVE ***/ - } - break; - } - } - close(s); - cs->succeeded = 1; - fprintf(stderr, "%s: success.\n", cs->name); - strcat(strcpy(pc, cs->name), "-last-prop"); - close(creat(path, 0600)); - } - } - } -punt: - - dest_tkt(); - for (cs = sl; cs; cs = cs->next) { - if (!cs->succeeded) - return (0); /* didn't get this slave */ - } - return (1); -} - -int -get_slaves(psl, file, ok_mtime) - struct slave_host **psl; - char *file; - time_t ok_mtime; -{ - FILE *fin; - char namebuf[128], *inst; - char *pc; - struct hostent *host; - struct slave_host **th; - char path[256]; - char *ppath; - struct stat stbuf; - - if ((fin = fopen(file, "r")) == NULL) { - fprintf(stderr, "Can't open slave host file, '%s'.\n", file); - exit(-1); - } - strcpy(path, file); - if ((ppath = rindex(path, '/'))) { - ppath += 1; - } else { - ppath = path; - } - for (th = psl; fgets(namebuf, sizeof namebuf, fin); th = &(*th)->next) { - if ((pc = index(namebuf, '\n'))) { - *pc = '\0'; - } else { - fprintf(stderr, "Host name too long (>= %d chars) in '%s'.\n", - sizeof namebuf, file); - exit(-1); - } - host = gethostbyname(namebuf); - if (host == NULL) { - fprintf(stderr, "Unknown host '%s' in '%s'.\n", namebuf, file); - exit(-1); - } - (*th) = (struct slave_host *) malloc(sizeof(struct slave_host)); - if (!*th) { - fprintf(stderr, "No memory reading host list from '%s'.\n", - file); - exit(-1); - } - (*th)->name = malloc(strlen(namebuf) + 1); - if (!(*th)->name) { - fprintf(stderr, "No memory reading host list from '%s'.\n", - file); - exit(-1); - } - /* get kerberos cannonical instance name */ - strcpy((*th)->name, namebuf); - inst = krb_get_phost ((*th)->name); - (*th)->instance = malloc(strlen(inst) + 1); - if (!(*th)->instance) { - fprintf(stderr, "No memory reading host list from '%s'.\n", - file); - exit(-1); - } - strcpy((*th)->instance, inst); - /* what a concept, slave servers in different realms! */ - (*th)->realm = my_realm; - (*th)->net_addr = *(u_long *) host->h_addr; - (*th)->succeeded = 0; - (*th)->next = NULL; - strcat(strcpy(ppath, (*th)->name), "-last-prop"); - if (!force_flag && !stat(path, &stbuf) && stbuf.st_mtime > ok_mtime) { - (*th)->not_time_yet = 1; - (*th)->succeeded = 1; /* no change since last success */ - } - } - fclose(fin); - return (1); -} - -#ifdef doesnt_work_yet -u_long get_data_checksum(fd, key_sched) - int fd; - Key_schedule key_sched; -{ - unsigned long cksum = 0; - unsigned long cbc_cksum(); - int n; - char buf[BUFSIZ]; - long obuf[2]; - - while (n = read(fd, buf, sizeof buf)) { - if (n < 0) { - fprintf(stderr, "Input data file read error: "); - perror("read"); - exit(1); - } - cksum = cbc_cksum(buf, obuf, n, key_sched, key_sched); - } - return cksum; -} -#endif diff --git a/eBones/usr.sbin/kprop/kprop.h b/eBones/usr.sbin/kprop/kprop.h deleted file mode 100644 index 25bef47bf8a4c..0000000000000 --- a/eBones/usr.sbin/kprop/kprop.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 1987 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, - * please see the file . - * - */ - -#define KPROP_SERVICE_NAME "rcmd" -#define KPROP_SRVTAB "/etc/kerberosIV/srvtab" -#define TGT_SERVICE_NAME "krbtgt" -#define KPROP_PROT_VERSION_LEN 8 -#define KPROP_PROT_VERSION "kprop01" -#define KPROP_TRANSFER_PRIVATE 1 -#define KPROP_TRANSFER_SAFE 2 -#define KPROP_TRANSFER_CLEAR 3 -#define KPROP_BUFSIZ 32768 -#define KPROP_KDB_UTIL "/usr/sbin/kdb_util" diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile deleted file mode 100644 index f421aa9d2aedc..0000000000000 --- a/eBones/usr.sbin/ksrvutil/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $Id: Makefile,v 1.5 1995/09/14 04:11:06 gibbs Exp $ - -PROG= ksrvutil -SRCS= ksrvutil.c -CFLAGS+= -I${.CURDIR}/../../lib/libkadm -DPADD= ${LIBKRB} ${LIBDES} -LDADD+= -L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb \ - -L${DESOBJDIR} -ldes -lcom_err -MAN8= ksrvutil.8 - -.include diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.8 b/eBones/usr.sbin/ksrvutil/ksrvutil.8 deleted file mode 100644 index a7fed8290071f..0000000000000 --- a/eBones/usr.sbin/ksrvutil/ksrvutil.8 +++ /dev/null @@ -1,93 +0,0 @@ -.\" from: /mit/kerberos/src/man/RCS/ksrvutil.8,v 4.0 89/07/27 18:35:33 jtkohl Exp $ -.\" $Id: ksrvutil.8,v 1.2 1994/07/19 19:27:53 g89r4222 Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KSRVUTIL 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -ksrvutil \- host kerberos keyfile (srvtab) manipulation utility -.SH SYNOPSIS -ksrvutil -.B operation -[ -.B \-k -] [ -.B \-i -] [ -.B \-f filename -] -.SH DESCRIPTION -.I ksrvutil -allows a system manager to list or change keys currently in his -keyfile or to add new keys to the keyfile. -.PP - -Operation must be one of the following: -.TP 10n -.I list -lists the keys in a keyfile showing version number and principal -name. If the \-k option is given, keys will also be shown. -.TP 10n -.I change -changes all the keys in the keyfile by using the regular admin -protocol. If the \-i flag is given, -.I ksrvutil -will prompt for yes or no before changing each key. If the \-k -option is used, the old and new keys will be displayed. -.TP 10n -.I add -allows the user to add a key. -.I add -prompts for name, instance, realm, and key version number, asks -for confirmation, and then asks for a password. -.I ksrvutil -then converts the password to a key and appends the keyfile with -the new information. If the \-k option is used, the key is -displayed. - -.PP -In all cases, the default file used is KEY_FILE as defined in -krb.h unless this is overridden by the \-f option. - -.PP -A good use for -.I ksrvutil -would be for adding keys to a keyfile. A system manager could -ask a kerberos administrator to create a new service key with -.IR kadmin (8) -and could supply an initial password. Then, he could use -.I ksrvutil -to add the key to the keyfile and then to change the key so that -it will be random and unknown to either the system manager or -the kerberos administrator. - -.I ksrvutil -always makes a backup copy of the keyfile before making any -changes. - -.SH DIAGNOSTICS -If -.I ksrvutil -should exit on an error condition at any time during a change or -add, a copy of the -original keyfile can be found in -.IR filename .old -where -.I filename -is the name of the keyfile, and a copy of the file with all new -keys changed or added so far can be found in -.IR filename .work. -The original keyfile is left unmodified until the program exits -at which point it is removed and replaced it with the workfile. -Appending the workfile to the backup copy and replacing the -keyfile with the result should always give a usable keyfile, -although the resulting keyfile will have some out of date keys -in it. - -.SH SEE ALSO -kadmin(8), ksrvtgt(1) - -.SH AUTHOR -Emanuel Jay Berkenbilt, MIT Project Athena diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.c b/eBones/usr.sbin/ksrvutil/ksrvutil.c deleted file mode 100644 index 1bc14247e393d..0000000000000 --- a/eBones/usr.sbin/ksrvutil/ksrvutil.c +++ /dev/null @@ -1,586 +0,0 @@ -/* - * Copyright 1989 by the Massachusetts Institute of Technology. - * - * For copying and distribution information, please see the file - * Copyright.MIT. - * - * list and update contents of srvtab files - */ - -#if 0 -#ifndef lint -static char rcsid_ksrvutil_c[] = -"BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/ksrvutil.c,v 4.1 89/09/26 09:33:49 jtkohl Exp "; -static const char rcsid[] = - "$Id$"; -#endif lint -#endif - -/* - * ksrvutil - * list and update the contents of srvtab files - */ - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifndef TRUE -#define TRUE 1 -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef NOENCRYPTION -#define read_long_pw_string placebo_read_pw_string -#else /* NOENCRYPTION */ -#define read_long_pw_string des_read_pw_string -#endif /* NOENCRYPTION */ -int read_long_pw_string(); - -#define SRVTAB_MODE 0600 /* rw------- */ -#define PAD " " -#define VNO_HEADER "Version" -#define VNO_FORMAT "%4d " -#define KEY_HEADER " Key " /* 17 characters long */ -#define PRINC_HEADER " Principal\n" -#define PRINC_FORMAT "%s" - -void usage(void); -void leave(char *str, int x); -void get_key_from_password(des_cblock key); -void print_name(char *name, char *inst, char *realm); -void print_key(des_cblock key); -unsigned short get_mode(char *filename); -int get_svc_new_key(des_cblock new_key, char *sname, char *sinst, - char *srealm, char *keyfile); - -void -copy_keyfile(progname, keyfile, backup_keyfile) - char *progname; - char *keyfile; - char *backup_keyfile; -{ - int keyfile_fd; - int backup_keyfile_fd; - int keyfile_mode; - char buf[BUFSIZ]; /* for copying keyfiles */ - int rcount; /* for copying keyfiles */ - int try_again; - - bzero((char *)buf, sizeof(buf)); - - do { - try_again = FALSE; - if ((keyfile_fd = open(keyfile, O_RDONLY, 0)) < 0) { - if (errno != ENOENT) { - err(1, "unable to read %s", keyfile); - } - else { - try_again = TRUE; - if ((keyfile_fd = - open(keyfile, - O_WRONLY | O_TRUNC | O_CREAT, SRVTAB_MODE)) < 0) { - err(1, "unable to create %s", keyfile); - } - else - if (close(keyfile_fd) < 0) { - err(1, "failure closing %s", keyfile); - } - } - } - } while(try_again); - - keyfile_mode = get_mode(keyfile); - - if ((backup_keyfile_fd = - open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT, - keyfile_mode)) < 0) { - err(1, "unable to write %s", backup_keyfile); - } - do { - if ((rcount = read(keyfile_fd, (char *)buf, sizeof(buf))) < 0) { - err(1, "error reading %s", keyfile); - } - if (rcount && (write(backup_keyfile_fd, buf, rcount) != rcount)) { - err(1, "error writing %s", backup_keyfile); - } - } while (rcount); - if (close(backup_keyfile_fd) < 0) { - err(1, "error closing %s", backup_keyfile); - } - if (close(keyfile_fd) < 0) { - err(1, "error closing %s", keyfile); - } -} - -void -safe_read_stdin(prompt, buf, size) - char *prompt; - char *buf; - int size; -{ - printf(prompt); - fflush(stdout); - bzero(buf, size); - if (read(0, buf, size - 1) < 0) { - warn("failure reading from stdin"); - leave((char *)NULL, 1); - } - fflush(stdin); - buf[strlen(buf)-1] = 0; -} - - -void -safe_write(progname, filename, fd, buf, len) - char *progname; - char *filename; - int fd; - char *buf; - int len; -{ - if (write(fd, buf, len) != len) { - warn("failure writing %s", filename); - close(fd); - leave("In progress srvtab in this file.", 1); - } -} - -int -yn(string) - char *string; -{ - char ynbuf[5]; - - printf("%s (y,n) [y] ", string); - for (;;) { - safe_read_stdin("", ynbuf, sizeof(ynbuf)); - - if ((ynbuf[0] == 'n') || (ynbuf[0] == 'N')) - return(0); - else if ((ynbuf[0] == 'y') || (ynbuf[0] == 'Y') || (ynbuf[0] == 0)) - return(1); - else { - printf("Please enter 'y' or 'n': "); - fflush(stdout); - } - } -} - -void -append_srvtab(progname, filename, fd, sname, sinst, - srealm, key_vno, key) - char *progname; - char *filename; - int fd; - char *sname; - char *sinst; - char *srealm; - unsigned char key_vno; - des_cblock key; -{ - /* Add one to append null */ - safe_write(progname, filename, fd, sname, strlen(sname) + 1); - safe_write(progname, filename, fd, sinst, strlen(sinst) + 1); - safe_write(progname, filename, fd, srealm, strlen(srealm) + 1); - safe_write(progname, filename, fd, (char *)&key_vno, 1); - safe_write(progname, filename, fd, (char *)key, sizeof(des_cblock)); - fsync(fd); -} - -unsigned short -get_mode(filename) - char *filename; -{ - struct stat statbuf; - unsigned short mode; - - bzero((char *)&statbuf, sizeof(statbuf)); - - if (stat(filename, &statbuf) < 0) - mode = SRVTAB_MODE; - else - mode = statbuf.st_mode; - - return(mode); -} - -int -main(argc,argv) - int argc; - char *argv[]; -{ - char sname[ANAME_SZ]; /* name of service */ - char sinst[INST_SZ]; /* instance of service */ - char srealm[REALM_SZ]; /* realm of service */ - unsigned char key_vno; /* key version number */ - int status; /* general purpose error status */ - des_cblock new_key; - des_cblock old_key; - char change_tkt[MAXPATHLEN]; /* Ticket to use for key change */ - char keyfile[MAXPATHLEN]; /* Original keyfile */ - char work_keyfile[MAXPATHLEN]; /* Working copy of keyfile */ - char backup_keyfile[MAXPATHLEN]; /* Backup copy of keyfile */ - unsigned short keyfile_mode; /* Protections on keyfile */ - int work_keyfile_fd = -1; /* Initialize so that */ - int backup_keyfile_fd = -1; /* compiler doesn't complain */ - char local_realm[REALM_SZ]; /* local kerberos realm */ - int i; - int interactive = FALSE; - int list = FALSE; - int change = FALSE; - int add = FALSE; - int key = FALSE; /* do we show keys? */ - int arg_entered = FALSE; - int change_this_key = FALSE; - char databuf[BUFSIZ]; - int first_printed = FALSE; /* have we printed the first item? */ - - bzero((char *)sname, sizeof(sname)); - bzero((char *)sinst, sizeof(sinst)); - bzero((char *)srealm, sizeof(srealm)); - - bzero((char *)change_tkt, sizeof(change_tkt)); - bzero((char *)keyfile, sizeof(keyfile)); - bzero((char *)work_keyfile, sizeof(work_keyfile)); - bzero((char *)backup_keyfile, sizeof(backup_keyfile)); - bzero((char *)local_realm, sizeof(local_realm)); - - sprintf(change_tkt, "/tmp/tkt_ksrvutil.%d", getpid()); - krb_set_tkt_string(change_tkt); - - /* This is used only as a default for adding keys */ - if (krb_get_lrealm(local_realm, 1) != KSUCCESS) - strcpy(local_realm, KRB_REALM); - - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-i") == 0) - interactive++; - else if (strcmp(argv[i], "-k") == 0) - key++; - else if (strcmp(argv[i], "list") == 0) { - if (arg_entered) - usage(); - else { - arg_entered++; - list++; - } - } - else if (strcmp(argv[i], "change") == 0) { - if (arg_entered) - usage(); - else { - arg_entered++; - change++; - } - } - else if (strcmp(argv[i], "add") == 0) { - if (arg_entered) - usage(); - else { - arg_entered++; - add++; - } - } - else if (strcmp(argv[i], "-f") == 0) { - if (++i == argc) - usage(); - else - strcpy(keyfile, argv[i]); - } - else - usage(); - } - - if (!arg_entered) - usage(); - - if (!keyfile[0]) - strcpy(keyfile, KEYFILE); - - strcpy(work_keyfile, keyfile); - strcpy(backup_keyfile, keyfile); - - if (change || add) { - strcat(work_keyfile, ".work"); - strcat(backup_keyfile, ".old"); - - copy_keyfile(argv[0], keyfile, backup_keyfile); - } - - if (add) - copy_keyfile(argv[0], backup_keyfile, work_keyfile); - - keyfile_mode = get_mode(keyfile); - - if (change || list) { - if ((backup_keyfile_fd = open(backup_keyfile, O_RDONLY, 0)) < 0) { - err(1, "unable to read %s", backup_keyfile); - } - } - - if (change) { - if ((work_keyfile_fd = - open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC, - SRVTAB_MODE)) < 0) { - err(1, "unable to write %s", work_keyfile); - } - } - else if (add) { - if ((work_keyfile_fd = - open(work_keyfile, O_APPEND | O_WRONLY, SRVTAB_MODE)) < 0) { - err(1, "unable to append to %s", work_keyfile); - } - } - - if (change || list) { - while ((getst(backup_keyfile_fd, sname, SNAME_SZ) > 0) && - (getst(backup_keyfile_fd, sinst, INST_SZ) > 0) && - (getst(backup_keyfile_fd, srealm, REALM_SZ) > 0) && - (read(backup_keyfile_fd, &key_vno, 1) > 0) && - (read(backup_keyfile_fd,(char *)old_key,sizeof(old_key)) > 0)) { - if (list) { - if (!first_printed) { - printf(VNO_HEADER); - printf(PAD); - if (key) { - printf(KEY_HEADER); - printf(PAD); - } - printf(PRINC_HEADER); - first_printed = 1; - } - printf(VNO_FORMAT, key_vno); - printf(PAD); - if (key) { - print_key(old_key); - printf(PAD); - } - print_name(sname, sinst, srealm); - printf("\n"); - } - else if (change) { - printf("\nPrincipal: "); - print_name(sname, sinst, srealm); - printf("; version %d\n", key_vno); - if (interactive) - change_this_key = yn("Change this key?"); - else if (change) - change_this_key = 1; - else - change_this_key = 0; - - if (change_this_key) - printf("Changing to version %d.\n", key_vno + 1); - else if (change) - printf("Not changing this key.\n"); - - if (change_this_key) { - /* - * Pick a new key and determine whether or not - * it is safe to change - */ - if ((status = - get_svc_new_key(new_key, sname, sinst, - srealm, keyfile)) == KADM_SUCCESS) - key_vno++; - else { - bcopy(old_key, new_key, sizeof(new_key)); - com_err(argv[0], status, ": key NOT changed"); - change_this_key = FALSE; - } - } - else - bcopy(old_key, new_key, sizeof(new_key)); - append_srvtab(argv[0], work_keyfile, work_keyfile_fd, - sname, sinst, srealm, key_vno, new_key); - if (key && change_this_key) { - printf("Old key: "); - print_key(old_key); - printf("; new key: "); - print_key(new_key); - printf("\n"); - } - if (change_this_key) { - if ((status = kadm_change_pw(new_key)) == KADM_SUCCESS) { - printf("Key changed.\n"); - dest_tkt(); - } - else { - com_err(argv[0], status, - " attempting to change password."); - dest_tkt(); - /* XXX This knows the format of a keyfile */ - if (lseek(work_keyfile_fd, -9, L_INCR) >= 0) { - key_vno--; - safe_write(argv[0], work_keyfile, - work_keyfile_fd, (char *)&key_vno, 1); - safe_write(argv[0], work_keyfile, work_keyfile_fd, - (char *)old_key, sizeof(des_cblock)); - fsync(work_keyfile_fd); - fprintf(stderr,"Key NOT changed.\n"); - } - else { - warn("unable to revert keyfile"); - leave("", 1); - } - } - } - } - bzero((char *)old_key, sizeof(des_cblock)); - bzero((char *)new_key, sizeof(des_cblock)); - } - } - else if (add) { - do { - do { - safe_read_stdin("Name: ", databuf, sizeof(databuf)); - strncpy(sname, databuf, sizeof(sname) - 1); - safe_read_stdin("Instance: ", databuf, sizeof(databuf)); - strncpy(sinst, databuf, sizeof(sinst) - 1); - safe_read_stdin("Realm: ", databuf, sizeof(databuf)); - strncpy(srealm, databuf, sizeof(srealm) - 1); - safe_read_stdin("Version number: ", databuf, sizeof(databuf)); - key_vno = atoi(databuf); - if (!srealm[0]) - strcpy(srealm, local_realm); - printf("New principal: "); - print_name(sname, sinst, srealm); - printf("; version %d\n", key_vno); - } while (!yn("Is this correct?")); - get_key_from_password(new_key); - if (key) { - printf("Key: "); - print_key(new_key); - printf("\n"); - } - append_srvtab(argv[0], work_keyfile, work_keyfile_fd, - sname, sinst, srealm, key_vno, new_key); - printf("Key successfully added.\n"); - } while (yn("Would you like to add another key?")); - } - - if (change || list) - if (close(backup_keyfile_fd) < 0) { - warn("failure closing %s, continuing", backup_keyfile); - } - - if (change || add) { - if (close(work_keyfile_fd) < 0) { - err(1, "failure closing %s", work_keyfile); - } - if (rename(work_keyfile, keyfile) < 0) { - err(1, "failure renaming %s to %s", work_keyfile, keyfile); - } - chmod(backup_keyfile, keyfile_mode); - chmod(keyfile, keyfile_mode); - printf("Old keyfile in %s.\n", backup_keyfile); - } - - exit(0); -} - -void -print_key(key) - des_cblock key; -{ - int i; - - for (i = 0; i < 4; i++) - printf("%02x", key[i]); - printf(" "); - for (i = 4; i < 8; i++) - printf("%02x", key[i]); -} - -void -print_name(name, inst, realm) - char *name; - char *inst; - char *realm; -{ - printf("%s%s%s%s%s", name, inst[0] ? "." : "", inst, - realm[0] ? "@" : "", realm); -} - -int -get_svc_new_key(new_key, sname, sinst, srealm, keyfile) - des_cblock new_key; - char *sname; - char *sinst; - char *srealm; - char *keyfile; -{ - int status = KADM_SUCCESS; - CREDENTIALS c; - - if (((status = krb_get_svc_in_tkt(sname, sinst, srealm, PWSERV_NAME, - KADM_SINST, 1, keyfile)) == KSUCCESS) && - ((status = krb_get_cred(PWSERV_NAME, KADM_SINST, srealm, &c)) == - KSUCCESS) && - ((status = kadm_init_link("changepw", KRB_MASTER, srealm)) == - KADM_SUCCESS)) { -#ifdef NOENCRYPTION - bzero((char *) new_key, sizeof(des_cblock)); - new_key[0] = (unsigned char) 1; -#else /* NOENCRYPTION */ - des_init_random_number_generator(c.session); - (void) des_new_random_key(new_key); -#endif /* NOENCRYPTION */ - return(KADM_SUCCESS); - } - - return(status); -} - -void -get_key_from_password(key) - des_cblock key; -{ - char password[MAX_KPW_LEN]; /* storage for the password */ - - if (read_long_pw_string(password, sizeof(password)-1, "Password: ", 1)) - leave("Error reading password.", 1); - -#ifdef NOENCRYPTION - bzero((char *) key, sizeof(des_cblock)); - key[0] = (unsigned char) 1; -#else /* NOENCRYPTION */ - des_string_to_key(password, (des_cblock *)key); -#endif /* NOENCRYPTION */ - bzero((char *)password, sizeof(password)); -} - -void -usage() -{ - fprintf(stderr, "Usage: ksrvutil [-f keyfile] [-i] [-k] "); - fprintf(stderr, "{list | change | add}\n"); - fprintf(stderr, " -i causes the program to ask for "); - fprintf(stderr, "confirmation before changing keys.\n"); - fprintf(stderr, " -k causes the key to printed for list or "); - fprintf(stderr, "change.\n"); - exit(1); -} - -void -leave(str,x) -char *str; -int x; -{ - if (str) - fprintf(stderr, "%s\n", str); - dest_tkt(); - exit(x); -} diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile deleted file mode 100644 index 5043cf3bdb824..0000000000000 --- a/eBones/usr.sbin/kstash/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# From: @(#)Makefile 5.2 (Berkeley) 3/5/91 -# $Id: Makefile,v 1.6 1995/09/14 04:11:14 gibbs Exp $ - -PROG= kstash -CFLAGS+=-DKERBEROS -DDEBUG -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -MAN8= kstash.8 - -.include diff --git a/eBones/usr.sbin/kstash/kstash.8 b/eBones/usr.sbin/kstash/kstash.8 deleted file mode 100644 index ac8c57b302cf2..0000000000000 --- a/eBones/usr.sbin/kstash/kstash.8 +++ /dev/null @@ -1,44 +0,0 @@ -.\" from: kstash.8,v 4.1 89/01/23 11:11:39 jtkohl Exp $ -.\" $Id: kstash.8,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $ -.\" Copyright 1989 by the Massachusetts Institute of Technology. -.\" -.\" For copying and distribution information, -.\" please see the file . -.\" -.TH KSTASH 8 "Kerberos Version 4.0" "MIT Project Athena" -.SH NAME -kstash \- stash Kerberos key distribution center database master key -.SH SYNOPSIS -kstash -.SH DESCRIPTION -.I kstash -saves the Kerberos key distribution center (KDC) database master key in -the master key cache file. -.PP -The user is prompted to enter the key, to verify the authenticity of the -key and the authorization to store the key in the file. -.SH DIAGNOSTICS -.TP 20n -"verify_master_key: Invalid master key, does not match database." -The master key string entered was incorrect. -.TP -"kstash: Unable to open master key file" -The attempt to open the cache file for writing failed (probably due to a -system or access permission error). -.TP -"kstash: Write I/O error on master key file" -The -.BR write (2) -system call returned an error while -.I kstash -was attempting to write the key to the file. -.SH FILES -.TP 20n -/etc/kerberosIV/principal.db -DBM file containing database -.TP -/etc/kerberosIV/principal.ok -Semaphore indicating that the DBM database is not being modified. -.TP -/etc/kerberosIV/master_key -Master key cache file. diff --git a/eBones/usr.sbin/kstash/kstash.c b/eBones/usr.sbin/kstash/kstash.c deleted file mode 100644 index ce26a1db34e0a..0000000000000 --- a/eBones/usr.sbin/kstash/kstash.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology - * For copying and distribution information, please see the file - * . - * - * from: kstash.c,v 4.0 89/01/23 09:45:43 jtkohl Exp $ - * $Id: kstash.c,v 1.3 1995/07/18 16:40:16 mark Exp $ - */ - -#if 0 -#ifndef lint -static char rcsid[] = -"$Id: kstash.c,v 1.3 1995/07/18 16:40:16 mark Exp $"; -#endif lint -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -/* change this later, but krblib_dbm needs it for now */ -char *progname; - -static C_Block master_key; -static Key_schedule master_key_schedule; -int debug; -static int kfile; -static void clear_secrets(); - -int -main(argc, argv) - int argc; - char **argv; -{ - long n; - if ((n = kerb_init())) { - fprintf(stderr, "Kerberos db and cache init failed = %ld\n", n); - exit(1); - } - - if (kdb_get_master_key (TRUE, master_key, master_key_schedule) != 0) { - fprintf (stderr, "%s: Couldn't read master key.\n", argv[0]); - fflush (stderr); - clear_secrets(); - exit (-1); - } - - if (kdb_verify_master_key (master_key, master_key_schedule, stderr) < 0) { - clear_secrets(); - exit (-1); - } - - kfile = open(MKEYFILE, O_TRUNC | O_RDWR | O_CREAT, 0600); - if (kfile < 0) { - clear_secrets(); - fprintf(stderr, "\n\07\07%s: Unable to open master key file\n", - argv[0]); - exit(1); - } - if (write(kfile, (char *) master_key, 8) < 0) { - clear_secrets(); - fprintf(stderr, "\n%s: Write I/O error on master key file\n", - argv[0]); - exit(1); - } - (void) close(kfile); - clear_secrets(); - return(0); -} - -static void -clear_secrets() -{ - bzero(master_key_schedule, sizeof(master_key_schedule)); - bzero(master_key, sizeof(master_key)); -} diff --git a/eBones/usr.sbin/make_keypair/Makefile b/eBones/usr.sbin/make_keypair/Makefile deleted file mode 100644 index 4edf76e649f13..0000000000000 --- a/eBones/usr.sbin/make_keypair/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/1/93 -# $id$ - -PROG= make_keypair -MAN8= make_keypair.8 -CFLAGS+=-DKERBEROS -I${.CURDIR}/../../usr.bin/register -DPADD= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes - -.include diff --git a/eBones/usr.sbin/make_keypair/make_keypair.8 b/eBones/usr.sbin/make_keypair/make_keypair.8 deleted file mode 100644 index d0b7b889a9202..0000000000000 --- a/eBones/usr.sbin/make_keypair/make_keypair.8 +++ /dev/null @@ -1,87 +0,0 @@ -.\" Copyright (c) 1988, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)make_keypair.8 8.2 (Berkeley) 12/11/93 -.\" -.Dd December 11, 1993 -.Dt MAKE_KEYPAIR 8 -.Os -.Sh NAME -.Nm make_keypair -.Nd generate Kerberos host key pair -.Sh SYNOPSIS -.Nm make_keypair -.Ar hostname -.Op Ar hostname ... -.Sh DESCRIPTION -The -.Nm make_keypair -command -is used to create pairs of -.Tn DES -keys for -each -.Ar hostname . -The keys are used by privileged programs such as -.Xr register 1 -to make remote updates to the Kerberos database without -having to have first acquired a Kerberos ticket granting ticket -.Pq Tn TGT . -The keys created by -.Nm make_keypair -are placed (by hand) in the filesystems of the -kerberos server in -.Pa /etc/kerberosIV/register_keys , -and in the root directory of the clients. -For example, the file -.Pa /.update.key128.32.130.3 -would -contain a copy of the key of the client with -IP address 128.32.130.3. -These keys provide a shared secret which may be used to establish -a secure channel between the client hosts and the Kerberos server. -.Sh FILES -.Bl -tag -width /etc/kerberosIV/register_keysxx -compact -.It Pa /.update.keyxx.xx.xx.xx -shared -.Tn DES -key with server -.It Pa /etc/kerberosIV/register_keys -server's key storage directory -.El -.Sh SEE ALSO -.Xr register 1 , -.Xr registerd 8 , -.Xr kerberos 1 -.Sh HISTORY -The -.Nm make_keypair -utility first appeared in 4.4BSD. diff --git a/eBones/usr.sbin/make_keypair/make_keypair.c b/eBones/usr.sbin/make_keypair/make_keypair.c deleted file mode 100644 index deb67ac60e1fa..0000000000000 --- a/eBones/usr.sbin/make_keypair/make_keypair.c +++ /dev/null @@ -1,134 +0,0 @@ -/*- - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#if 0 -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -static char sccsid[] = "@(#)make_keypair.c 8.1 (Berkeley) 6/1/93"; -#endif /* not lint */ -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "pathnames.h" -#include "register_proto.h" - -void usage(char *name); -void make_key(struct in_addr addr); - -char * progname; - -void -main(argc, argv) - int argc; - char **argv; -{ - struct hostent *hp; - char *addr; - int i; - struct sockaddr_in sin; - - progname = *argv; /* argv[0] */ - - if (argc != 2) { - usage(argv[0]); - exit(1); - } - - if ((hp = gethostbyname(argv[1])) == NULL) { - herror(argv[1]); - exit(1); - } - - for (i = 0; (addr = hp->h_addr_list[i]); i++) { - addr = hp->h_addr_list[i]; - bcopy(addr, &sin.sin_addr, hp->h_length); - - printf("Making key for host %s (%s)\n", - argv[1], inet_ntoa(sin.sin_addr)); - make_key(sin.sin_addr); - } - printf("==========\n"); - printf("One copy of the each key should be put in %s on the\n", - SERVER_KEYDIR); - printf("Kerberos server machine (mode 600, owner root).\n"); - printf("Another copy of each key should be put on the named\n"); - printf("client as %sXXX.XXX.XXX.XXX (same modes as above),\n", - CLIENT_KEYFILE); - printf("where the X's refer to digits of the host's inet address.\n"); - (void)fflush(stdout); - exit(0); -} - -void -make_key(addr) - struct in_addr addr; -{ - struct keyfile_data kfile; - char namebuf[255]; - int fd; - - (void)sprintf(namebuf, "%s%s", - CLIENT_KEYFILE, - inet_ntoa(addr)); - fd = open(namebuf, O_WRONLY|O_CREAT, 0600); - if (fd < 0) { - perror("open"); - exit(1); - } - random_key(kfile.kf_key); - printf("writing to file -> %s ...", namebuf); - if (write(fd, &kfile, sizeof(kfile)) != sizeof(kfile)) { - fprintf(stderr, "error writing file %s\n", namebuf); - } - printf("done.\n"); - (void)close(fd); - return; -} - -void -usage(name) - char *name; -{ - fprintf(stderr, "usage: %s host\n", name); -} diff --git a/etc/Makefile b/etc/Makefile index e48c92af1b638..a6996dac585b5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $Id: Makefile,v 1.117.4.9 1996/06/05 21:20:22 nate Exp $ +# $Id: Makefile,v 1.117.4.10 1996/07/13 04:29:10 jkh Exp $ # -rw-r--r-- BINOWN= root diff --git a/etc/crontab b/etc/crontab index 85c33e19195b7..6f7bbac283746 100644 --- a/etc/crontab +++ b/etc/crontab @@ -1,6 +1,6 @@ # /etc/crontab - root's crontab for FreeBSD # -# $Id: crontab,v 1.10.4.1 1996/05/29 22:23:14 jkh Exp $ +# $Id: crontab,v 1.10.4.2 1996/06/05 20:28:12 nate Exp $ # From: Id: crontab,v 1.6 1993/05/31 02:03:57 cgd Exp # SHELL=/bin/sh diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV index 4d5a19b453823..3839990120f86 100644 --- a/etc/etc.i386/MAKEDEV +++ b/etc/etc.i386/MAKEDEV @@ -101,7 +101,7 @@ # isdn* ISDN devices # labpc* National Instrument's Lab-PC and LAB-PC+ # -# $Id: MAKEDEV,v 1.95.4.15 1996/06/25 20:26:40 markm Exp $ +# $Id: MAKEDEV,v 1.95.4.16 1996/07/02 14:24:56 bde Exp $ # PATH=/sbin:/bin/:/usr/bin:/usr/sbin: diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386 index d3cb78945d9e2..2884568d1b871 100644 --- a/etc/etc.i386/rc.i386 +++ b/etc/etc.i386/rc.i386 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.9.4.5 1996/06/17 09:17:33 jkh Exp $ +# $Id: rc.i386,v 1.9.4.6 1996/06/25 21:14:52 gpalmer Exp $ # Do i386 specific processing # diff --git a/etc/host.conf b/etc/host.conf index 10f4c65759362..4c82560a1fa3c 100644 --- a/etc/host.conf +++ b/etc/host.conf @@ -1,4 +1,4 @@ -# $Id$ +# $Id: host.conf,v 1.2 1993/11/07 01:02:57 wollman Exp $ # Default is to use the nameserver first bind # If that doesn't work, then try the /etc/hosts file diff --git a/etc/hosts b/etc/hosts index 4e6b0c2207ba2..3002e9a07960a 100644 --- a/etc/hosts +++ b/etc/hosts @@ -1,4 +1,4 @@ -# $Id: hosts,v 1.5.4.3 1996/06/05 02:36:29 jkh Exp $ +# $Id: hosts,v 1.5.4.4 1996/06/17 09:17:03 jkh Exp $ # # Host Database # This file should contain the addresses and aliases diff --git a/etc/make.conf b/etc/make.conf index 0edf50b825e56..335918f7992d8 100644 --- a/etc/make.conf +++ b/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.17.4.5 1996/06/05 02:36:31 jkh Exp $ +# $Id: make.conf,v 1.17.4.6 1996/06/17 09:17:05 jkh Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 1e98b13e2cdb7..2d19489fa8e5b 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -1,4 +1,4 @@ -# $Id: BSD.include.dist,v 1.2 1995/05/17 09:31:03 rgrimes Exp $ +# $Id: BSD.include.dist,v 1.2.4.2 1996/06/05 02:36:57 jkh Exp $ # /set type=dir uname=bin gname=bin mode=0755 diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 222131ac1b831..1d3658eb0a984 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.11.4.5 1996/06/16 22:33:58 asami Exp $ +# $Id: BSD.local.dist,v 1.11.4.6 1996/12/31 14:02:05 asami Exp $ # /set type=dir uname=bin gname=bin mode=0755 diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist index 7dcb262bdcad3..fea2d5b761395 100644 --- a/etc/mtree/BSD.release.dist +++ b/etc/mtree/BSD.release.dist @@ -1,4 +1,4 @@ -# $Id$ +# $Id: BSD.release.dist,v 1.2 1994/09/19 01:40:36 rgrimes Exp $ # /set type=dir uname=root gname=wheel mode=0755 diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index c6c7b896889ed..af087de93e084 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -1,4 +1,4 @@ -# $Id: BSD.root.dist,v 1.19 1994/09/25 02:55:21 wollman Exp $ +# $Id: BSD.root.dist,v 1.20 1995/05/17 09:31:10 rgrimes Exp $ # /set type=dir uname=root gname=wheel mode=0755 diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 07911827fc446..d5d29c907d6e2 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.40.4.10 1996/06/25 08:40:13 jkh Exp $ +# $Id: BSD.usr.dist,v 1.40.4.11 1996/08/10 21:59:41 rgrimes Exp $ # /set type=dir uname=bin gname=bin mode=0755 diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index d68688e1f31c5..15af3534b2763 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -1,4 +1,4 @@ -# $Id: BSD.var.dist,v 1.23.4.3 1996/06/17 09:17:40 jkh Exp $ +# $Id: BSD.var.dist,v 1.23.4.4 1996/11/08 21:49:45 guido Exp $ # /set type=dir uname=bin gname=bin mode=0755 diff --git a/etc/namedb/PROTO.localhost.rev b/etc/namedb/PROTO.localhost.rev index bc4e8ac1d7965..df6794d436189 100644 --- a/etc/namedb/PROTO.localhost.rev +++ b/etc/namedb/PROTO.localhost.rev @@ -1,5 +1,5 @@ ; From: @(#)localhost.rev 5.1 (Berkeley) 6/30/90 -; $Id$ +; $Id: PROTO.localhost.rev,v 1.1 1995/03/21 16:33:44 wollman Exp $ ; ; This file is automatically edited by the `make-localhost' script in ; the /etc/namedb directory. diff --git a/etc/namedb/named.boot b/etc/namedb/named.boot index 62eacbece6c67..3b34f50bff5fc 100644 --- a/etc/namedb/named.boot +++ b/etc/namedb/named.boot @@ -1,4 +1,4 @@ -; $Id: named.boot,v 1.2 1993/11/07 00:58:34 wollman Exp $ +; $Id: named.boot,v 1.3 1995/03/23 08:43:02 rgrimes Exp $ ; From: @(#)named.boot 5.1 (Berkeley) 6/30/90 ; boot file for secondary name server diff --git a/etc/netstart b/etc/netstart old mode 100755 new mode 100644 index 0246c5bf79b19..8d0cc7eb350ff --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: netstart,v 1.32.4.5 1996/06/05 02:36:32 jkh Exp $ +# $Id: netstart,v 1.32.4.6 1996/06/17 09:17:06 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample index a9f9d09ce5fca..29105227b3aef 100644 --- a/etc/pccard.conf.sample +++ b/etc/pccard.conf.sample @@ -8,7 +8,7 @@ # IRQ == 0 means "allocate free IRQ from IRQ pool" # IRQ == 16 means "do not use IRQ (e.g. PIO mode)" # -# $Id: pccard.conf.sample,v 1.1 1996/03/12 15:39:21 nate Exp $ +# $Id: pccard.conf.sample,v 1.2 1996/03/18 20:15:24 nate Exp $ # Generally available IO ports io 0x240-0x360 diff --git a/etc/phones b/etc/phones index b9af7f30d8ce2..c6ab472d99516 100644 --- a/etc/phones +++ b/etc/phones @@ -1,4 +1,4 @@ -# $Id: phones,v 1.3 1994/01/23 18:39:52 rgrimes Exp $ +# $Id: phones,v 1.4 1994/01/24 00:39:01 rgrimes Exp $ # From: @(#)phones 5.2 (Berkeley) 6/30/90 # # phones -- remote host phone number data base diff --git a/etc/ppp/ppp.conf.filter.sample b/etc/ppp/ppp.conf.filter.sample index 891a4b90e5436..464d8a1109cf3 100644 --- a/etc/ppp/ppp.conf.filter.sample +++ b/etc/ppp/ppp.conf.filter.sample @@ -1,5 +1,5 @@ # -# $Id: ppp.conf.filter.sample,v 1.1.1.1 1995/01/31 06:24:33 amurai Exp $ +# $Id: ppp.conf.filter.sample,v 1.2 1995/02/26 12:16:35 amurai Exp $ # # An example of packet filter definition. # diff --git a/etc/ppp/ppp.conf.iij b/etc/ppp/ppp.conf.iij index 62bf9bac8a505..80a7a304ac29a 100644 --- a/etc/ppp/ppp.conf.iij +++ b/etc/ppp/ppp.conf.iij @@ -10,7 +10,7 @@ # In all cases, you can use same username and password assigned # from IIJ. # -# $Id: ppp.conf.iij,v 1.1.1.1.4.2 1996/06/05 02:37:02 jkh Exp $ +# $Id: ppp.conf.iij,v 1.1.1.1.4.3 1996/06/17 09:17:46 jkh Exp $ # ############################################################################# # diff --git a/etc/ppp/ppp.conf.sample b/etc/ppp/ppp.conf.sample index 7c9591d01105b..c1aead825d48e 100644 --- a/etc/ppp/ppp.conf.sample +++ b/etc/ppp/ppp.conf.sample @@ -4,7 +4,7 @@ # # Written by Toshiharu OHNO # -# $Id: ppp.conf.sample,v 1.3.4.2 1996/06/05 02:37:04 jkh Exp $ +# $Id: ppp.conf.sample,v 1.3.4.3 1996/06/17 09:17:50 jkh Exp $ # ################################################################# # diff --git a/etc/ppp/ppp.linkup.sample b/etc/ppp/ppp.linkup.sample index 41bcbdde30d80..d52b2911e628b 100644 --- a/etc/ppp/ppp.linkup.sample +++ b/etc/ppp/ppp.linkup.sample @@ -14,7 +14,7 @@ # # 3) If given label name is not found, then label MYADDR is searched. # -# $Id: ppp.linkup.sample,v 1.1.1.1.4.2 1996/06/05 02:37:07 jkh Exp $ +# $Id: ppp.linkup.sample,v 1.1.1.1.4.3 1996/06/17 09:17:53 jkh Exp $ # ######################################################################### # diff --git a/etc/ppp/ppp.secret.sample b/etc/ppp/ppp.secret.sample index 720c1fb84d975..146c12a434c4c 100644 --- a/etc/ppp/ppp.secret.sample +++ b/etc/ppp/ppp.secret.sample @@ -1,7 +1,7 @@ ################################################## # Sysname Secret Key Peer's IP address # -# $Id: ppp.secret.sample,v 1.1.1.1 1995/01/31 06:24:33 amurai Exp $ +# $Id: ppp.secret.sample,v 1.2 1995/02/26 12:16:37 amurai Exp $ # ################################################## oscar OurSecretKey 192.244.184.34/24 diff --git a/etc/protocols b/etc/protocols index 33a1666a89742..9580640d2b6e4 100644 --- a/etc/protocols +++ b/etc/protocols @@ -1,7 +1,7 @@ # # Internet (IP) protocols # -# $Id: protocols,v 1.2 1993/11/07 00:31:22 wollman Exp $ +# $Id: protocols,v 1.2.8.1 1995/08/30 06:19:30 davidg Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # Updated for FreeBSD based on RFC 1340, Assigned Numbers (July 1992). diff --git a/etc/rc b/etc/rc index 5b9e1c0bf47d1..3bcfc67b62c9c 100644 --- a/etc/rc +++ b/etc/rc @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.66.4.14 1996/06/19 21:41:56 nate Exp $ +# $Id: rc,v 1.66.4.15 1996/06/25 14:56:02 joerg Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot diff --git a/etc/rc.firewall b/etc/rc.firewall index de2b563484be9..7864cdd6d2463 100644 --- a/etc/rc.firewall +++ b/etc/rc.firewall @@ -1,6 +1,6 @@ ############ # Setup system for firewall service. -# $Id: rc.firewall,v 1.1 1996/04/03 17:13:58 phk Exp $ +# $Id: rc.firewall,v 1.2 1996/04/12 09:16:42 phk Exp $ ############ # diff --git a/etc/rc.local b/etc/rc.local index 84c53c389655b..ceee0358ec169 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -1,7 +1,7 @@ # # site-specific startup actions, daemons # -# $Id: rc.local,v 1.18 1995/03/30 06:26:10 rgrimes Exp $ +# $Id: rc.local,v 1.19 1995/03/30 06:34:46 rgrimes Exp $ # T=/tmp/_motd diff --git a/etc/rc.serial b/etc/rc.serial index 580e505846f83..f47a5e1040c2b 100644 --- a/etc/rc.serial +++ b/etc/rc.serial @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: rc.serial,v 1.4.4.3 1996/07/02 14:39:34 bde Exp $ # Change some defaults for serial devices. # Standard defaults are: diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc index ffa5ecc822ba3..1a1a9a998c32c 100644 --- a/etc/root/dot.cshrc +++ b/etc/root/dot.cshrc @@ -1,4 +1,4 @@ -# $Id: dot.cshrc,v 1.11 1994/09/22 08:23:02 rgrimes Exp $ +# $Id: dot.cshrc,v 1.12 1994/10/27 05:26:59 phk Exp $ # alias mail Mail set history=1000 diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin index 56098a5a903e7..e0ff5406de0b7 100644 --- a/etc/root/dot.klogin +++ b/etc/root/dot.klogin @@ -1,4 +1,4 @@ -# $Id: dot.klogin,v 1.2 1994/02/21 20:36:01 rgrimes Exp $ +# $Id: dot.klogin,v 1.3 1994/10/27 05:26:59 phk Exp $ # # user1.root@your.realm.wherever # user2.root@your.realm.wherever diff --git a/etc/root/dot.login b/etc/root/dot.login index 2b9fb2214d84a..a35926b0ac676 100644 --- a/etc/root/dot.login +++ b/etc/root/dot.login @@ -1,4 +1,4 @@ -# $Id: dot.login,v 1.6 1994/09/16 04:20:13 rgrimes Exp $ +# $Id: dot.login,v 1.6.6.1 1995/08/25 03:42:24 davidg Exp $ # tset -Q \?$TERM stty crt erase ^H diff --git a/etc/root/dot.profile b/etc/root/dot.profile index 7789cda9111a2..6b3eb3de46f86 100644 --- a/etc/root/dot.profile +++ b/etc/root/dot.profile @@ -1,4 +1,4 @@ -# $Id: dot.profile,v 1.7 1994/09/22 08:32:39 rgrimes Exp $ +# $Id: dot.profile,v 1.8 1994/10/27 05:27:00 phk Exp $ # PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin echo 'erase ^H, kill ^U, intr ^C' diff --git a/etc/security b/etc/security index 2e66d4b496c44..64bd74cf523be 100644 --- a/etc/security +++ b/etc/security @@ -1,7 +1,7 @@ #!/bin/sh - # # @(#)security 5.3 (Berkeley) 5/28/91 -# $Id: security,v 1.8.4.3 1996/06/17 09:17:12 jkh Exp $ +# $Id: security,v 1.8.4.4 1997/01/19 19:42:26 guido Exp $ # PATH=/sbin:/bin:/usr/bin LC_ALL=C; export LC_ALL diff --git a/etc/services b/etc/services index 25c476cc33cae..d2deac4689e55 100644 --- a/etc/services +++ b/etc/services @@ -9,7 +9,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $Id: services,v 1.11.4.6 1996/06/05 02:36:38 jkh Exp $ +# $Id: services,v 1.11.4.7 1996/06/17 09:17:16 jkh Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS diff --git a/etc/sysconfig b/etc/sysconfig index 03e55a79345a7..17e2391124d29 100644 --- a/etc/sysconfig +++ b/etc/sysconfig @@ -4,7 +4,7 @@ # This is sysconfig - a file full of useful variables that you can set # to change the default startup behavior of your system. # -# $Id: sysconfig,v 1.14.4.10 1996/06/05 02:36:39 jkh Exp $ +# $Id: sysconfig,v 1.14.4.11 1996/06/17 09:17:18 jkh Exp $ ######################### Start Of Local Configuration Section ########### diff --git a/games/Makefile b/games/Makefile index f342283519fcb..5bfba620baf49 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/31/94 -# $Id$ +# $Id: Makefile,v 1.9.4.4 1996/06/23 07:51:12 jkh Exp $ # XXX missing: chess ching monop [copyright] SUBDIR= adventure arithmetic atc backgammon battlestar bcd boggle bs caesar \ diff --git a/games/boggle/Makefile b/games/boggle/Makefile new file mode 100644 index 0000000000000..e16ddf254ecb3 --- /dev/null +++ b/games/boggle/Makefile @@ -0,0 +1,26 @@ +# @(#)Makefile 8.1 (Berkeley) 6/11/93 + +SUBDIR= boggle mkdict mkindex + +.if exists(${.CURDIR}/mkdict/obj) +MKDICT= ${.CURDIR}/mkdict/obj/mkdict +.else +MKDICT= ${.CURDIR}/mkdict/mkdict +.endif +.if exists(${.CURDIR}/mkindex/obj) +MKINDX= ${.CURDIR}/mkindex/obj/mkindex +.else +MKINDX= ${.CURDIR}/mkindex/mkindex +.endif + +afterdistribute afterinstall: + ${MKDICT} < ${.CURDIR}/../../share/dict/web2 > \ + ${DESTDIR}/usr/share/games/boggle/dictionary + ${MKINDX} < ${DESTDIR}/usr/share/games/boggle/dictionary > \ + ${DESTDIR}/usr/share/games/boggle/dictindex + chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/games/boggle/dictionary + chmod 444 ${DESTDIR}/usr/share/games/boggle/dictionary + chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/games/boggle/dictindex + chmod 444 ${DESTDIR}/usr/share/games/boggle/dictindex + +.include diff --git a/games/boggle/README b/games/boggle/README new file mode 100644 index 0000000000000..ac87da00bd003 --- /dev/null +++ b/games/boggle/README @@ -0,0 +1,65 @@ + +Bog is a fairly portable simulation of Parker Brother's game of Boggle and +is similar to the 4.[23] BSD "boggle" and Sun's "boggletool". +Bog has not been derived from any proprietary code. +It has been tested on the Sun 3 under SunOS 3.2 and on the Atari 1040ST (MWC). + +What You Need + +You will need curses/termcap and a large word list. +The minix word list or /usr/dict/words will do nicely. +The word list must already be sorted (you can use "sort -c" to check). + +Contents + + README - this file + Makefile + bog.man - half-hearted man page (use the game's help command) + bog.h - configuration and header info + bog.c - machine independent game code + word.c - machine independent word list routines + help.c - (curses) help routine + mach.c - (curses) display code + prtable.c - ditto + timer.c - machine dependent (os) input polling + mkdict.c - convert a word list to a bog dictionary + mkindex.c - create an index file for the bog dictionary + showdict.c - print a bog dictionary to stdout + +Portability + +- I've tried to make bog.c (the program logic) independent of the I/O. + My plan was to make it straightforward to adapt the game to run under a + windowing system (eg., Suntools, GEM). I have no plan to actually do this. + I've stuck to a small subset of the curses routines. +- The program runs with the input in raw mode. +- If you want the running timer you must #define TIMER in bog.h + and insert the input polling code in timer.c for your system. There is + already code there for BSD, SYSV, and ATARI. + +Setup + +1. Check bog.h and Makefile and edit to fit your environment +2. "make all" + This will make all the binaries and create the dictionary and index files +3. Move "dict", "dict.ind", and "helpfile" to where you specified in bog.h +4. Play away + +Distribution + +You may use this software for your enjoyment and you may share it with others. +You may not sell this software or use it for any commercial purposes +whatsoever. All modified versions of the software that you redistribute must +clearly indicate your changes. + +If you come across any bugs or make any changes you'd like to share please +send mail to me rather than posting to the net. + +Enjoy. [But beware: boggle can be addictive!] + +----- +Barry Brachman | UUCP: {alberta,uw-beaver,uunet}! +Dept. of Computer Science| ubc-vision!ubc-csgrads!brachman +Univ. of British Columbia| Internet: brachman@cs.ubc.ca +Vancouver, B.C. V6T 1W5 | brachman%ubc.csnet@csnet-relay.arpa +(604) 228-5010 | brachman@ubc.csnet diff --git a/games/boggle/boggle/Makefile b/games/boggle/boggle/Makefile new file mode 100644 index 0000000000000..0c26112646b26 --- /dev/null +++ b/games/boggle/boggle/Makefile @@ -0,0 +1,15 @@ +# @(#)Makefile 8.1 (Berkeley) 6/11/93 + +PROG= boggle +SRCS= bog.c help.c mach.c prtable.c timer.c word.c +DPADD= ${LIBCURSES} ${LIBTERMCAP} +LDADD= -lcurses -ltermcap +HIDEGAME=hidegame +MAN6= boggle.6 + +beforeinstall: + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/helpfile \ + ${DESTDIR}/usr/share/games/boggle/helpfile + +.include "../../Makefile.inc" +.include diff --git a/games/boggle/boggle/bog.c b/games/boggle/boggle/bog.c new file mode 100644 index 0000000000000..8b1cd50ba1afd --- /dev/null +++ b/games/boggle/boggle/bog.c @@ -0,0 +1,672 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char copyright[] = +"@(#) Copyright (c) 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +#ifndef lint +static char sccsid[] = "@(#)bog.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +#include +#include +#include +#include +#include + +#include "bog.h" +#include "extern.h" + +static int compar __P((const void *, const void *)); + +struct dictindex dictindex[26]; + +/* + * Cube position numbering: + * + * 0 1 2 3 + * 4 5 6 7 + * 8 9 A B + * C D E F + */ +static int adjacency[16][16] = { +/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ + { 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 0 */ + { 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 1 */ + { 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 2 */ + { 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 3 */ + { 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 }, /* 4 */ + { 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0 }, /* 5 */ + { 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 }, /* 6 */ + { 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, /* 7 */ + { 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0 }, /* 8 */ + { 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0 }, /* 9 */ + { 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1 }, /* A */ + { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1 }, /* B */ + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0 }, /* C */ + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0 }, /* D */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1 }, /* E */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0 } /* F */ +}; + +static int letter_map[26][16]; + +char board[17]; +int wordpath[MAXWORDLEN + 1]; +int wordlen; /* Length of last word returned by nextword() */ +int usedbits; + +char *pword[MAXPWORDS], pwords[MAXPSPACE], *pwordsp; +int npwords; + +char *mword[MAXMWORDS], mwords[MAXMSPACE], *mwordsp; +int nmwords; + +int ngames = 0; +int tnmwords = 0, tnpwords = 0; + +#include +jmp_buf env; + +long start_t; + +static FILE *dictfp; + +int batch; +int debug; +int minlength; +int reuse; +int tlimit; + +int +main(argc, argv) + int argc; + char *argv[]; +{ + long seed = 0; + int ch, done, i, selfuse, sflag; + char *bspec, *p; + + batch = debug = reuse = selfuse = sflag = 0; + bspec = NULL; + minlength = 3; + tlimit = 180; /* 3 minutes is standard */ + + while ((ch = getopt(argc, argv, "bds:t:w:")) != EOF) + switch(ch) { + case 'b': + batch = 1; + break; + case 'd': + debug = 1; + break; + case 's': + sflag = 1; + seed = atol(optarg); + break; + case 't': + if ((tlimit = atoi(optarg)) < 1) + errx(1, "bad time limit"); + break; + case 'w': + if ((minlength = atoi(optarg)) < 3) + errx(1, "min word length must be > 2"); + break; + case '?': + default: + usage(); + } + argc -= optind; + argv += optind; + + if (argv[0]) { /* any args left? */ + if (strcmp(argv[0], "+") == 0) + reuse = 1; + else if (strcmp(argv[0], "++") == 0) + selfuse = 1; + else if (islower(argv[0][0])) { + if (strlen(argv[0]) != 16) { + usage(); + + } else + /* This board is assumed to be valid... */ + bspec = argv[0]; + } + } + + if (batch && bspec == NULL) + errx(1, "must give both -b and a board setup"); + + if (selfuse) + for (i = 0; i < 16; i++) + adjacency[i][i] = 1; + + if (batch) { + newgame(bspec); + while ((p = batchword(stdin)) != NULL) + (void) printf("%s\n", p); + exit (0); + } + setup(sflag, seed); + prompt("Loading the dictionary..."); + if ((dictfp = opendict(DICT)) == NULL) { + warn("%s", DICT); + cleanup(); + exit(1); + } +#ifdef LOADDICT + if (loaddict(dictfp) < 0) { + warnx("can't load %s", DICT); + cleanup(); + exit(1); + } + (void)fclose(dictfp); + dictfp = NULL; +#endif + if (loadindex(DICTINDEX) < 0) { + warnx("can't load %s", DICTINDEX); + cleanup(); + exit(1); + } + + prompt("Type to begin..."); + while (inputch() != ' '); + + for (done = 0; !done;) { + newgame(bspec); + bspec = NULL; /* reset for subsequent games */ + playgame(); + prompt("Type to continue, any cap to quit..."); + delay(50); /* wait for user to quit typing */ + flushin(stdin); + for (;;) { + ch = inputch(); + if (ch == '\033') + findword(); + else if (ch == '\014' || ch == '\022') /* ^l or ^r */ + redraw(); + else { + if (isupper(ch)) { + done = 1; + break; + } + if (ch == ' ') + break; + } + } + } + cleanup(); + exit (0); +} + +/* + * Read a line from the given stream and check if it is legal + * Return a pointer to a legal word or a null pointer when EOF is reached + */ +char * +batchword(fp) + FILE *fp; +{ + register int *p, *q; + register char *w; + + q = &wordpath[MAXWORDLEN + 1]; + p = wordpath; + while (p < q) + *p++ = -1; + while ((w = nextword(fp)) != NULL) { + if (wordlen < minlength) + continue; + p = wordpath; + while (p < q && *p != -1) + *p++ = -1; + usedbits = 0; + if (checkword(w, -1, wordpath) != -1) + return (w); + } + return (NULL); +} + +/* + * Play a single game + * Reset the word lists from last game + * Keep track of the running stats + */ +void +playgame() +{ + /* Can't use register variables if setjmp() is used! */ + int i, *p, *q; + long t; + char buf[MAXWORDLEN + 1]; + + ngames++; + npwords = 0; + pwordsp = pwords; + nmwords = 0; + mwordsp = mwords; + + time(&start_t); + + q = &wordpath[MAXWORDLEN + 1]; + p = wordpath; + while (p < q) + *p++ = -1; + showboard(board); + startwords(); + if (setjmp(env)) { + badword(); + goto timesup; + } + + while (1) { + if (getline(buf) == NULL) { + if (feof(stdin)) + clearerr(stdin); + break; + } + time(&t); + if (t - start_t >= tlimit) { + badword(); + break; + } + if (buf[0] == '\0') { + int remaining; + + remaining = tlimit - (int) (t - start_t); + (void)snprintf(buf, sizeof(buf), + "%d:%02d", remaining / 60, remaining % 60); + showstr(buf, 1); + continue; + } + if (strlen(buf) < minlength) { + badword(); + continue; + } + + p = wordpath; + while (p < q && *p != -1) + *p++ = -1; + usedbits = 0; + + if (checkword(buf, -1, wordpath) < 0) + badword(); + else { + if (debug) { + (void) printf("["); + for (i = 0; wordpath[i] != -1; i++) + (void) printf(" %d", wordpath[i]); + (void) printf(" ]\n"); + } + for (i = 0; i < npwords; i++) { + if (strcmp(pword[i], buf) == 0) + break; + } + if (i != npwords) { /* already used the word */ + badword(); + showword(i); + } + else if (!validword(buf)) + badword(); + else { + int len; + + len = strlen(buf) + 1; + if (npwords == MAXPWORDS - 1 || + pwordsp + len >= &pwords[MAXPSPACE]) { + warnx("Too many words!"); + cleanup(); + exit(1); + } + pword[npwords++] = pwordsp; + (void) strcpy(pwordsp, buf); + pwordsp += len; + addword(buf); + } + } + } + +timesup: ; + + /* + * Sort the player's words and terminate the list with a null + * entry to help out checkdict() + */ + qsort(pword, npwords, sizeof(pword[0]), compar); + pword[npwords] = NULL; + + /* + * These words don't need to be sorted since the dictionary is sorted + */ + checkdict(); + + tnmwords += nmwords; + tnpwords += npwords; + + results(); +} + +/* + * Check if the given word is present on the board, with the constraint + * that the first letter of the word is adjacent to square 'prev' + * Keep track of the current path of squares for the word + * A 'q' must be followed by a 'u' + * Words must end with a null + * Return 1 on success, -1 on failure + */ +int +checkword(word, prev, path) + char *word; + int prev, *path; +{ + register char *p, *q; + register int i, *lm; + + if (debug) { + (void) printf("checkword(%s, %d, [", word, prev); + for (i = 0; wordpath[i] != -1; i++) + (void) printf(" %d", wordpath[i]); + (void) printf(" ]\n"); + } + + if (*word == '\0') + return (1); + + lm = letter_map[*word - 'a']; + + if (prev == -1) { + char subword[MAXWORDLEN + 1]; + + /* + * Check for letters not appearing in the cube to eliminate some + * recursive calls + * Fold 'qu' into 'q' + */ + p = word; + q = subword; + while (*p != '\0') { + if (*letter_map[*p - 'a'] == -1) + return (-1); + *q++ = *p; + if (*p++ == 'q') { + if (*p++ != 'u') + return (-1); + } + } + *q = '\0'; + while (*lm != -1) { + *path = *lm; + usedbits |= (1 << *lm); + if (checkword(subword + 1, *lm, path + 1) > 0) + return (1); + usedbits &= ~(1 << *lm); + lm++; + } + return (-1); + } + + /* + * A cube is only adjacent to itself in the adjacency matrix if selfuse + * was set, so a cube can't be used twice in succession if only the + * reuse flag is set + */ + for (i = 0; lm[i] != -1; i++) { + if (adjacency[prev][lm[i]]) { + int used; + + used = 1 << lm[i]; + /* + * If necessary, check if the square has already + * been used. + */ + if (!reuse && (usedbits & used)) + continue; + *path = lm[i]; + usedbits |= used; + if (checkword(word + 1, lm[i], path + 1) > 0) + return (1); + usedbits &= ~used; + } + } + *path = -1; /* in case of a backtrack */ + return (-1); +} + +/* + * A word is invalid if it is not in the dictionary + * At this point it is already known that the word can be formed from + * the current board + */ +int +validword(word) + char *word; +{ + register int j; + register char *q, *w; + + j = word[0] - 'a'; + if (dictseek(dictfp, dictindex[j].start, 0) < 0) { + (void) fprintf(stderr, "Seek error\n"); + cleanup(); + exit(1); + } + + while ((w = nextword(dictfp)) != NULL) { + int ch; + + if (*w != word[0]) /* end of words starting with word[0] */ + break; + q = word; + while ((ch = *w++) == *q++ && ch != '\0') + ; + if (*(w - 1) == '\0' && *(q - 1) == '\0') + return (1); + } + if (dictfp != NULL && feof(dictfp)) /* Special case for z's */ + clearerr(dictfp); + return (0); +} + +/* + * Check each word in the dictionary against the board + * Delete words from the machine list that the player has found + * Assume both the dictionary and the player's words are already sorted + */ +void +checkdict() +{ + register char *p, **pw, *w; + register int i; + int prevch, previndex, *pi, *qi, st; + + mwordsp = mwords; + nmwords = 0; + pw = pword; + prevch ='a'; + qi = &wordpath[MAXWORDLEN + 1]; + + (void) dictseek(dictfp, 0L, 0); + while ((w = nextword(dictfp)) != NULL) { + if (wordlen < minlength) + continue; + if (*w != prevch) { + /* + * If we've moved on to a word with a different first + * letter then we can speed things up by skipping all + * words starting with a letter that doesn't appear in + * the cube. + */ + i = (int) (*w - 'a'); + while (i < 26 && letter_map[i][0] == -1) + i++; + if (i == 26) + break; + previndex = prevch - 'a'; + prevch = i + 'a'; + /* + * Fall through if the word's first letter appears in + * the cube (i.e., if we can't skip ahead), otherwise + * seek to the beginning of words in the dictionary + * starting with the next letter (alphabetically) + * appearing in the cube and then read the first word. + */ + if (i != previndex + 1) { + if (dictseek(dictfp, + dictindex[i].start, 0) < 0) { + warnx("seek error in checkdict()"); + cleanup(); + exit(1); + } + continue; + } + } + + pi = wordpath; + while (pi < qi && *pi != -1) + *pi++ = -1; + usedbits = 0; + if (checkword(w, -1, wordpath) == -1) + continue; + + st = 1; + while (*pw != NULL && (st = strcmp(*pw, w)) < 0) + pw++; + if (st == 0) /* found it */ + continue; + if (nmwords == MAXMWORDS || + mwordsp + wordlen + 1 >= &mwords[MAXMSPACE]) { + warnx("too many words!"); + cleanup(); + exit(1); + } + mword[nmwords++] = mwordsp; + p = w; + while (*mwordsp++ = *p++); + } +} + +/* + * Crank up a new game + * If the argument is non-null then it is assumed to be a legal board spec + * in ascending cube order, oth. make a random board + */ +void +newgame(b) + char *b; +{ + register int i, p, q; + char *tmp; + int *lm[26]; + static char *cubes[16] = { + "ednosw", "aaciot", "acelrs", "ehinps", + "eefhiy", "elpstu", "acdemp", "gilruw", + "egkluy", "ahmors", "abilty", "adenvz", + "bfiorx", "dknotu", "abjmoq", "egintv" + }; + + if (b == NULL) { + /* + * Shake the cubes and make the board + */ + i = 0; + while (i < 100) { + p = (int) (random() % 16); + q = (int) (random() % 16); + if (p != q) { + tmp = cubes[p]; + cubes[p] = cubes[q]; + cubes[q] = tmp; + i++; + } + /* else try again */ + } + + for (i = 0; i < 16; i++) + board[i] = cubes[i][random() % 6]; + } + else { + for (i = 0; i < 16; i++) + board[i] = b[i]; + } + board[16] = '\0'; + + /* + * Set up the map from letter to location(s) + * Each list is terminated by a -1 entry + */ + for (i = 0; i < 26; i++) { + lm[i] = letter_map[i]; + *lm[i] = -1; + } + + for (i = 0; i < 16; i++) { + register int j; + + j = (int) (board[i] - 'a'); + *lm[j] = i; + *(++lm[j]) = -1; + } + + if (debug) { + for (i = 0; i < 26; i++) { + int ch, j; + + (void) printf("%c:", 'a' + i); + for (j = 0; (ch = letter_map[i][j]) != -1; j++) + (void) printf(" %d", ch); + (void) printf("\n"); + } + } + +} + +int +compar(p, q) + const void *p, *q; +{ + return (strcmp(*(char **)p, *(char **)q)); +} + +void +usage() +{ + (void) fprintf(stderr, + "usage: bog [-bd] [-s#] [-t#] [-w#] [+[+]] [boardspec]\n"); + exit(1); +} diff --git a/games/boggle/boggle/bog.h b/games/boggle/boggle/bog.h new file mode 100644 index 0000000000000..a25f1d751f40b --- /dev/null +++ b/games/boggle/boggle/bog.h @@ -0,0 +1,85 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)bog.h 8.1 (Berkeley) 6/11/93 + */ + +#define LOADDICT 1 /* Load the dictionary for speed */ + +/* + * Locations for the dictionary (generated by mkdict), + * index (generated by mkindex), and helpfile + */ +#define DICT "/usr/share/games/boggle/dictionary" +#define DICTINDEX "/usr/share/games/boggle/dictindex" +#define HELPFILE "/usr/share/games/boggle/helpfile" + +/* + * The theoretical maximum for MAXWORDLEN is ('a' - 1) == 96 + */ +#define MAXWORDLEN 40 /* Maximum word length */ +#define MAXPWORDS 200 /* Maximum number of player's words */ +#define MAXMWORDS 200 /* Maximum number of machine's words */ +#define MAXPSPACE 2000 /* Space for player's words */ +#define MAXMSPACE 4000 /* Space for machines's words */ + +#define MAXCOLS 20 + +/* + * The following determine the screen layout + */ +#define PROMPT_COL 20 +#define PROMPT_LINE 2 + +#define BOARD_COL 0 +#define BOARD_LINE 0 + +#define SCORE_COL 20 +#define SCORE_LINE 0 + +#define LIST_COL 0 +#define LIST_LINE 10 + +#define TIMER_COL 20 +#define TIMER_LINE 2 + +/* + * Internal dictionary index + * Initialized from the file created by mkindex + */ +struct dictindex { + long start; + long length; +}; diff --git a/games/boggle/boggle/boggle.6 b/games/boggle/boggle/boggle.6 new file mode 100644 index 0000000000000..2b9f3053775d8 --- /dev/null +++ b/games/boggle/boggle/boggle.6 @@ -0,0 +1,114 @@ +.\" Copyright (c) 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" Barry Brachman. +.\" +.\" 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. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. 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. +.\" +.\" @(#)boggle.6 8.1 (Berkeley) 6/11/93 +.\" +.TH BOGGLE 6 "June 11, 1993" +.UC +.SH NAME +boggle \- word search game +.SH SYNOPSIS +boggle [-bd] [-s seed] [-t time] [-w length] [+[+]] [boardspec] +.SH DESCRIPTION +The object of +.I boggle +is to find as many words as possible on the Boggle board within the three +minute time limit. +A Boggle board is a four by four arrangement of Boggle cubes, each side of +each cube displaying a letter of the alphabet or `qu'. +Words are formed by finding a sequence of cubes (letters) that are in the +game's dictionary. +The (N+1)th cube in the word must be horizontally, +vertically, or diagonally adjacent to the Nth cube. +Cubes cannot be reused. +Words consist solely of lower case letters and must be at least 3 letters long. +.PP +Command line flags can be given to change the rules of the game. +The +.B + +flag allows a cube to be used multiple times, but not in succession. +The +.B ++ +flag allows the same cubes to be considered adjacent to itself. +.B +A seed other than the time of day is specified by +.B -s#, +where +.B # +is the seed. +The time limit can be changed from the default 3 minutes by using the flag +.B -t#, +where +.B # +is the duration (in seconds) of each game. +The minimum word length can be changed from 3 letters by specifying +.B -w#, +where +.B # +is the minimum number of letters to use. +.PP +A starting board position can be specified on the command line by +listing the board left to right and top to bottom. +.PP +The +.B -b +flag puts +.I boggle +in batch mode. +A +.B boardspec +must also be given. +The dictionary is read from stdin and a list of words appearing in +.B boardspec +is printed to stdout. +.PP +Help is available during play by typing `?'. +More detailed information on the game is given there. +.SH BUGS +If there are a great many words in the cube the final display of the words +may scroll off of the screen. (On a 25 line screen about 130 words can be +displayed.) +.sp 2 +No word can contain a 'q' that is not immediately followed by a 'u'. +.sp 2 +When using the '+' or '++' options the display of words found in the board +doesn't indicate reused cubes. +.SH AUTHOR +Boggle is a trademark of Parker Brothers. +.br +Barry Brachman +.br +Dept. of Computer Science +.br +University of British Columbia diff --git a/games/boggle/boggle/extern.h b/games/boggle/boggle/extern.h new file mode 100644 index 0000000000000..9761c4f66d7c5 --- /dev/null +++ b/games/boggle/boggle/extern.h @@ -0,0 +1,71 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)extern.h 8.1 (Berkeley) 6/11/93 + */ + +void addword __P((char *)); +void badword __P((void)); +char *batchword __P((FILE *)); +void checkdict __P((void)); +int checkword __P((char *, int, int *)); +void cleanup __P((void)); +void delay __P((int)); +long dictseek __P((FILE *, long, int)); +void findword __P((void)); +void flushin __P((FILE *)); +char *getline __P((char *)); +void getword __P((char *)); +int help __P((void)); +int inputch __P((void)); +int loaddict __P((FILE *)); +int loadindex __P((char *)); +void newgame __P((char *)); +char *nextword __P((FILE *)); +FILE *opendict __P((char *)); +void playgame __P((void)); +void prompt __P((char *)); +void prtable __P((char *[], + int, int, int, void (*)(char *[], int), int (*)(char *[], int))); +void putstr __P((char *)); +void redraw __P((void)); +void results __P((void)); +int setup __P((int, long)); +void showboard __P((char *)); +void showstr __P((char *, int)); +void showword __P((int)); +void starttime __P((void)); +void startwords __P((void)); +void stoptime __P((void)); +int timerch __P((void)); +void usage __P((void)); +int validword __P((char *)); diff --git a/games/boggle/boggle/help.c b/games/boggle/boggle/help.c new file mode 100644 index 0000000000000..684c0ff60bd9c --- /dev/null +++ b/games/boggle/boggle/help.c @@ -0,0 +1,101 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +#include +#include + +#include "bog.h" +#include "extern.h" + +int +help() +{ + extern int nlines; + int eof, i; + FILE *fp; + WINDOW *win; + char buf[BUFSIZ]; + + if ((fp = fopen(HELPFILE, "r")) == NULL) + return(-1); + win = newwin(0, 0, 0, 0); + clearok(win, 1); + + eof = 0; + if (ungetc(getc(fp), fp) == EOF) { + wprintw(win, "There doesn't seem to be any help."); + eof = 1; /* Nothing there... */ + } + + while (!eof) { + for (i = 0; i < nlines - 3; i++) { + if (fgets(buf, sizeof(buf), fp) == (char *) NULL) { + eof = 1; + break; + } + if (buf[0] == '.' && buf[1] == '\n') + break; + wprintw(win, "%s", buf); + } + if (eof || ungetc(getc(fp), fp) == EOF) { + eof = 1; + break; + } + wmove(win, nlines - 1, 0); + wprintw(win, + "Type to continue, anything else to quit..."); + wrefresh(win); + if ((inputch() & 0177) != ' ') + break; + wclear(win); + } + + fclose(fp); + if (eof) { + wmove(win, nlines - 1, 0); + wprintw(win, "Hit any key to continue..."); + wrefresh(win); + inputch(); + } + delwin(win); + clearok(stdscr, 1); + refresh(); + return(0); +} diff --git a/games/boggle/boggle/helpfile b/games/boggle/boggle/helpfile new file mode 100644 index 0000000000000..c511efe7e1ad9 --- /dev/null +++ b/games/boggle/boggle/helpfile @@ -0,0 +1,92 @@ + +Commands: + +Enter word: or or +Delete previous character: or +Delete line: <^u> or <^w> +Redraw screen: <^l> or <^r> +Pause game: <^s> +Resume game: <^q> or <^s> +Suspend game (BSD only): <^z> +Give up on current cube: <^d> +Show remaining time: first thing on a line +Show help: ? (Suspends timer until done) +Exit game: <^c> + +(^u means "control u", etc.) + +[Note for users of versions of this program that do not display a timer: +The first word entered after the timer has run out causes a list of all the +words you found, the words you missed, and your running statistics to be +displayed.] + +Any time you are prompted while the board is displayed you can type: + word +to see where "word" is on the board. + +Usage: + bog [-b] [-d] [-s#] [-t#] [-w#] [+[+]] [boardspec] + + -b: batch mode (boardspec must be present); dictionary read from stdin + -d: debug mode + -s#: use # as the random number seed + -t#: time limit is # seconds instead of default 180 + -w#: minimum word length is # letters instead of default 3 + +: can reuse a cube, but not twice in succession + ++: can reuse cubes arbitrarily + boardspec: the first board to use (use 'q' for 'qu'); e.g.: + bog nolezeebnqieegei +. + Default Rules + +A Boggle board is a four by four arrangement of Boggle cubes. +You have 3 minutes to find as many words as possible in the Boggle board. +Words are formed by finding a sequence of cubes (letters) that are in the +game's dictionary. The (N+1)th cube in the word must be horizontally, +vertically, or diagonally adjacent to the Nth cube. Cubes cannot be reused. +Words consist solely of lower case letters and must be at least 3 letters long. +. + Options + +Command line flags can be given to change the rules of the game. +The '+' flag allows a cube to be used multiple times, but not in succession. +The '++' flag makes each cube adjacent to itself. +The time limit can be changed from the default 3 minutes by using the flag +'-t#', where # is the duration (in seconds) of each game. +The minimum word length can be changed from 3 letters by specifying 'w#', +where # is the minimum number of letters to use. +. + Bugs and Limitations + +The following bugs and problems are known to exist: + +- If there are a great many words in the cube the final display of the words + may scroll off of the screen. (On a 25 line screen about 130 words can be + displayed.) + +- Computing the complete word list can be too slow on small machines. + +- No word can contain a 'q' that is not immediately followed by a 'u'. + +- When using the '+' or '++' options the display of words found in the board + doesn't indicate reused cubes. +. + About This Program + +Permission is given to freely copy and distribute this software providing: + +1) You do not sell it, +2) You do not use it for commercial advantage, +3) If you pass the program on you must make the source code available, and +4) This notice must accompany the distribution + +Please notify the author of any bugs or if you have any suggestions. + +Copyright (c) 1988 +Barry Brachman | UUCP: {alberta,uw-beaver,uunet}! +Dept. of Computer Science| ubc-vision!ubc-csgrads!brachman +Univ. of British Columbia| Internet: brachman@cs.ubc.ca +Vancouver, B.C. V6T 1W5 | brachman%ubc.csnet@csnet-relay.arpa +(604) 228-5010 | brachman@ubc.csnet + +Boggle is a trademark of Parker Brothers. diff --git a/games/boggle/boggle/mach.c b/games/boggle/boggle/mach.c new file mode 100644 index 0000000000000..ea6071145dbd2 --- /dev/null +++ b/games/boggle/boggle/mach.c @@ -0,0 +1,676 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +/* + * Terminal interface + * + * Input is raw and unechoed + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bog.h" +#include "extern.h" + +static int ccol, crow, maxw; +static int colstarts[MAXCOLS], ncolstarts; +static int lastline; +int ncols, nlines; + +extern char *pword[], *mword[]; +extern int ngames, nmwords, npwords, tnmwords, tnpwords; + +static void cont_catcher __P((int)); +static int prwidth __P((char *[], int)); +static void prword __P((char *[], int)); +static void stop_catcher __P((int)); +static void tty_cleanup __P((void)); +static int tty_setup __P((void)); +static void tty_showboard __P((char *)); +static void winch_catcher __P((int)); + +/* + * Do system dependent initialization + * This is called once, when the program starts + */ +int +setup(sflag, seed) + int sflag; + long seed; +{ + extern int debug; + + if (tty_setup() < 0) + return(-1); + + if (!sflag) + time(&seed); + srandom(seed); + if (debug) + (void) printf("seed = %ld\n", seed); + return(0); +} + +/* + * Do system dependent clean up + * This is called once, just before the program terminates + */ +void +cleanup() +{ + tty_cleanup(); +} + +/* + * Display the player's word list, the list of words not found, and the running + * stats + */ +void +results() +{ + int col, row; + int denom1, denom2; + + move(LIST_LINE, LIST_COL); + clrtobot(); + printw("Words you found (%d):", npwords); + refresh(); + move(LIST_LINE + 1, LIST_COL); + prtable(pword, npwords, 0, ncols, prword, prwidth); + + getyx(stdscr, row, col); + move(row + 1, col); + printw("Words you missed (%d):", nmwords); + refresh(); + move(row + 2, col); + prtable(mword, nmwords, 0, ncols, prword, prwidth); + + denom1 = npwords + nmwords; + denom2 = tnpwords + tnmwords; + + move(SCORE_LINE, SCORE_COL); + printw("Percentage: %0.2f%% (%0.2f%% over %d game%s)\n", + denom1 ? (100.0 * npwords) / (double) (npwords + nmwords) : 0.0, + denom2 ? (100.0 * tnpwords) / (double) (tnpwords + tnmwords) : 0.0, + ngames, ngames > 1 ? "s" : ""); +} + +static void +prword(base, indx) + char *base[]; + int indx; +{ + printw("%s", base[indx]); +} + +static int +prwidth(base, indx) + char *base[]; + int indx; +{ + return (strlen(base[indx])); +} + +/* + * Main input routine + * + * - doesn't accept words longer than MAXWORDLEN or containing caps + */ +char * +getline(q) + char *q; +{ + register int ch, done; + register char *p; + int row, col; + + p = q; + done = 0; + while (!done) { + ch = timerch(); + switch (ch) { + case '\n': + case '\r': + case ' ': + done = 1; + break; + case '\033': + findword(); + break; + case '\177': /* */ + case '\010': /* */ + if (p == q) + break; + p--; + getyx(stdscr, row, col); + move(row, col - 1); + clrtoeol(); + refresh(); + break; + case '\025': /* <^u> */ + case '\027': /* <^w> */ + if (p == q) + break; + getyx(stdscr, row, col); + move(row, col - (int) (p - q)); + p = q; + clrtoeol(); + refresh(); + break; +#ifdef SIGTSTP + case '\032': /* <^z> */ + stop_catcher(0); + break; +#endif + case '\023': /* <^s> */ + stoptime(); + printw(""); + refresh(); + while ((ch = inputch()) != '\021' && ch != '\023') + ; + move(crow, ccol); + clrtoeol(); + refresh(); + starttime(); + break; + case '\003': /* <^c> */ + cleanup(); + exit(0); + /*NOTREACHED*/ + case '\004': /* <^d> */ + done = 1; + ch = EOF; + break; + case '\014': /* <^l> */ + case '\022': /* <^r> */ + redraw(); + break; + case '?': + stoptime(); + if (help() < 0) + showstr("Can't open help file", 1); + starttime(); + break; + default: + if (!islower(ch)) + break; + if ((int) (p - q) == MAXWORDLEN) { + p = q; + badword(); + break; + } + *p++ = ch; + addch(ch); + refresh(); + break; + } + } + *p = '\0'; + if (ch == EOF) + return((char *) NULL); + return(q); +} + +int +inputch() +{ + return (getch() & 0177); +} + +void +redraw() +{ + clearok(stdscr, 1); + refresh(); +} + +void +flushin(fp) + FILE *fp; +{ + int arg; + + arg = FREAD; + (void)ioctl(fileno(fp), TIOCFLUSH, &arg); +} + +static int gone; + +/* + * Stop the game timer + */ +void +stoptime() +{ + extern long start_t; + long t; + + (void)time(&t); + gone = (int) (t - start_t); +} + +/* + * Restart the game timer + */ +void +starttime() +{ + extern long start_t; + long t; + + (void)time(&t); + start_t = t - (long) gone; +} + +/* + * Initialize for the display of the player's words as they are typed + * This display starts at (LIST_LINE, LIST_COL) and goes "down" until the last + * line. After the last line a new column is started at LIST_LINE + * Keep track of each column position for showword() + * There is no check for exceeding COLS + */ +void +startwords() +{ + crow = LIST_LINE; + ccol = LIST_COL; + maxw = 0; + ncolstarts = 1; + colstarts[0] = LIST_COL; + move(LIST_LINE, LIST_COL); + refresh(); +} + +/* + * Add a word to the list and start a new column if necessary + * The maximum width of the current column is maintained so we know where + * to start the next column + */ +void +addword(w) + char *w; +{ + int n; + + if (crow == lastline) { + crow = LIST_LINE; + ccol += (maxw + 5); + colstarts[ncolstarts++] = ccol; + maxw = 0; + move(crow, ccol); + } + else { + move(++crow, ccol); + if ((n = strlen(w)) > maxw) + maxw = n; + } + refresh(); +} + +/* + * The current word is unacceptable so erase it + */ +void +badword() +{ + + move(crow, ccol); + clrtoeol(); + refresh(); +} + +/* + * Highlight the nth word in the list (starting with word 0) + * No check for wild arg + */ +void +showword(n) + int n; +{ + int col, row; + + row = LIST_LINE + n % (lastline - LIST_LINE + 1); + col = colstarts[n / (lastline - LIST_LINE + 1)]; + move(row, col); + standout(); + printw("%s", pword[n]); + standend(); + move(crow, ccol); + refresh(); + delay(15); + move(row, col); + printw("%s", pword[n]); + move(crow, ccol); + refresh(); +} + +/* + * Get a word from the user and check if it is in either of the two + * word lists + * If it's found, show the word on the board for a short time and then + * erase the word + * + * Note: this function knows about the format of the board + */ +void +findword() +{ + int c, col, found, i, r, row; + char buf[MAXWORDLEN + 1]; + extern char board[]; + extern int usedbits, wordpath[]; + extern char *mword[], *pword[]; + extern int nmwords, npwords; + + getyx(stdscr, r, c); + getword(buf); + found = 0; + for (i = 0; i < npwords; i++) { + if (strcmp(buf, pword[i]) == 0) { + found = 1; + break; + } + } + if (!found) { + for (i = 0; i < nmwords; i++) { + if (strcmp(buf, mword[i]) == 0) { + found = 1; + break; + } + } + } + for (i = 0; i < MAXWORDLEN; i++) + wordpath[i] = -1; + usedbits = 0; + if (!found || checkword(buf, -1, wordpath) == -1) { + move(r, c); + clrtoeol(); + addstr("[???]"); + refresh(); + delay(10); + move(r, c); + clrtoeol(); + refresh(); + return; + } + + standout(); + for (i = 0; wordpath[i] != -1; i++) { + row = BOARD_LINE + (wordpath[i] / 4) * 2 + 1; + col = BOARD_COL + (wordpath[i] % 4) * 4 + 2; + move(row, col); + if (board[wordpath[i]] == 'q') + printw("Qu"); + else + printw("%c", toupper(board[wordpath[i]])); + move(r, c); + refresh(); + delay(5); + } + + standend(); + + for (i = 0; wordpath[i] != -1; i++) { + row = BOARD_LINE + (wordpath[i] / 4) * 2 + 1; + col = BOARD_COL + (wordpath[i] % 4) * 4 + 2; + move(row, col); + if (board[wordpath[i]] == 'q') + printw("Qu"); + else + printw("%c", toupper(board[wordpath[i]])); + } + move(r, c); + clrtoeol(); + refresh(); +} + +/* + * Display a string at the current cursor position for the given number of secs + */ +void +showstr(str, delaysecs) + char *str; + int delaysecs; +{ + addstr(str); + refresh(); + delay(delaysecs * 10); + move(crow, ccol); + clrtoeol(); + refresh(); +} + +void +putstr(s) + char *s; +{ + addstr(s); +} + +/* + * Get a valid word and put it in the buffer + */ +void +getword(q) + char *q; +{ + int ch, col, done, i, row; + char *p; + + done = 0; + i = 0; + p = q; + addch('['); + refresh(); + while (!done && i < MAXWORDLEN - 1) { + ch = getch() & 0177; + switch (ch) { + case '\177': /* */ + case '\010': /* */ + if (p == q) + break; + p--; + getyx(stdscr, row, col); + move(row, col - 1); + clrtoeol(); + break; + case '\025': /* <^u> */ + case '\027': /* <^w> */ + if (p == q) + break; + getyx(stdscr, row, col); + move(row, col - (int) (p - q)); + p = q; + clrtoeol(); + break; + case ' ': + case '\n': + case '\r': + done = 1; + break; + case '\014': /* <^l> */ + case '\022': /* <^r> */ + clearok(stdscr, 1); + refresh(); + break; + default: + if (islower(ch)) { + *p++ = ch; + addch(ch); + i++; + } + break; + } + refresh(); + } + *p = '\0'; + addch(']'); + refresh(); +} + +void +showboard(b) + char *b; +{ + tty_showboard(b); +} + +void +prompt(mesg) + char *mesg; +{ + move(PROMPT_LINE, PROMPT_COL); + printw("%s", mesg); + move(PROMPT_LINE + 1, PROMPT_COL); + refresh(); +} + +static int +tty_setup() +{ + initscr(); + raw(); + noecho(); + + /* + * Does curses look at the winsize structure? + * Should handle SIGWINCH ... + */ + nlines = LINES; + lastline = nlines - 1; + ncols = COLS; + + (void) signal(SIGTSTP, stop_catcher); + (void) signal(SIGCONT, cont_catcher); + (void) signal(SIGWINCH, winch_catcher); + return(0); +} + +static void +stop_catcher(signo) + int signo; +{ + stoptime(); + noraw(); + echo(); + move(nlines - 1, 0); + refresh(); + + (void) signal(SIGTSTP, SIG_DFL); + (void) sigsetmask(sigblock(0) & ~(1 << (SIGTSTP-1))); + (void) kill(0, SIGTSTP); + (void) signal(SIGTSTP, stop_catcher); +} + +static void +cont_catcher(signo) + int signo; +{ + (void) signal(SIGCONT, cont_catcher); + noecho(); + raw(); + clearok(stdscr, 1); + move(crow, ccol); + refresh(); + starttime(); +} + +/* + * The signal is caught but nothing is done about it... + * It would mean reformatting the entire display + */ +static void +winch_catcher(signo) + int signo; +{ + struct winsize win; + + (void) signal(SIGWINCH, winch_catcher); + (void) ioctl(fileno(stdout), TIOCGWINSZ, &win); + /* + LINES = win.ws_row; + COLS = win.ws_col; + */ +} + +static void +tty_cleanup() +{ + move(nlines - 1, 0); + refresh(); + noraw(); + echo(); + endwin(); +} + +static void +tty_showboard(b) + char *b; +{ + register int i; + int line; + + clear(); + move(BOARD_LINE, BOARD_COL); + line = BOARD_LINE; + printw("+---+---+---+---+"); + move(++line, BOARD_COL); + for (i = 0; i < 16; i++) { + if (b[i] == 'q') + printw("| Qu"); + else + printw("| %c ", toupper(b[i])); + if ((i + 1) % 4 == 0) { + printw("|"); + move(++line, BOARD_COL); + printw("+---+---+---+---+"); + move(++line, BOARD_COL); + } + } + move(SCORE_LINE, SCORE_COL); + printw("Type '?' for help"); + refresh(); +} diff --git a/games/boggle/boggle/prtable.c b/games/boggle/boggle/prtable.c new file mode 100644 index 0000000000000..f62e00d8c6f7d --- /dev/null +++ b/games/boggle/boggle/prtable.c @@ -0,0 +1,127 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)prtable.c 8.1 (Berkeley) 6/11/93 + */ + +#include + +#include "extern.h" + +#define NCOLS 5 + +static int get_maxlen __P((char *[], int, int (*)(char **, int))); + +/* + * Routine to print a table + * Modified from 'ls.c' mods (BJB/83) + * Arguments: + * base - address of first entry + * num - number of entries + * d_cols - number of columns to use if > 0, "best" size if == 0 + * width - max line width if not zero + * prentry - address of the routine to call to print the string + * length - address of the routine to call to determine the length + * of string to be printed + * + * prtable and length are called with the the address of the base and + * an index + */ +void +prtable(base, num, d_cols, width, prentry, length) + char *base[]; + int num, d_cols, width; + void (*prentry) __P((char *[], int)); + int (*length) __P((char *[], int)); +{ + register int c, j; + register int a, b, cols, loc, maxlen, nrows, z; + int col, row; + + if (num == 0) + return; + maxlen = get_maxlen(base, num, length) + 1; + if (d_cols > 0) + cols = d_cols; + else + cols = width / maxlen; + if (cols == 0) + cols = NCOLS; + nrows = (num - 1) / cols + 1; + for (a = 1; a <= nrows; a++) { + b = c = z = loc = 0; + for (j = 0; j < num; j++) { + c++; + if (c >= a + b) + break; + } + while (j < num) { + (*prentry)(base, j); + loc += (*length)(base, j); + z++; + b += nrows; + for (j++; j < num; j++) { + c++; + if (c >= a + b) + break; + } + if (j < num) { + while (loc < z * maxlen) { + addch(' '); + loc++; + } + } + } + getyx(stdscr, row, col); + move(row + 1, 0); + } + refresh(); +} + +static int +get_maxlen(base, num, length) + char *base[]; + int num; + int (*length) __P((char **, int)); +{ + register int i, len, max; + + max = (*length)(base, 0); + for (i = 0; i < num; i++) { + if ((len = (*length)(base, i)) > max) + max = len; + } + return(max); +} diff --git a/games/boggle/boggle/timer.c b/games/boggle/boggle/timer.c new file mode 100644 index 0000000000000..f4ed6b8c334ad --- /dev/null +++ b/games/boggle/boggle/timer.c @@ -0,0 +1,119 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char sccsid[] = "@(#)timer.c 8.2 (Berkeley) 2/22/94"; +#endif /* not lint */ + +#include +#include + +#include +#include +#include +#include +#include + +#include "bog.h" +#include "extern.h" + +static int waitch __P((long)); + +/* + * Update the display of the remaining time while waiting for a character + * If time runs out do a longjmp() to the game controlling routine, returning + * non-zero; oth. return the character + * Leave the cursor where it was initially + */ +int +timerch() +{ + extern int tlimit; + extern long start_t; + extern jmp_buf env; + long prevt, t; + int col, remaining, row; + + getyx(stdscr, row, col); + prevt = 0L; + for (;;) { + if (waitch(1000L) == 1) + break; + time(&t); + if (t == prevt) + continue; + prevt = t; + remaining = tlimit - (int) (t - start_t); + if (remaining < 0) { + longjmp(env, 1); + /*NOTREACHED*/ + } + move(TIMER_LINE, TIMER_COL); + printw("%d:%02d", remaining / 60, remaining % 60); + move(row, col); + refresh(); + } + return (getch() & 0177); +} + +/* + * Wait up to 'delay' microseconds for input to appear + * Returns 1 if input is ready, 0 oth. + */ +static int +waitch(delay) + long delay; +{ + fd_set fdbits; + struct timeval duration; + + duration.tv_sec = 0; + duration.tv_usec = delay; + FD_ZERO(&fdbits); + FD_SET(STDIN_FILENO, &fdbits); + return (select(32, &fdbits, NULL, NULL, &duration)); +} + +void +delay(tenths) + int tenths; +{ + struct timeval duration; + + duration.tv_usec = (tenths % 10 ) * 100000L; + duration.tv_sec = (long) (tenths / 10); + select(32, 0, 0, 0, &duration); +} diff --git a/games/boggle/boggle/word.c b/games/boggle/boggle/word.c new file mode 100644 index 0000000000000..ed4cf28cfaca4 --- /dev/null +++ b/games/boggle/boggle/word.c @@ -0,0 +1,216 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char sccsid[] = "@(#)word.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +#include +#include + +#include +#include +#include + +#include "bog.h" +#include "extern.h" + +static char *dictspace, *dictend; +static char *sp; + +static int first = 1, lastch = 0; + +/* + * Return the next word in the compressed dictionary in 'buffer' or + * NULL on end-of-file + */ +char * +nextword(fp) + FILE *fp; +{ + extern int wordlen; + register int ch, pcount; + register char *p; + static char buf[MAXWORDLEN + 1]; + + if (fp == NULL) { + if (sp == dictend) + return (NULL); + + p = buf + (int) *sp++; + + /* + * The dictionary ends with a null byte + */ + while (*sp >= 'a') + if ((*p++ = *sp++) == 'q') + *p++ = 'u'; + } else { + if (first) { + if ((pcount = getc(fp)) == EOF) + return (NULL); + first = 0; + } else if ((pcount = lastch) == EOF) + return (NULL); + + p = buf + pcount; + + while ((ch = getc(fp)) != EOF && ch >= 'a') + if ((*p++ = ch) == 'q') + *p++ = 'u'; + lastch = ch; + } + wordlen = (int) (p - buf); + *p = '\0'; + return (buf); +} + +/* + * Reset the state of nextword() and do the fseek() + */ +long +dictseek(fp, offset, ptrname) + FILE *fp; + long offset; + int ptrname; +{ + if (fp == NULL) { + if ((sp = dictspace + offset) >= dictend) + return (-1); + return (0); + } + + first = 1; + return (fseek(fp, offset, ptrname)); +} + +FILE * +opendict(dict) + char *dict; +{ + FILE *fp; + + if ((fp = fopen(dict, "r")) == NULL) + return (NULL); + return (fp); +} + +/* + * Load the given dictionary and initialize the pointers + */ +int +loaddict(fp) + FILE *fp; +{ + struct stat statb; + long n; + int st; + char *p; + + if (fstat(fileno(fp), &statb) < 0) { + (void)fclose(fp); + return (-1); + } + + /* + * An extra character (a sentinel) is allocated and set to null + * to improve the expansion loop in nextword(). + */ + if ((dictspace = malloc(statb.st_size + 1)) == NULL) { + (void)fclose(fp); + return (-1); + } + n = (long)statb.st_size; + sp = dictspace; + dictend = dictspace + n; + + p = dictspace; + st = -1; + while (n > 0 && (st = fread(p, 1, BUFSIZ, fp)) > 0) { + p += st; + n -= st; + } + if (st < 0) { + (void)fclose(fp); + (void)fprintf(stderr, "Error reading dictionary\n"); + return (-1); + } + *p = '\0'; + return (0); +} + +/* + * Dependent on the exact format of the index file: + * Starting offset field begins in column 1 and length field in column 9 + * Taking the easy way out, the input buffer is made "large" and a check + * is made for lines that are too long + */ +int +loadindex(indexfile) + char *indexfile; +{ + register int i, j; + char buf[BUFSIZ]; + FILE *fp; + extern struct dictindex dictindex[]; + + if ((fp = fopen(indexfile, "r")) == NULL) { + (void) fprintf(stderr, "Can't open '%s'\n", indexfile); + return (-1); + } + i = 0; + while (fgets(buf, sizeof(buf), fp) != NULL) { + if (strchr(buf, '\n') == NULL) { + (void)fprintf(stderr, + "A line in the index file is too long\n"); + return(-1); + } + j = *buf - 'a'; + if (i != j) { + (void) fprintf(stderr, "Bad index order\n"); + return(-1); + } + dictindex[j].start = atol(buf + 1); + dictindex[j].length = atol(buf + 9) - dictindex[j].start; + i++; + } + if (i != 26) { + (void) fprintf(stderr, "Bad index length\n"); + return(-1); + } + (void) fclose(fp); + return(0); +} diff --git a/games/boggle/mkdict/Makefile b/games/boggle/mkdict/Makefile new file mode 100644 index 0000000000000..83a323a1952b9 --- /dev/null +++ b/games/boggle/mkdict/Makefile @@ -0,0 +1,9 @@ +# @(#)Makefile 8.1 (Berkeley) 6/11/93 + +PROG= mkdict +CFLAGS+=-I${.CURDIR}/../boggle +NOMAN=noman + +install: + +.include diff --git a/games/boggle/mkdict/mkdict.c b/games/boggle/mkdict/mkdict.c new file mode 100644 index 0000000000000..2bec6a88973f7 --- /dev/null +++ b/games/boggle/mkdict/mkdict.c @@ -0,0 +1,124 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char copyright[] = +"@(#) Copyright (c) 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +#ifndef lint +static char sccsid[] = "@(#)mkdict.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +/* + * Filter out words that: + * 1) Are not completely made up of lower case letters + * 2) Contain a 'q' not immediately followed by a 'u' + * 3) Are less that 3 characters long + * 4) Are greater than MAXWORDLEN characters long + */ + +#include +#include +#include +#include + +#include "bog.h" + +int +main(argc, argv) + int argc; + char *argv[]; +{ + register char *p, *q; + register int ch, common, n, nwords; + int current, len, prev, qcount; + char buf[2][MAXWORDLEN + 1]; + + prev = 0; + current = 1; + buf[prev][0] = '\0'; + if (argc == 2) + n = atoi(argv[1]); + + for (nwords = 1; + fgets(buf[current], MAXWORDLEN + 1, stdin) != NULL; ++nwords) { + if ((p = index(buf[current], '\n')) == NULL) { + fprintf(stderr, + "mkdict: word too long: %s\n", buf[current]); + while ((ch = getc(stdin)) != EOF && ch != '\n') + ; + if (ch == EOF) + break; + continue; + } + len = 0; + for (p = buf[current]; *p != '\n'; p++) { + if (!islower(*p)) + break; + if (*p == 'q') { + q = p + 1; + if (*q != 'u') + break; + else { + while (*q = *(q + 1)) + q++; + } + len++; + } + len++; + } + if (*p != '\n' || len < 3 || len > MAXWORDLEN) + continue; + if (argc == 2 && nwords % n) + continue; + + *p = '\0'; + p = buf[current]; + q = buf[prev]; + qcount = 0; + while ((ch = *p++) == *q++ && ch != '\0') + if (ch == 'q') + qcount++; + common = p - buf[current] - 1; + printf("%c%s", common + qcount, p - 1); + prev = !prev; + current = !current; + } + fprintf(stderr, "%d words\n", nwords); + exit(0); +} diff --git a/games/boggle/mkindex/Makefile b/games/boggle/mkindex/Makefile new file mode 100644 index 0000000000000..0b8a02f427409 --- /dev/null +++ b/games/boggle/mkindex/Makefile @@ -0,0 +1,9 @@ +# @(#)Makefile 8.1 (Berkeley) 6/11/93 + +PROG= mkindex +CFLAGS+=-I${.CURDIR}/../boggle +NOMAN=noman + +install: + +.include diff --git a/games/boggle/mkindex/mkindex.c b/games/boggle/mkindex/mkindex.c new file mode 100644 index 0000000000000..d9f97fa52c3c7 --- /dev/null +++ b/games/boggle/mkindex/mkindex.c @@ -0,0 +1,120 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Barry Brachman. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + */ + +#ifndef lint +static char copyright[] = +"@(#) Copyright (c) 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +#ifndef lint +static char sccsid[] = "@(#)mkindex.c 8.1 (Berkeley) 6/11/93"; +#endif /* not lint */ + +#include + +#include "bog.h" + +char *nextword __P((FILE *, char *, int *, int *)); + +int +main(argc, argv) + int argc; + char *argv[]; +{ + int clen, rlen, prev; + long off, start; + char buf[MAXWORDLEN + 1]; + + prev = '\0'; + off = start = 0L; + while (nextword(stdin, buf, &clen, &rlen) != NULL) { + if (*buf != prev) { + if (prev != '\0') + printf("%c %6ld %6ld\n", prev, start, off - 1); + prev = *buf; + start = off; + } + off += clen + 1; + } + printf("%c %6ld %6ld\n", prev, start, off - 1); + exit(0); +} + +/* + * Return the next word in the compressed dictionary in 'buffer' or + * NULL on end-of-file + * Also set clen to the length of the compressed word (for mkindex) and + * rlen to the strlen() of the real word + */ +char * +nextword(fp, buffer, clen, rlen) + FILE *fp; + char *buffer; + int *clen, *rlen; +{ + register int ch, pcount; + register char *p, *q; + static char buf[MAXWORDLEN + 1]; + static int first = 1; + static int lastch = 0; + + if (first) { + if ((pcount = getc(fp)) == EOF) + return (NULL); + first = 0; + } + else if ((pcount = lastch) == EOF) + return (NULL); + + p = buf + (*clen = pcount); + + while ((ch = getc(fp)) != EOF && ch >= 'a') + *p++ = ch; + lastch = ch; + *p = '\0'; + + *rlen = (int) (p - buf); + *clen = *rlen - *clen; + + p = buf; + q = buffer; + while ((*q++ = *p) != '\0') { + if (*p++ == 'q') + *q++ = 'u'; + } + return (buffer); +} diff --git a/games/bs/Makefile b/games/bs/Makefile index 31498f4b9c88f..6eef432a96482 100644 --- a/games/bs/Makefile +++ b/games/bs/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1994/12/03 04:33:28 ache Exp $ PROG= bs MAN6= bs.6 diff --git a/games/grdc/Makefile b/games/grdc/Makefile index 543f4be377db8..d509e67abeb21 100644 --- a/games/grdc/Makefile +++ b/games/grdc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/12/03 04:34:46 ache Exp $ +# $Id: Makefile,v 1.1.1.1 1994/12/04 21:51:19 ache Exp $ PROG= grdc MAN6= grdc.6 diff --git a/games/hack/hack.version.c b/games/hack/hack.version.c index 81049ea0750a6..3d576573477e5 100644 --- a/games/hack/hack.version.c +++ b/games/hack/hack.version.c @@ -1,6 +1,6 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.version.c - version 1.0.3 */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/games/hack/hack.version.c,v 1.1.1.1 1994/09/04 04:02:54 jkh Exp $ */ +/* $Header: /home/ncvs/src/games/hack/hack.version.c,v 1.1.1.1.6.1 1996/06/05 02:37:55 jkh Exp $ */ #include "date.h" diff --git a/games/piano/piano.c b/games/piano/piano.c index 69b3476976b0f..a1564e196ff72 100644 --- a/games/piano/piano.c +++ b/games/piano/piano.c @@ -1,7 +1,7 @@ /* * piano.c - a piano emulator */ -static char rcsid[] = "$Id: piano.c,v 1.1.1.1 1995/04/28 17:38:07 jkh Exp $"; +static char rcsid[] = "$Id: piano.c,v 1.2 1995/05/30 03:37:05 rgrimes Exp $"; #include #include #include diff --git a/games/tetris/Makefile b/games/tetris/Makefile new file mode 100644 index 0000000000000..d545f8383da7b --- /dev/null +++ b/games/tetris/Makefile @@ -0,0 +1,10 @@ +# @(#)Makefile 8.1 (Berkeley) 5/31/93 + +PROG= tetris +SRCS= input.c screen.c shapes.c scores.c tetris.c +MAN6= tetris.6 +DPADD= ${LIBTERMCAP} +LDADD= -ltermcap +HIDEGAME=hidegame + +.include diff --git a/games/tetris/input.c b/games/tetris/input.c new file mode 100644 index 0000000000000..48da0884cd76b --- /dev/null +++ b/games/tetris/input.c @@ -0,0 +1,180 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)input.c 8.1 (Berkeley) 5/31/93 + */ + +/* + * Tetris input. + */ + +#include +#include + +#include +#include + +#include "input.h" +#include "tetris.h" + +/* return true iff the given timeval is positive */ +#define TV_POS(tv) \ + ((tv)->tv_sec > 0 || ((tv)->tv_sec == 0 && (tv)->tv_usec > 0)) + +/* subtract timeval `sub' from `res' */ +#define TV_SUB(res, sub) \ + (res)->tv_sec -= (sub)->tv_sec; \ + (res)->tv_usec -= (sub)->tv_usec; \ + if ((res)->tv_usec < 0) { \ + (res)->tv_usec += 1000000; \ + (res)->tv_sec--; \ + } + +/* + * Do a `read wait': select for reading from stdin, with timeout *tvp. + * On return, modify *tvp to reflect the amount of time spent waiting. + * It will be positive only if input appeared before the time ran out; + * otherwise it will be zero or perhaps negative. + * + * If tvp is nil, wait forever, but return if select is interrupted. + * + * Return 0 => no input, 1 => can read() from stdin + */ +int +rwait(tvp) + register struct timeval *tvp; +{ + int i; + struct timeval starttv, endtv, *s; + extern int errno; +#define NILTZ ((struct timezone *)0) + + /* + * Someday, select() will do this for us. + * Just in case that day is now, and no one has + * changed this, we use a temporary. + */ + if (tvp) { + (void) gettimeofday(&starttv, NILTZ); + endtv = *tvp; + s = &endtv; + } else + s = 0; +again: + i = 1; + switch (select(1, (fd_set *)&i, (fd_set *)0, (fd_set *)0, s)) { + + case -1: + if (tvp == 0) + return (-1); + if (errno == EINTR) + goto again; + stop("select failed, help"); + /* NOTREACHED */ + + case 0: /* timed out */ + tvp->tv_sec = 0; + tvp->tv_usec = 0; + return (0); + } + if (tvp) { + /* since there is input, we may not have timed out */ + (void) gettimeofday(&endtv, NILTZ); + TV_SUB(&endtv, &starttv); + TV_SUB(tvp, &endtv); /* adjust *tvp by elapsed time */ + } + return (1); +} + +/* + * `sleep' for the current turn time (using select). + * Eat any input that might be available. + */ +void +tsleep() +{ + struct timeval tv; + char c; + + tv.tv_sec = 0; + tv.tv_usec = fallrate; + while (TV_POS(&tv)) + if (rwait(&tv) && read(0, &c, 1) != 1) + break; +} + +/* + * Eat up any input (used at end of game). + */ +void +eat_input() +{ + struct timeval tv; + char c; + + do { + tv.tv_sec = tv.tv_usec = 0; + } while (rwait(&tv) && read(0, &c, 1) == 1); +} + +/* + * getchar with timeout. + */ +int +tgetchar() +{ + static struct timeval timeleft; + char c; + + /* + * Reset timeleft to fallrate whenever it is not positive. + * In any case, wait to see if there is any input. If so, + * take it, and update timeleft so that the next call to + * tgetchar() will not wait as long. If there is no input, + * make timeleft zero or negative, and return -1. + * + * Most of the hard work is done by rwait(). + */ + if (!TV_POS(&timeleft)) { + faster(); /* go faster */ + timeleft.tv_sec = 0; + timeleft.tv_usec = fallrate; + } + if (!rwait(&timeleft)) + return (-1); + if (read(0, &c, 1) != 1) + stop("end of file, help"); + return ((int)(unsigned char)c); +} diff --git a/games/tetris/input.h b/games/tetris/input.h new file mode 100644 index 0000000000000..733182d73357e --- /dev/null +++ b/games/tetris/input.h @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)input.h 8.1 (Berkeley) 5/31/93 + */ + +void eat_input __P((void)); +int rwait __P((struct timeval *)); +int tgetchar __P((void)); +void tsleep __P((void)); diff --git a/games/tetris/pathnames.h b/games/tetris/pathnames.h new file mode 100644 index 0000000000000..ba08dd116125e --- /dev/null +++ b/games/tetris/pathnames.h @@ -0,0 +1,39 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 + */ + +#define _PATH_SCOREFILE "/var/games/tetris.scores" diff --git a/games/tetris/scores.c b/games/tetris/scores.c new file mode 100644 index 0000000000000..e7e6bb590ad88 --- /dev/null +++ b/games/tetris/scores.c @@ -0,0 +1,472 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)scores.c 8.1 (Berkeley) 5/31/93 + */ + +/* + * Score code for Tetris, by Darren Provine (kilroy@gboro.glassboro.edu) + * modified 22 January 1992, to limit the number of entries any one + * person has. + * + * Major whacks since then. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * XXX - need a + */ +int tputs __P((const char *, int, int (*)(int))); + +#include "pathnames.h" +#include "screen.h" +#include "scores.h" +#include "tetris.h" + +/* + * Within this code, we can hang onto one extra "high score", leaving + * room for our current score (whether or not it is high). + * + * We also sometimes keep tabs on the "highest" score on each level. + * As long as the scores are kept sorted, this is simply the first one at + * that level. + */ +#define NUMSPOTS (MAXHISCORES + 1) +#define NLEVELS (MAXLEVEL + 1) + +static time_t now; +static int nscores; +static int gotscores; +static struct highscore scores[NUMSPOTS]; + +static int checkscores __P((struct highscore *, int)); +static int cmpscores __P((const void *, const void *)); +static void getscores __P((FILE **)); +static void printem __P((int, int, struct highscore *, int, const char *)); +static char *thisuser __P((void)); + +/* + * Read the score file. Can be called from savescore (before showscores) + * or showscores (if savescore will not be called). If the given pointer + * is not NULL, sets *fpp to an open file pointer that corresponds to a + * read/write score file that is locked with LOCK_EX. Otherwise, the + * file is locked with LOCK_SH for the read and closed before return. + * + * Note, we assume closing the stdio file releases the lock. + */ +static void +getscores(fpp) + FILE **fpp; +{ + int sd, mint, lck; + char *mstr, *human; + FILE *sf; + + if (fpp != NULL) { + mint = O_RDWR | O_CREAT; + mstr = "r+"; + human = "read/write"; + lck = LOCK_EX; + } else { + mint = O_RDONLY; + mstr = "r"; + human = "reading"; + lck = LOCK_SH; + } + sd = open(_PATH_SCOREFILE, mint, 0666); + if (sd < 0) { + if (fpp == NULL) { + nscores = 0; + return; + } + (void)fprintf(stderr, "tetris: cannot open %s for %s: %s\n", + _PATH_SCOREFILE, human, strerror(errno)); + exit(1); + } + if ((sf = fdopen(sd, mstr)) == NULL) { + (void)fprintf(stderr, "tetris: cannot fdopen %s for %s: %s\n", + _PATH_SCOREFILE, human, strerror(errno)); + exit(1); + } + + /* + * Grab a lock. + */ + if (flock(sd, lck)) + (void)fprintf(stderr, + "tetris: warning: score file %s cannot be locked: %s\n", + _PATH_SCOREFILE, strerror(errno)); + + nscores = fread(scores, sizeof(scores[0]), MAXHISCORES, sf); + if (ferror(sf)) { + (void)fprintf(stderr, "tetris: error reading %s: %s\n", + _PATH_SCOREFILE, strerror(errno)); + exit(1); + } + + if (fpp) + *fpp = sf; + else + (void)fclose(sf); +} + +void +savescore(level) + int level; +{ + register struct highscore *sp; + register int i; + int change; + FILE *sf; + const char *me; + + getscores(&sf); + gotscores = 1; + (void)time(&now); + + /* + * Allow at most one score per person per level -- see if we + * can replace an existing score, or (easiest) do nothing. + * Otherwise add new score at end (there is always room). + */ + change = 0; + me = thisuser(); + for (i = 0, sp = &scores[0]; i < nscores; i++, sp++) { + if (sp->hs_level != level || strcmp(sp->hs_name, me) != 0) + continue; + if (score > sp->hs_score) { + (void)printf("%s bettered %s %d score of %d!\n", + "\nYou", "your old level", level, + sp->hs_score * sp->hs_level); + sp->hs_score = score; /* new score */ + sp->hs_time = now; /* and time */ + change = 1; + } else if (score == sp->hs_score) { + (void)printf("%s tied %s %d high score.\n", + "\nYou", "your old level", level); + sp->hs_time = now; /* renew it */ + change = 1; /* gotta rewrite, sigh */ + } /* else new score < old score: do nothing */ + break; + } + if (i >= nscores) { + strcpy(sp->hs_name, me); + sp->hs_level = level; + sp->hs_score = score; + sp->hs_time = now; + nscores++; + change = 1; + } + + if (change) { + /* + * Sort & clean the scores, then rewrite. + */ + nscores = checkscores(scores, nscores); + rewind(sf); + if (fwrite(scores, sizeof(*sp), nscores, sf) != nscores || + fflush(sf) == EOF) + (void)fprintf(stderr, + "tetris: error writing %s: %s -- %s\n", + _PATH_SCOREFILE, strerror(errno), + "high scores may be damaged"); + } + (void)fclose(sf); /* releases lock */ +} + +/* + * Get login name, or if that fails, get something suitable. + * The result is always trimmed to fit in a score. + */ +static char * +thisuser() +{ + register const char *p; + register struct passwd *pw; + register size_t l; + static char u[sizeof(scores[0].hs_name)]; + + if (u[0]) + return (u); + p = getlogin(); + if (p == NULL || *p == '\0') { + pw = getpwuid(getuid()); + if (pw != NULL) + p = pw->pw_name; + else + p = " ???"; + } + l = strlen(p); + if (l >= sizeof(u)) + l = sizeof(u) - 1; + bcopy(p, u, l); + u[l] = '\0'; + return (u); +} + +/* + * Score comparison function for qsort. + * + * If two scores are equal, the person who had the score first is + * listed first in the highscore file. + */ +static int +cmpscores(x, y) + const void *x, *y; +{ + register const struct highscore *a, *b; + register long l; + + a = x; + b = y; + l = (long)b->hs_level * b->hs_score - (long)a->hs_level * a->hs_score; + if (l < 0) + return (-1); + if (l > 0) + return (1); + if (a->hs_time < b->hs_time) + return (-1); + if (a->hs_time > b->hs_time) + return (1); + return (0); +} + +/* + * If we've added a score to the file, we need to check the file and ensure + * that this player has only a few entries. The number of entries is + * controlled by MAXSCORES, and is to ensure that the highscore file is not + * monopolised by just a few people. People who no longer have accounts are + * only allowed the highest score. Scores older than EXPIRATION seconds are + * removed, unless they are someone's personal best. + * Caveat: the highest score on each level is always kept. + */ +static int +checkscores(hs, num) + register struct highscore *hs; + int num; +{ + register struct highscore *sp; + register int i, j, k, numnames; + int levelfound[NLEVELS]; + struct peruser { + char *name; + int times; + } count[NUMSPOTS]; + register struct peruser *pu; + + /* + * Sort so that highest totals come first. + * + * levelfound[i] becomes set when the first high score for that + * level is encountered. By definition this is the highest score. + */ + qsort((void *)hs, nscores, sizeof(*hs), cmpscores); + for (i = MINLEVEL; i < NLEVELS; i++) + levelfound[i] = 0; + numnames = 0; + for (i = 0, sp = hs; i < num;) { + /* + * This is O(n^2), but do you think we care? + */ + for (j = 0, pu = count; j < numnames; j++, pu++) + if (strcmp(sp->hs_name, pu->name) == 0) + break; + if (j == numnames) { + /* + * Add new user, set per-user count to 1. + */ + pu->name = sp->hs_name; + pu->times = 1; + numnames++; + } else { + /* + * Two ways to keep this score: + * - Not too many (per user), still has acct, & + * score not dated; or + * - High score on this level. + */ + if ((pu->times < MAXSCORES && + getpwnam(sp->hs_name) != NULL && + sp->hs_time + EXPIRATION >= now) || + levelfound[sp->hs_level] == 0) + pu->times++; + else { + /* + * Delete this score, do not count it, + * do not pass go, do not collect $200. + */ + num--; + for (k = i; k < num; k++) + hs[k] = hs[k + 1]; + continue; + } + } + levelfound[sp->hs_level] = 1; + i++, sp++; + } + return (num > MAXHISCORES ? MAXHISCORES : num); +} + +/* + * Show current scores. This must be called after savescore, if + * savescore is called at all, for two reasons: + * - Showscores munches the time field. + * - Even if that were not the case, a new score must be recorded + * before it can be shown anyway. + */ +void +showscores(level) + int level; +{ + register struct highscore *sp; + register int i, n, c; + const char *me; + int levelfound[NLEVELS]; + + if (!gotscores) + getscores((FILE **)NULL); + (void)printf("\n\t\t\t Tetris High Scores\n"); + + /* + * If level == 0, the person has not played a game but just asked for + * the high scores; we do not need to check for printing in highlight + * mode. If SOstr is null, we can't do highlighting anyway. + */ + me = level && SOstr ? thisuser() : NULL; + + /* + * Set times to 0 except for high score on each level. + */ + for (i = MINLEVEL; i < NLEVELS; i++) + levelfound[i] = 0; + for (i = 0, sp = scores; i < nscores; i++, sp++) { + if (levelfound[sp->hs_level]) + sp->hs_time = 0; + else { + sp->hs_time = 1; + levelfound[sp->hs_level] = 1; + } + } + + /* + * Page each screenful of scores. + */ + for (i = 0, sp = scores; i < nscores; sp += n) { + n = 40; + if (i + n > nscores) + n = nscores - i; + printem(level, i + 1, sp, n, me); + if ((i += n) < nscores) { + (void)printf("\nHit RETURN to continue."); + (void)fflush(stdout); + while ((c = getchar()) != '\n') + if (c == EOF) + break; + (void)printf("\n"); + } + } +} + +static void +printem(level, offset, hs, n, me) + int level, offset; + register struct highscore *hs; + register int n; + const char *me; +{ + register struct highscore *sp; + int nrows, row, col, item, i, highlight; + char buf[100]; +#define TITLE "Rank Score Name (points/level)" + + /* + * This makes a nice two-column sort with headers, but it's a bit + * convoluted... + */ + printf("%s %s\n", TITLE, n > 1 ? TITLE : ""); + + highlight = 0; + nrows = (n + 1) / 2; + + for (row = 0; row < nrows; row++) { + for (col = 0; col < 2; col++) { + item = col * nrows + row; + if (item >= n) { + /* + * Can only occur on trailing columns. + */ + (void)putchar('\n'); + continue; + } + (void)printf(item + offset < 10 ? " " : " "); + sp = &hs[item]; + (void)sprintf(buf, + "%d%c %6d %-11s (%d on %d)", + item + offset, sp->hs_time ? '*' : ' ', + sp->hs_score * sp->hs_level, + sp->hs_name, sp->hs_score, sp->hs_level); + /* + * Highlight if appropriate. This works because + * we only get one score per level. + */ + if (me != NULL && + sp->hs_level == level && + sp->hs_score == score && + strcmp(sp->hs_name, me) == 0) { + putpad(SOstr); + highlight = 1; + } + (void)printf("%s", buf); + if (highlight) { + putpad(SEstr); + highlight = 0; + } + + /* fill in spaces so column 1 lines up */ + if (col == 0) + for (i = 40 - strlen(buf); --i >= 0;) + (void)putchar(' '); + else /* col == 1 */ + (void)putchar('\n'); + } + } +} diff --git a/games/tetris/scores.h b/games/tetris/scores.h new file mode 100644 index 0000000000000..7a4865adb4ac3 --- /dev/null +++ b/games/tetris/scores.h @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)scores.h 8.1 (Berkeley) 5/31/93 + */ + +/* + * Tetris scores. + */ +struct highscore { + char hs_name[20]; /* login name */ + int hs_score; /* raw score */ + int hs_level; /* play level */ + time_t hs_time; /* time at game end */ +}; + +#define MAXHISCORES 80 +#define MAXSCORES 9 /* maximum high score entries per person */ +#define EXPIRATION (5L * 365 * 24 * 60 * 60) + +void savescore __P((int)); +void showscores __P((int)); diff --git a/games/tetris/screen.c b/games/tetris/screen.c new file mode 100644 index 0000000000000..9662ed0155706 --- /dev/null +++ b/games/tetris/screen.c @@ -0,0 +1,454 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)screen.c 8.1 (Berkeley) 5/31/93 + */ + +/* + * Tetris screen control. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#ifndef sigmask +#define sigmask(s) (1 << ((s) - 1)) +#endif + +#include "screen.h" +#include "tetris.h" + +/* + * XXX - need a + */ +int tgetent __P((char *, const char *)); +int tgetflag __P((const char *)); +int tgetnum __P((const char *)); +int tputs __P((const char *, int, int (*)(int))); + +static cell curscreen[B_SIZE]; /* 1 => standout (or otherwise marked) */ +static int curscore; +static int isset; /* true => terminal is in game mode */ +static struct sgttyb oldtt; +static void (*tstp)(); + +char *tgetstr(), *tgoto(); + + +/* + * Capabilities from TERMCAP. + */ +char PC, *BC, *UP; /* tgoto requires globals: ugh! */ +short ospeed; + +static char + *bcstr, /* backspace char */ + *CEstr, /* clear to end of line */ + *CLstr, /* clear screen */ + *CMstr, /* cursor motion string */ +#ifdef unneeded + *CRstr, /* "\r" equivalent */ +#endif + *HOstr, /* cursor home */ + *LLstr, /* last line, first column */ + *pcstr, /* pad character */ + *TEstr, /* end cursor motion mode */ + *TIstr; /* begin cursor motion mode */ +char + *SEstr, /* end standout mode */ + *SOstr; /* begin standout mode */ +static int + COnum, /* co# value */ + LInum, /* li# value */ + MSflag; /* can move in standout mode */ + + +struct tcsinfo { /* termcap string info; some abbrevs above */ + char tcname[3]; + char **tcaddr; +} tcstrings[] = { + "bc", &bcstr, + "ce", &CEstr, + "cl", &CLstr, + "cm", &CMstr, +#ifdef unneeded + "cr", &CRstr, +#endif + "le", &BC, /* move cursor left one space */ + "pc", &pcstr, + "se", &SEstr, + "so", &SOstr, + "te", &TEstr, + "ti", &TIstr, + "up", &UP, /* cursor up */ + 0 +}; + +/* This is where we will actually stuff the information */ + +static char combuf[1024], tbuf[1024]; + + +/* + * Routine used by tputs(). + */ +int +put(c) + int c; +{ + + return (putchar(c)); +} + +/* + * putstr() is for unpadded strings (either as in termcap(5) or + * simply literal strings); putpad() is for padded strings with + * count=1. (See screen.h for putpad().) + */ +#define putstr(s) (void)fputs(s, stdout) +#define moveto(r, c) putpad(tgoto(CMstr, c, r)) + +/* + * Set up from termcap. + */ +void +scr_init() +{ + static int bsflag, xsflag, sgnum; +#ifdef unneeded + static int ncflag; +#endif + char *term, *fill; + static struct tcninfo { /* termcap numeric and flag info */ + char tcname[3]; + int *tcaddr; + } tcflags[] = { + "bs", &bsflag, + "ms", &MSflag, +#ifdef unneeded + "nc", &ncflag, +#endif + "xs", &xsflag, + 0 + }, tcnums[] = { + "co", &COnum, + "li", &LInum, + "sg", &sgnum, + 0 + }; + + if ((term = getenv("TERM")) == NULL) + stop("you must set the TERM environment variable"); + if (tgetent(tbuf, term) <= 0) + stop("cannot find your termcap"); + fill = combuf; + { + register struct tcsinfo *p; + + for (p = tcstrings; p->tcaddr; p++) + *p->tcaddr = tgetstr(p->tcname, &fill); + } + { + register struct tcninfo *p; + + for (p = tcflags; p->tcaddr; p++) + *p->tcaddr = tgetflag(p->tcname); + for (p = tcnums; p->tcaddr; p++) + *p->tcaddr = tgetnum(p->tcname); + } + if (bsflag) + BC = "\b"; + else if (BC == NULL && bcstr != NULL) + BC = bcstr; + if (CLstr == NULL) + stop("cannot clear screen"); + if (CMstr == NULL || UP == NULL || BC == NULL) + stop("cannot do random cursor positioning via tgoto()"); + PC = pcstr ? *pcstr : 0; + if (sgnum >= 0 || xsflag) + SOstr = SEstr = NULL; +#ifdef unneeded + if (ncflag) + CRstr = NULL; + else if (CRstr == NULL) + CRstr = "\r"; +#endif +} + +/* this foolery is needed to modify tty state `atomically' */ +static jmp_buf scr_onstop; + +#define sigunblock(mask) sigsetmask(sigblock(0) & ~(mask)) + +static void +stopset(sig) + int sig; +{ + (void) signal(sig, SIG_DFL); + (void) kill(getpid(), sig); + (void) sigunblock(sigmask(sig)); + longjmp(scr_onstop, 1); +} + +static void +scr_stop() +{ + scr_end(); + (void) kill(getpid(), SIGTSTP); + (void) sigunblock(sigmask(SIGTSTP)); + scr_set(); + scr_msg(key_msg, 1); +} + +/* + * Set up screen mode. + */ +void +scr_set() +{ + struct winsize ws; + struct sgttyb newtt; + volatile int omask; + void (*ttou)(); + + omask = sigblock(sigmask(SIGTSTP) | sigmask(SIGTTOU)); + if ((tstp = signal(SIGTSTP, stopset)) == SIG_IGN) + (void) signal(SIGTSTP, SIG_IGN); + if ((ttou = signal(SIGTSTP, stopset)) == SIG_IGN) + (void) signal(SIGTSTP, SIG_IGN); + /* + * At last, we are ready to modify the tty state. If + * we stop while at it, stopset() above will longjmp back + * to the setjmp here and we will start over. + */ + (void) setjmp(scr_onstop); + (void) sigsetmask(omask); + Rows = 0, Cols = 0; + if (ioctl(0, TIOCGWINSZ, &ws) == 0) { + Rows = ws.ws_row; + Cols = ws.ws_col; + } + if (Rows == 0) + Rows = LInum; + if (Cols == 0) + Cols = COnum; + if (Rows < MINROWS || Cols < MINCOLS) { + (void) fprintf(stderr, + "the screen is too small: must be at least %d x %d", + MINROWS, MINCOLS); + stop(""); /* stop() supplies \n */ + } + if (ioctl(0, TIOCGETP, &oldtt)) + stop("ioctl(TIOCGETP) fails"); + newtt = oldtt; + newtt.sg_flags = (newtt.sg_flags | CBREAK) & ~(CRMOD | ECHO); + if ((newtt.sg_flags & TBDELAY) == XTABS) + newtt.sg_flags &= ~TBDELAY; + if (ioctl(0, TIOCSETN, &newtt)) + stop("ioctl(TIOCSETN) fails"); + ospeed = newtt.sg_ospeed; + omask = sigblock(sigmask(SIGTSTP) | sigmask(SIGTTOU)); + + /* + * We made it. We are now in screen mode, modulo TIstr + * (which we will fix immediately). + */ + if (TIstr) + putstr(TIstr); /* termcap(5) says this is not padded */ + if (tstp != SIG_IGN) + (void) signal(SIGTSTP, scr_stop); + (void) signal(SIGTTOU, ttou); + + isset = 1; + (void) sigsetmask(omask); + scr_clear(); +} + +/* + * End screen mode. + */ +void +scr_end() +{ + int omask = sigblock(sigmask(SIGTSTP) | sigmask(SIGTTOU)); + + /* move cursor to last line */ + if (LLstr) + putstr(LLstr); /* termcap(5) says this is not padded */ + else + moveto(Rows - 1, 0); + /* exit screen mode */ + if (TEstr) + putstr(TEstr); /* termcap(5) says this is not padded */ + (void) fflush(stdout); + (void) ioctl(0, TIOCSETN, &oldtt); + isset = 0; + /* restore signals */ + (void) signal(SIGTSTP, tstp); + (void) sigsetmask(omask); +} + +void +stop(why) + char *why; +{ + + if (isset) + scr_end(); + (void) fprintf(stderr, "aborting: %s\n", why); + exit(1); +} + +/* + * Clear the screen, forgetting the current contents in the process. + */ +void +scr_clear() +{ + + putpad(CLstr); + curscore = -1; + bzero((char *)curscreen, sizeof(curscreen)); +} + +#if vax && !__GNUC__ +typedef int regcell; /* pcc is bad at `register char', etc */ +#else +typedef cell regcell; +#endif + +/* + * Update the screen. + */ +void +scr_update() +{ + register cell *bp, *sp; + register regcell so, cur_so = 0; + register int i, ccol, j; + int omask = sigblock(sigmask(SIGTSTP)); + + /* always leave cursor after last displayed point */ + curscreen[D_LAST * B_COLS - 1] = -1; + + if (score != curscore) { + if (HOstr) + putpad(HOstr); + else + moveto(0, 0); + (void) printf("%d", score); + curscore = score; + } + + bp = &board[D_FIRST * B_COLS]; + sp = &curscreen[D_FIRST * B_COLS]; + for (j = D_FIRST; j < D_LAST; j++) { + ccol = -1; + for (i = 0; i < B_COLS; bp++, sp++, i++) { + if (*sp == (so = *bp)) + continue; + *sp = so; + if (i != ccol) { + if (cur_so && MSflag) { + putpad(SEstr); + cur_so = 0; + } + moveto(RTOD(j), CTOD(i)); + } + if (SOstr) { + if (so != cur_so) { + putpad(so ? SOstr : SEstr); + cur_so = so; + } + putstr(" "); + } else + putstr(so ? "XX" : " "); + ccol = i + 1; + /* + * Look ahead a bit, to avoid extra motion if + * we will be redrawing the cell after the next. + * Motion probably takes four or more characters, + * so we save even if we rewrite two cells + * `unnecessarily'. Skip it all, though, if + * the next cell is a different color. + */ +#define STOP (B_COLS - 3) + if (i > STOP || sp[1] != bp[1] || so != bp[1]) + continue; + if (sp[2] != bp[2]) + sp[1] = -1; + else if (i < STOP && so == bp[2] && sp[3] != bp[3]) { + sp[2] = -1; + sp[1] = -1; + } + } + } + if (cur_so) + putpad(SEstr); + (void) fflush(stdout); + (void) sigsetmask(omask); +} + +/* + * Write a message (set!=0), or clear the same message (set==0). + * (We need its length in case we have to overwrite with blanks.) + */ +void +scr_msg(s, set) + register char *s; + int set; +{ + + if (set || CEstr == NULL) { + register int l = strlen(s); + + moveto(Rows - 2, ((Cols - l) >> 1) - 1); + if (set) + putstr(s); + else + while (--l >= 0) + (void) putchar(' '); + } else { + moveto(Rows - 2, 0); + putpad(CEstr); + } +} diff --git a/games/tetris/screen.h b/games/tetris/screen.h new file mode 100644 index 0000000000000..fd6793d17a147 --- /dev/null +++ b/games/tetris/screen.h @@ -0,0 +1,56 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)screen.h 8.1 (Berkeley) 5/31/93 + */ + +/* + * Capabilities from TERMCAP (used in the score code). + */ +char *SEstr; /* end standout mode */ +char *SOstr; /* begin standout mode */ + +/* + * putpad() is for padded strings with count=1. + */ +#define putpad(s) tputs(s, 1, put) + +int put __P((int)); /* just calls putchar; for tputs */ +void scr_clear __P((void)); +void scr_end __P((void)); +void scr_init __P((void)); +void scr_msg __P((char *, int)); +void scr_set __P((void)); +void scr_update __P((void)); diff --git a/games/tetris/shapes.c b/games/tetris/shapes.c new file mode 100644 index 0000000000000..39ba3788871ff --- /dev/null +++ b/games/tetris/shapes.c @@ -0,0 +1,111 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)shapes.c 8.1 (Berkeley) 5/31/93 + */ + +/* + * Tetris shapes and related routines. + * + * Note that the first 7 are `well known'. + */ + +#include +#include "tetris.h" + +#define TL -B_COLS-1 /* top left */ +#define TC -B_COLS /* top center */ +#define TR -B_COLS+1 /* top right */ +#define ML -1 /* middle left */ +#define MR 1 /* middle right */ +#define BL B_COLS-1 /* bottom left */ +#define BC B_COLS /* bottom center */ +#define BR B_COLS+1 /* bottom right */ + +struct shape shapes[] = { + /* 0*/ 7, TL, TC, MR, + /* 1*/ 8, TC, TR, ML, + /* 2*/ 9, ML, MR, BC, + /* 3*/ 3, TL, TC, ML, + /* 4*/ 12, ML, BL, MR, + /* 5*/ 15, ML, BR, MR, + /* 6*/ 18, ML, MR, /* sticks out */ 2, + /* 7*/ 0, TC, ML, BL, + /* 8*/ 1, TC, MR, BR, + /* 9*/ 10, TC, MR, BC, + /*10*/ 11, TC, ML, MR, + /*11*/ 2, TC, ML, BC, + /*12*/ 13, TC, BC, BR, + /*13*/ 14, TR, ML, MR, + /*14*/ 4, TL, TC, BC, + /*15*/ 16, TR, TC, BC, + /*16*/ 17, TL, MR, ML, + /*17*/ 5, TC, BC, BL, + /*18*/ 6, TC, BC, /* sticks out */ 2*B_COLS, +}; + +/* + * Return true iff the given shape fits in the given position, + * taking the current board into account. + */ +int +fits_in(shape, pos) + struct shape *shape; + register int pos; +{ + register int *o = shape->off; + + if (board[pos] || board[pos + *o++] || board[pos + *o++] || + board[pos + *o]) + return 0; + return 1; +} + +/* + * Write the given shape into the current board, turning it on + * if `onoff' is 1, and off if `onoff' is 0. + */ +void +place(shape, pos, onoff) + struct shape *shape; + register int pos, onoff; +{ + register int *o = shape->off; + + board[pos] = onoff; + board[pos + *o++] = onoff; + board[pos + *o++] = onoff; + board[pos + *o] = onoff; +} diff --git a/games/tetris/tetris.6 b/games/tetris/tetris.6 new file mode 100644 index 0000000000000..9513ca057d9e5 --- /dev/null +++ b/games/tetris/tetris.6 @@ -0,0 +1,154 @@ +.\" Copyright (c) 1992, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" Nancy L. Tinkham and Darren F. Provine. +.\" +.\" 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. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. 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. +.\" +.\" @(#)tetris.6 8.1 (Berkeley) 5/31/93 +.\" +.Dd "May 31, 1993" +.Dt TETRIS 6 +.Os +.Sh NAME +.Nm tetris +.Nd the game of tetris +.Sh SYNOPSIS +.Nm +.Op Fl s +.Op Fl k Ar keys +.Op Fl l Ar level +.Sh DESCRIPTION +The +.Nm +command runs display-based game which must be played on a CRT terminal. +The object is to fit the shapes together forming complete rows, +which then vanish. +When the shapes fill up to the top, the game ends. +You can optionally select a level of play, or custom-select control keys. +.Pp +The default level of play is 2. +.Pp +The default control keys are as follows: +.Pp +.Bl -tag -width "" -compact -offset indent +.It j +move left +.It k +rotate 1/4 turn counterclockwise +.It l +move right +.It +drop +.It p +pause +.It q +quit +.El +.Pp +The options are as follows: +.Bl -tag -width indent +.It Fl k +The default control keys can be changed using the +.Fl k option. +The +.Ar keys +argument must have the six keys in order, and, remember to quote any +space or tab characters from the shell. +For example: +.sp +.Dl "tetris -l 2 -k 'jkl pq'" +.sp +will play the default games, i.e. level 2 and with the default +control keys. +The current key settings are displayed at the bottom of the screen +during play. +.It Fl l +Select a level of play. +.It Fl s +Display the top scores. +.El +.Pp +.Sh PLAY +At the start of the game, a shape will appear at the top of the screen, +falling one square at a time. +The speed at which it falls is determined directly by the level: +if you select level 2, the blocks will fall twice per second; +at level 9, they fall 9 times per second. +(As the game goes on, things speed up, +no matter what your initial selection.) +When this shape +.Dq "touches down" +on the bottom of the field, another will appear at the top. +.Pp +You can move shapes to the left or right, rotate them counterclockwise, +or drop them to the bottom by pressing the appropriate keys. +As you fit them together, completed horizontal rows vanish, +and any blocks above fall down to fill in. +When the blocks stack up to the top of the screen, the game is over. +.Sh SCORING +You get one point for every block you fit into the stack, +and one point for every space a block falls when you hit the drop key. +(Dropping the blocks is therefore a good way to increase your score.) +Your total score is the product of the level of play +and your accumulated +.ie t points\(em200 +.el points -- 200 +points on level 3 gives you a score of 600. +Each player gets at most one entry on any level, +for a total of nine scores in the high scores file. +Players who no longer have accounts are limited to one score. +Also, scores over 5 years old are expired. +The exception to these conditions is that the highest score on a given +level is +.Em always +kept, +so that following generations can pay homage to those who have +wasted serious amounts of time. +.Pp +The score list is produced at the end of the game. +The printout includes each player's overall ranking, +name, score, and how many points were scored on what level. +Scores which are the highest on a given level +are marked with asterisks +.Dq * . +.Sh FILES +.Bl -tag -width /var/games/tetris.scoresxx +.It /var/games/tetris.scores +high score file +.El +.Sh BUGS +The higher levels are unplayable without a fast terminal connection. +.Sh AUTHORS +Adapted from a 1989 International Obfuscated C Code Contest winner by +Chris Torek and Darren F. Provine. +.Pp +Manual adapted from the original entry written by Nancy L. Tinkham and +Darren F. Provine. diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c new file mode 100644 index 0000000000000..63265bc6b7541 --- /dev/null +++ b/games/tetris/tetris.c @@ -0,0 +1,312 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)tetris.c 8.1 (Berkeley) 5/31/93 + */ + +#ifndef lint +static char copyright[] = +"@(#) Copyright (c) 1992, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +/* + * Tetris (or however it is spelled). + */ + +#include + +#include +#include +#include +#include +#include + +#include "input.h" +#include "scores.h" +#include "screen.h" +#include "tetris.h" + +void onintr __P((int)); +void usage __P((void)); + +/* + * Set up the initial board. The bottom display row is completely set, + * along with another (hidden) row underneath that. Also, the left and + * right edges are set. + */ +static void +setup_board() +{ + register int i; + register cell *p; + + p = board; + for (i = B_SIZE; i; i--) +#ifndef mips + *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2; +#else /* work around compiler bug */ + *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2 ? 1 : 0; +#endif +} + +/* + * Elide any full active rows. + */ +static void +elide() +{ + register int i, j, base; + register cell *p; + + for (i = A_FIRST; i < A_LAST; i++) { + base = i * B_COLS + 1; + p = &board[base]; + for (j = B_COLS - 2; *p++ != 0;) { + if (--j <= 0) { + /* this row is to be elided */ + bzero(&board[base], B_COLS - 2); + scr_update(); + tsleep(); + while (--base != 0) + board[base + B_COLS] = board[base]; + scr_update(); + tsleep(); + break; + } + } + } +} + +int +main(argc, argv) + int argc; + char *argv[]; +{ + register int pos, c; + register struct shape *curshape; + register char *keys; + register int level = 2; + char key_write[6][10]; + int ch, i, j; + + keys = "jkl pq"; + + while ((ch = getopt(argc, argv, "k:l:s")) != EOF) + switch(ch) { + case 'k': + if (strlen(keys = optarg) != 6) + usage(); + break; + case 'l': + level = atoi(optarg); + if (level < MINLEVEL || level > MAXLEVEL) { + (void)fprintf(stderr, + "tetris: level must be from %d to %d", + MINLEVEL, MAXLEVEL); + exit(1); + } + break; + case 's': + showscores(0); + exit(0); + case '?': + default: + usage(); + } + + argc -= optind; + argv += optind; + + if (argc) + usage(); + + fallrate = 1000000 / level; + + for (i = 0; i <= 5; i++) { + for (j = i+1; j <= 5; j++) { + if (keys[i] == keys[j]) { + (void)fprintf(stderr, + "%s: Duplicate command keys specified.\n", + argv[0]); + exit (1); + } + } + if (keys[i] == ' ') + strcpy(key_write[i], ""); + else { + key_write[i][0] = keys[i]; + key_write[i][1] = '\0'; + } + } + + sprintf(key_msg, +"%s - left %s - rotate %s - right %s - drop %s - pause %s - quit", + key_write[0], key_write[1], key_write[2], key_write[3], + key_write[4], key_write[5]); + + (void)signal(SIGINT, onintr); + scr_init(); + setup_board(); + + srandom(getpid()); + scr_set(); + + pos = A_FIRST*B_COLS + (B_COLS/2)-1; + curshape = randshape(); + + scr_msg(key_msg, 1); + + for (;;) { + place(curshape, pos, 1); + scr_update(); + place(curshape, pos, 0); + c = tgetchar(); + if (c < 0) { + /* + * Timeout. Move down if possible. + */ + if (fits_in(curshape, pos + B_COLS)) { + pos += B_COLS; + continue; + } + + /* + * Put up the current shape `permanently', + * bump score, and elide any full rows. + */ + place(curshape, pos, 1); + score++; + elide(); + + /* + * Choose a new shape. If it does not fit, + * the game is over. + */ + curshape = randshape(); + pos = A_FIRST*B_COLS + (B_COLS/2)-1; + if (!fits_in(curshape, pos)) + break; + continue; + } + + /* + * Handle command keys. + */ + if (c == keys[5]) { + /* quit */ + break; + } + if (c == keys[4]) { + static char msg[] = + "paused - press RETURN to continue"; + + place(curshape, pos, 1); + do { + scr_update(); + scr_msg(key_msg, 0); + scr_msg(msg, 1); + (void) fflush(stdout); + } while (rwait((struct timeval *)NULL) == -1); + scr_msg(msg, 0); + scr_msg(key_msg, 1); + place(curshape, pos, 0); + continue; + } + if (c == keys[0]) { + /* move left */ + if (fits_in(curshape, pos - 1)) + pos--; + continue; + } + if (c == keys[1]) { + /* turn */ + struct shape *new = &shapes[curshape->rot]; + + if (fits_in(new, pos)) + curshape = new; + continue; + } + if (c == keys[2]) { + /* move right */ + if (fits_in(curshape, pos + 1)) + pos++; + continue; + } + if (c == keys[3]) { + /* move to bottom */ + while (fits_in(curshape, pos + B_COLS)) { + pos += B_COLS; + score++; + } + continue; + } + if (c == '\f') + scr_clear(); + } + + scr_clear(); + scr_end(); + + (void)printf("Your score: %d point%s x level %d = %d\n", + score, score == 1 ? "" : "s", level, score * level); + savescore(level); + + printf("\nHit RETURN to see high scores, ^C to skip.\n"); + + while ((i = getchar()) != '\n') + if (i == EOF) + break; + + showscores(level); + + exit(0); +} + +void +onintr(signo) + int signo; +{ + scr_clear(); + scr_end(); + exit(0); +} + +void +usage() +{ + (void)fprintf(stderr, "usage: tetris [-s] [-l level] [-keys]\n"); + exit(1); +} diff --git a/games/tetris/tetris.h b/games/tetris/tetris.h new file mode 100644 index 0000000000000..b95627bb9b678 --- /dev/null +++ b/games/tetris/tetris.h @@ -0,0 +1,169 @@ +/*- + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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. + * + * @(#)tetris.h 8.1 (Berkeley) 5/31/93 + */ + +/* + * Definitions for Tetris. + */ + +/* + * The display (`board') is composed of 23 rows of 12 columns of characters + * (numbered 0..22 and 0..11), stored in a single array for convenience. + * Columns 1 to 10 of rows 1 to 20 are the actual playing area, where + * shapes appear. Columns 0 and 11 are always occupied, as are all + * columns of rows 21 and 22. Rows 0 and 22 exist as boundary areas + * so that regions `outside' the visible area can be examined without + * worrying about addressing problems. + */ + + /* the board */ +#define B_COLS 12 +#define B_ROWS 23 +#define B_SIZE (B_ROWS * B_COLS) + +typedef unsigned char cell; +cell board[B_SIZE]; /* 1 => occupied, 0 => empty */ + + /* the displayed area (rows) */ +#define D_FIRST 1 +#define D_LAST 22 + + /* the active area (rows) */ +#define A_FIRST 1 +#define A_LAST 21 + +/* + * Minimum display size. + */ +#define MINROWS 23 +#define MINCOLS 40 + +int Rows, Cols; /* current screen size */ + +/* + * Translations from board coordinates to display coordinates. + * As with board coordinates, display coordiates are zero origin. + */ +#define RTOD(x) ((x) - 1) +#define CTOD(x) ((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1)) + +/* + * A `shape' is the fundamental thing that makes up the game. There + * are 7 basic shapes, each consisting of four `blots': + * + * X.X X.X X.X + * X.X X.X X.X.X X.X X.X.X X.X.X X.X.X.X + * X X X + * + * 0 1 2 3 4 5 6 + * + * Except for 3 and 6, the center of each shape is one of the blots. + * This blot is designated (0,0). The other three blots can then be + * described as offsets from the center. Shape 3 is the same under + * rotation, so its center is effectively irrelevant; it has been chosen + * so that it `sticks out' upward and leftward. Except for shape 6, + * all the blots are contained in a box going from (-1,-1) to (+1,+1); + * shape 6's center `wobbles' as it rotates, so that while it `sticks out' + * rightward, its rotation---a vertical line---`sticks out' downward. + * The containment box has to include the offset (2,0), making the overall + * containment box range from offset (-1,-1) to (+2,+1). (This is why + * there is only one row above, but two rows below, the display area.) + * + * The game works by choosing one of these shapes at random and putting + * its center at the middle of the first display row (row 1, column 5). + * The shape is moved steadily downward until it collides with something: + * either another shape, or the bottom of the board. When the shape can + * no longer be moved downwards, it is merged into the current board. + * At this time, any completely filled rows are elided, and blots above + * these rows move down to make more room. A new random shape is again + * introduced at the top of the board, and the whole process repeats. + * The game ends when the new shape will not fit at (1,5). + * + * While the shapes are falling, the user can rotate them counterclockwise + * 90 degrees (in addition to moving them left or right), provided that the + * rotation puts the blots in empty spaces. The table of shapes is set up + * so that each shape contains the index of the new shape obtained by + * rotating the current shape. Due to symmetry, each shape has exactly + * 1, 2, or 4 rotations total; the first 7 entries in the table represent + * the primary shapes, and the remaining 12 represent their various + * rotated forms. + */ +struct shape { + int rot; /* index of rotated version of this shape */ + int off[3]; /* offsets to other blots if center is at (0,0) */ +}; + +extern struct shape shapes[]; +#define randshape() (&shapes[random() % 7]) + +/* + * Shapes fall at a rate faster than once per second. + * + * The initial rate is determined by dividing 1 million microseconds + * by the game `level'. (This is at most 1 million, or one second.) + * Each time the fall-rate is used, it is decreased a little bit, + * depending on its current value, via the `faster' macro below. + * The value eventually reaches a limit, and things stop going faster, + * but by then the game is utterly impossible. + */ +long fallrate; /* less than 1 million; smaller => faster */ +#define faster() (fallrate -= fallrate / 3000) + +/* + * Game level must be between 1 and 9. This controls the initial fall rate + * and affects scoring. + */ +#define MINLEVEL 1 +#define MAXLEVEL 9 + +/* + * Scoring is as follows: + * + * When the shape comes to rest, and is integrated into the board, + * we score one point. If the shape is high up (at a low-numbered row), + * and the user hits the space bar, the shape plummets all the way down, + * and we score a point for each row it falls (plus one more as soon as + * we find that it is at rest and integrate it---until then, it can + * still be moved or rotated). + */ +int score; /* the obvious thing */ + +char key_msg[100]; + +int fits_in __P((struct shape *, int)); +void place __P((struct shape *, int, int)); +void stop __P((char *)); diff --git a/gnu/gnu2bmake/gcc-2.6.1.tcl b/gnu/gnu2bmake/gcc-2.6.1.tcl index a56c804af861c..0598ae4963538 100755 --- a/gnu/gnu2bmake/gcc-2.6.1.tcl +++ b/gnu/gnu2bmake/gcc-2.6.1.tcl @@ -7,7 +7,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id$ +# $Id: gcc-2.6.1.tcl,v 1.2 1994/11/15 04:52:18 phk Exp $ # # Good for 2.6.1 and 2.6.2 @@ -135,7 +135,7 @@ sh "mkdir $ddir/legal" sh "cp $sdir/gen-*.c $sdir/md $ddir/legal" set f [open $ddir/README w] puts $f { -$Id$ +$Id: gcc-2.6.1.tcl,v 1.2 1994/11/15 04:52:18 phk Exp $ This directory contains gcc in a form that uses "bmake" makefiles. This is not the place you want to start, if you want to hack gcc. diff --git a/gnu/gnu2bmake/gnu2bmake.tcl b/gnu/gnu2bmake/gnu2bmake.tcl index a99b1b3d134dd..489a85fc47e1b 100644 --- a/gnu/gnu2bmake/gnu2bmake.tcl +++ b/gnu/gnu2bmake/gnu2bmake.tcl @@ -7,7 +7,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id$ +# $Id: gnu2bmake.tcl,v 1.3 1994/11/15 04:52:19 phk Exp $ # ####################################################################### # Generic procedures usable in the process of gnu-to-bmake jobs. diff --git a/gnu/include/Makefile b/gnu/include/Makefile index 536fd55483d41..efb5daf361a6d 100644 --- a/gnu/include/Makefile +++ b/gnu/include/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/11/08 00:47:02 ache Exp $ +# $Id: Makefile,v 1.1.6.2 1996/06/05 02:38:25 jkh Exp $ # all depend lint tags: diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 55ec60143b24b..6a17afb29d82e 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1995/01/16 17:53:43 ache Exp $ +# $Id: Makefile,v 1.8.4.1 1996/02/23 21:48:31 peter Exp $ SUBDIR= libdialog libg++ libgmp libmalloc libmp libregex libreadline diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc index 605c0cd382ab4..ddf5b3053a85c 100644 --- a/gnu/lib/Makefile.inc +++ b/gnu/lib/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.3 1994/05/28 09:56:30 csgr Exp $ +# $Id: Makefile.inc,v 1.4 1994/08/05 21:33:53 wollman Exp $ SHLIB_MAJOR?= 2 SHLIB_MINOR?= 0 diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 050e13015b402..6d0751df646d1 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -1,5 +1,5 @@ # Makefile for libdialog -# $Id: Makefile,v 1.12.4.1 1995/12/23 15:22:01 jkh Exp $ +# $Id: Makefile,v 1.12.4.2 1996/05/03 23:32:11 jkh Exp $ LIB= dialog MAN3= dialog.3 diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile index ed0f2b70e1ac7..1dabe3e150146 100644 --- a/gnu/lib/libdialog/TESTS/Makefile +++ b/gnu/lib/libdialog/TESTS/Makefile @@ -1,6 +1,6 @@ # Really quick and evil Makefile for building all the tests. I wish that bmake was friendlier to # the concept of multiple progs/libs in the same directory. -# $Id$ +# $Id: Makefile,v 1.1.2.3 1997/02/07 02:17:47 jkh Exp $ PROGS= msg yesno prgbox gauge dselect fselect text menu1 menu2 menu3 \ input1 input2 check1 check2 check3 radio1 radio2 radio3 diff --git a/gnu/lib/libdialog/TESTS/check1.c b/gnu/lib/libdialog/TESTS/check1.c index 374fb47a3bd9f..c043bdc183000 100644 --- a/gnu/lib/libdialog/TESTS/check1.c +++ b/gnu/lib/libdialog/TESTS/check1.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: check1.c,v 1.3 1996/04/16 12:17:20 jkh Exp $ + * $Id: check1.c,v 1.1.2.1 1996/05/03 23:32:25 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/check2.c b/gnu/lib/libdialog/TESTS/check2.c index 8a9961aa4330f..1a4dba53f37d3 100644 --- a/gnu/lib/libdialog/TESTS/check2.c +++ b/gnu/lib/libdialog/TESTS/check2.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: check2.c,v 1.2 1996/04/16 12:17:21 jkh Exp $ + * $Id: check2.c,v 1.1.2.1 1996/05/03 23:32:25 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/check3.c b/gnu/lib/libdialog/TESTS/check3.c index 7930b1e092127..d9b651237b650 100644 --- a/gnu/lib/libdialog/TESTS/check3.c +++ b/gnu/lib/libdialog/TESTS/check3.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: check3.c,v 1.2 1996/04/16 12:17:21 jkh Exp $ + * $Id: check3.c,v 1.1.2.1 1996/05/03 23:32:26 jkh Exp $ * */ diff --git a/gnu/lib/libdialog/TESTS/dselect.c b/gnu/lib/libdialog/TESTS/dselect.c index 8b673f62bbcca..6e646bc655dd6 100644 --- a/gnu/lib/libdialog/TESTS/dselect.c +++ b/gnu/lib/libdialog/TESTS/dselect.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: dselect.c,v 1.1 1996/01/01 03:45:24 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/fselect.c b/gnu/lib/libdialog/TESTS/fselect.c index d07d726ec8565..ed11ebdf556ac 100644 --- a/gnu/lib/libdialog/TESTS/fselect.c +++ b/gnu/lib/libdialog/TESTS/fselect.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: fselect.c,v 1.1 1996/01/01 03:45:24 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/gauge.c b/gnu/lib/libdialog/TESTS/gauge.c index 880ff6abd308a..36949fccd4163 100644 --- a/gnu/lib/libdialog/TESTS/gauge.c +++ b/gnu/lib/libdialog/TESTS/gauge.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: gauge.c,v 1.2 1996/02/08 11:55:15 jkh Exp $ + * $Id: gauge.c,v 1.1.2.2 1996/05/03 23:32:26 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/input1.c b/gnu/lib/libdialog/TESTS/input1.c index edb45f583fc98..8e751195e208d 100644 --- a/gnu/lib/libdialog/TESTS/input1.c +++ b/gnu/lib/libdialog/TESTS/input1.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: input1.c,v 1.1 1996/01/01 03:45:25 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/menu1.c b/gnu/lib/libdialog/TESTS/menu1.c index 7a21eb8ae6cea..a25bdd9578366 100644 --- a/gnu/lib/libdialog/TESTS/menu1.c +++ b/gnu/lib/libdialog/TESTS/menu1.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: menu1.c,v 1.4 1996/04/18 13:21:25 jkh Exp $ + * $Id: menu1.c,v 1.1.2.1 1996/05/03 23:32:27 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/menu2.c b/gnu/lib/libdialog/TESTS/menu2.c index 4b4c5b7e264d6..72a096474913a 100644 --- a/gnu/lib/libdialog/TESTS/menu2.c +++ b/gnu/lib/libdialog/TESTS/menu2.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: menu2.c,v 1.4 1996/04/18 13:21:26 jkh Exp $ + * $Id: menu2.c,v 1.1.2.1 1996/05/03 23:32:28 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/menu3.c b/gnu/lib/libdialog/TESTS/menu3.c index 374ee2d008696..e114b43588a77 100644 --- a/gnu/lib/libdialog/TESTS/menu3.c +++ b/gnu/lib/libdialog/TESTS/menu3.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: menu3.c,v 1.1.2.1 1996/05/03 23:32:28 jkh Exp $ + * $Id: menu3.c,v 1.1.2.2 1996/07/05 08:12:28 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/msg.c b/gnu/lib/libdialog/TESTS/msg.c index 9c2edc417c9d0..7ebeb44d05090 100644 --- a/gnu/lib/libdialog/TESTS/msg.c +++ b/gnu/lib/libdialog/TESTS/msg.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: msg.c,v 1.1 1996/01/01 03:45:28 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/prgbox.c b/gnu/lib/libdialog/TESTS/prgbox.c index 6a751c32687d1..2634b6a7233a2 100644 --- a/gnu/lib/libdialog/TESTS/prgbox.c +++ b/gnu/lib/libdialog/TESTS/prgbox.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: prgbox.c,v 1.1 1996/01/01 03:45:28 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/radio1.c b/gnu/lib/libdialog/TESTS/radio1.c index 3875fae998796..7628a6b55a203 100644 --- a/gnu/lib/libdialog/TESTS/radio1.c +++ b/gnu/lib/libdialog/TESTS/radio1.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: radio1.c,v 1.3 1996/04/16 12:17:25 jkh Exp $ + * $Id: radio1.c,v 1.1.2.1 1996/05/03 23:32:29 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/radio2.c b/gnu/lib/libdialog/TESTS/radio2.c index 04ca84d7dcdc0..68d001c5bc233 100644 --- a/gnu/lib/libdialog/TESTS/radio2.c +++ b/gnu/lib/libdialog/TESTS/radio2.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: radio2.c,v 1.3 1996/04/16 12:17:26 jkh Exp $ + * $Id: radio2.c,v 1.1.2.1 1996/05/03 23:32:31 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/radio3.c b/gnu/lib/libdialog/TESTS/radio3.c index e8e117fac6c07..499b9b7778817 100644 --- a/gnu/lib/libdialog/TESTS/radio3.c +++ b/gnu/lib/libdialog/TESTS/radio3.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: radio3.c,v 1.3 1996/04/16 12:17:27 jkh Exp $ + * $Id: radio3.c,v 1.1.2.1 1996/05/03 23:32:31 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/text.c b/gnu/lib/libdialog/TESTS/text.c index f63b5334b21de..33ab478414f4d 100644 --- a/gnu/lib/libdialog/TESTS/text.c +++ b/gnu/lib/libdialog/TESTS/text.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: text.c,v 1.1 1996/01/01 03:45:32 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/TESTS/yesno.c b/gnu/lib/libdialog/TESTS/yesno.c index 841451a8c06ff..ad14aa69f9659 100644 --- a/gnu/lib/libdialog/TESTS/yesno.c +++ b/gnu/lib/libdialog/TESTS/yesno.c @@ -13,7 +13,7 @@ * the author assume any responsibility for damages incurred with * its use. * - * $Id: test1.c,v 1.2 1995/12/23 14:53:07 jkh Exp $ + * $Id: yesno.c,v 1.1 1996/01/01 03:45:32 jkh Exp $ */ #include diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3 index 7c2c0a00f8bcc..13fe2955731ee 100644 --- a/gnu/lib/libdialog/dialog.3 +++ b/gnu/lib/libdialog/dialog.3 @@ -11,7 +11,7 @@ .\" nor does the author assume any responsibility for damages incurred with .\" its use. .\" -.\" $Id$ +.\" $Id: dialog.3,v 1.1.2.2 1996/05/03 23:32:13 jkh Exp $ .\" .Dd December 18, 1995 .Dt dialog 3 diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 0788048a08e6f..e161b33683a21 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.9 1995/05/08 16:10:34 ache Exp $ +# $Id: Makefile,v 1.9.4.1 1995/08/30 06:46:26 davidg Exp $ # SRCS= bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \ bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \ diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile index 18b25418d1cc9..c5991a1c10914 100644 --- a/gnu/lib/libgmp/Makefile +++ b/gnu/lib/libgmp/Makefile @@ -1,5 +1,5 @@ # Makefile for libgmp -# $Id: Makefile,v 1.3.2.2 1996/06/05 02:38:30 jkh Exp $ +# $Id: Makefile,v 1.3.2.3 1996/06/24 02:40:08 jkh Exp $ LIB= gmp SRCS= $(GMP_SRCS) diff --git a/gnu/lib/libgmp/cre-conv-tab.c b/gnu/lib/libgmp/cre-conv-tab.c index d5d1bea016fff..db86362f51786 100644 --- a/gnu/lib/libgmp/cre-conv-tab.c +++ b/gnu/lib/libgmp/cre-conv-tab.c @@ -1,6 +1,6 @@ /* cre-conv-tab.c -- Create conversion table in a wordsize-dependent way. - $Id$ + $Id: cre-conv-tab.c,v 1.2 1995/11/12 14:55:47 markm Exp $ Copyright (C) 1991 Free Software Foundation, Inc. diff --git a/gnu/lib/libgmp/cre-mparam.c b/gnu/lib/libgmp/cre-mparam.c index ebb19d30e6328..cda2010056c24 100644 --- a/gnu/lib/libgmp/cre-mparam.c +++ b/gnu/lib/libgmp/cre-mparam.c @@ -1,6 +1,6 @@ /* cre-mparam.c -- Create machine-depedent parameter file. - $Id$ + $Id: cre-mparam.c,v 1.2 1995/11/12 14:55:48 markm Exp $ Copyright (C) 1991 Free Software Foundation, Inc. diff --git a/gnu/lib/libgmp/doc/Makefile b/gnu/lib/libgmp/doc/Makefile index 3d1f0fe64aa65..6c790f611b0e9 100644 --- a/gnu/lib/libgmp/doc/Makefile +++ b/gnu/lib/libgmp/doc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/11/13 18:40:45 markm Exp $ INFO= gmp diff --git a/gnu/lib/libmalloc/Makefile b/gnu/lib/libmalloc/Makefile index 1d33b0f25bc53..d69a7dbe5a44f 100644 --- a/gnu/lib/libmalloc/Makefile +++ b/gnu/lib/libmalloc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1993/12/28 07:54:51 smace Exp $ +# $Id: Makefile,v 1.5 1994/05/27 10:48:19 csgr Exp $ CFLAGS+= -I${.CURDIR} diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile index 4f7a474422aa0..6d31c0ab0507f 100644 --- a/gnu/lib/libmp/Makefile +++ b/gnu/lib/libmp/Makefile @@ -1,5 +1,5 @@ # Makefile for libmp -# $Id: Makefile,v 1.3 1995/11/13 18:39:23 markm Exp $ +# $Id: Makefile,v 1.4 1995/11/25 00:13:57 peter Exp $ LIB= mp SRCS= $(MP_SRCS) diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile index 4d511fd913d13..31db15af25e72 100644 --- a/gnu/lib/libreadline/Makefile +++ b/gnu/lib/libreadline/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1995/05/08 08:43:06 ache Exp $ +# $Id: Makefile,v 1.20.4.2 1996/06/05 02:38:34 jkh Exp $ CFLAGS+= -I${.CURDIR} -DVOID_SIGHANDLER -DHAVE_CONFIG_H diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index 355aaf57893c9..29069b49fd4bf 100644 --- a/gnu/lib/libregex/Makefile +++ b/gnu/lib/libregex/Makefile @@ -1,4 +1,4 @@ -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/lib/libregex/Makefile,v 1.14 1995/03/12 23:21:29 ache Exp $ +# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.14.4.2 1996/06/05 02:38:54 jkh Exp $ LIB= gnuregex diff --git a/gnu/libexec/Makefile b/gnu/libexec/Makefile index a6bc1c9d278ff..a3e7a56ca0418 100644 --- a/gnu/libexec/Makefile +++ b/gnu/libexec/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/01/31 09:29:38 wpaul Exp $ +# $Id: Makefile,v 1.2.4.2 1996/06/05 02:38:58 jkh Exp $ SUBDIR= uucp ypxfr diff --git a/gnu/libexec/Makefile.inc b/gnu/libexec/Makefile.inc index 1ac3dc7c91c8f..ce2cd44c3076e 100644 --- a/gnu/libexec/Makefile.inc +++ b/gnu/libexec/Makefile.inc @@ -1,3 +1,3 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1994/01/30 01:08:21 rgrimes Exp $ BINDIR?= /usr/libexec diff --git a/gnu/libexec/uucp/Makefile b/gnu/libexec/uucp/Makefile index 13a2d238e8a24..39f853bee7503 100644 --- a/gnu/libexec/uucp/Makefile +++ b/gnu/libexec/uucp/Makefile @@ -1,5 +1,5 @@ # This is the Makefile for Taylor UUCP -# $Id: Makefile,v 1.2 1993/10/14 12:17:57 rgrimes Exp $ +# $Id: Makefile,v 1.3 1995/01/01 21:58:01 ache Exp $ SUBDIR= libunix libuucp libuuconf \ doc sample \ diff --git a/gnu/libexec/uucp/common_sources/chat.c b/gnu/libexec/uucp/common_sources/chat.c index e52006b31e8d2..59240d10690e7 100644 --- a/gnu/libexec/uucp/common_sources/chat.c +++ b/gnu/libexec/uucp/common_sources/chat.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char chat_rcsid[] = "$Id: chat.c,v 1.4 1995/08/19 21:23:41 ache Exp $"; +const char chat_rcsid[] = "$Id: chat.c,v 1.3.4.1 1995/09/01 06:01:29 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/common_sources/conn.c b/gnu/libexec/uucp/common_sources/conn.c index 4e0733d59f051..64a04130b3f31 100644 --- a/gnu/libexec/uucp/common_sources/conn.c +++ b/gnu/libexec/uucp/common_sources/conn.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char conn_rcsid[] = "$Id: conn.c,v 1.4 1995/08/19 21:23:46 ache Exp $"; +const char conn_rcsid[] = "$Id: conn.c,v 1.3.4.1 1995/09/01 06:01:31 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/common_sources/copy.c b/gnu/libexec/uucp/common_sources/copy.c index 227bee6a3c75e..ba1d1bf93ad71 100644 --- a/gnu/libexec/uucp/common_sources/copy.c +++ b/gnu/libexec/uucp/common_sources/copy.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char copy_rcsid[] = "$Id: copy.c,v 1.3 1995/08/19 21:23:49 ache Exp $"; +const char copy_rcsid[] = "$Id: copy.c,v 1.2.6.1 1995/09/01 06:01:34 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/common_sources/log.c b/gnu/libexec/uucp/common_sources/log.c index c99708bc905a6..f305632c64622 100644 --- a/gnu/libexec/uucp/common_sources/log.c +++ b/gnu/libexec/uucp/common_sources/log.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char log_rcsid[] = "$Id: log.c,v 1.4 1995/08/19 21:23:54 ache Exp $"; +const char log_rcsid[] = "$Id: log.c,v 1.3.4.1 1995/09/01 06:01:37 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/common_sources/prot.c b/gnu/libexec/uucp/common_sources/prot.c index ba6bc65918e02..aede8113f3ca9 100644 --- a/gnu/libexec/uucp/common_sources/prot.c +++ b/gnu/libexec/uucp/common_sources/prot.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char prot_rcsid[] = "$Id: prot.c,v 1.3 1995/08/19 21:23:59 ache Exp $"; +const char prot_rcsid[] = "$Id: prot.c,v 1.2.6.1 1995/09/01 06:01:40 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/common_sources/util.c b/gnu/libexec/uucp/common_sources/util.c index b65bf8172f457..b8cf283f9e957 100644 --- a/gnu/libexec/uucp/common_sources/util.c +++ b/gnu/libexec/uucp/common_sources/util.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char util_rcsid[] = "$Id: util.c,v 1.3 1995/08/19 21:24:13 ache Exp $"; +const char util_rcsid[] = "$Id: util.c,v 1.2.6.1 1995/09/01 06:01:47 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/contrib/Makefile.uurt b/gnu/libexec/uucp/contrib/Makefile.uurt index 473edbb9cae13..2a2b10b3242d8 100644 --- a/gnu/libexec/uucp/contrib/Makefile.uurt +++ b/gnu/libexec/uucp/contrib/Makefile.uurt @@ -1,4 +1,4 @@ -# $Id: Makefile.uurt,v 1.3 1995/08/19 21:24:24 ache Exp $ +# $Id: Makefile.uurt,v 1.2.6.1 1995/09/01 06:01:53 davidg Exp $ # Makefile for uurate 1.10 # diff --git a/gnu/libexec/uucp/contrib/uupoll.shar b/gnu/libexec/uucp/contrib/uupoll.shar index 5505ad11d7e5e..6b394ba511c86 100644 --- a/gnu/libexec/uucp/contrib/uupoll.shar +++ b/gnu/libexec/uucp/contrib/uupoll.shar @@ -493,10 +493,14 @@ X not scan the uucico log. X X #if !defined(lint) -static char rcsid[] = "$Id: uupoll.shar,v 1.1.6.1 1995/09/01 06:01:57 davidg Exp $"; +static char rcsid[] = "$Id: uupoll.shar,v 1.1.6.3 1996/06/05 02:39:00 jkh Exp $"; #endif /* not lint */ X /* $Log: uupoll.shar,v $ + * Revision 1.1.6.3 1996/06/05 02:39:00 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * # Revision 1.1.6.1 1995/09/01 06:01:57 davidg # Brought in changes from main branch: updated to UUCP 1.06.1 # @@ -1636,8 +1640,12 @@ sed 's/^X//' << 'SHAR_EOF' > 'uupoll/conf.h' && #ifndef CONF X #define CONF X -/* $Id: uupoll.shar,v 1.1.6.1 1995/09/01 06:01:57 davidg Exp $ */ +/* $Id: uupoll.shar,v 1.1.6.3 1996/06/05 02:39:00 jkh Exp $ */ /* $Log: uupoll.shar,v $ + * Revision 1.1.6.3 1996/06/05 02:39:00 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * # Revision 1.1.6.1 1995/09/01 06:01:57 davidg # Brought in changes from main branch: updated to UUCP 1.06.1 # @@ -2002,10 +2010,14 @@ X - No alias expansion is done on the given names. */ X #if !defined(lint) -static char rcsid[] = "$Id: uupoll.shar,v 1.1.6.1 1995/09/01 06:01:57 davidg Exp $"; +static char rcsid[] = "$Id: uupoll.shar,v 1.1.6.3 1996/06/05 02:39:00 jkh Exp $"; #endif /* not lint */ X /* $Log: uupoll.shar,v $ + * Revision 1.1.6.3 1996/06/05 02:39:00 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * # Revision 1.1.6.1 1995/09/01 06:01:57 davidg # Brought in changes from main branch: updated to UUCP 1.06.1 # diff --git a/gnu/libexec/uucp/contrib/uurate.c b/gnu/libexec/uucp/contrib/uurate.c index 3a57c20bc30a9..3f911b64b241c 100644 --- a/gnu/libexec/uucp/contrib/uurate.c +++ b/gnu/libexec/uucp/contrib/uurate.c @@ -84,6 +84,10 @@ * get knowledge of */ /* $Log: uurate.c,v $ + * Revision 1.3.4.3 1996/06/05 02:39:02 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.3.4.1 1995/09/01 06:01:59 davidg * Brought in changes from main branch: updated to UUCP 1.06.1 * @@ -147,7 +151,7 @@ * */ char version[] = "@(#) Taylor UUCP Log File Summary Filter, Version 1.2.2"; -static char rcsid[] = "$Id: uurate.c,v 1.3.4.1 1995/09/01 06:01:59 davidg Exp $"; +static char rcsid[] = "$Id: uurate.c,v 1.3.4.3 1996/06/05 02:39:02 jkh Exp $"; #include /* Character Classification */ #include #include "uucp.h" diff --git a/gnu/libexec/uucp/contrib/uurate.man b/gnu/libexec/uucp/contrib/uurate.man index 2a150a84008b9..635bfef70948b 100644 --- a/gnu/libexec/uucp/contrib/uurate.man +++ b/gnu/libexec/uucp/contrib/uurate.man @@ -1,4 +1,4 @@ -''' $Id: uurate.man,v 1.3 1995/08/19 21:24:40 ache Exp $ +''' $Id: uurate.man,v 1.2.6.1 1995/09/01 06:02:01 davidg Exp $ .TH uurate 1 .SH NAME uurate \- Report Taylor UUCP statistics diff --git a/gnu/libexec/uucp/contrib/uusnap.c b/gnu/libexec/uucp/contrib/uusnap.c index c12f7bd8405db..a0f60645cc965 100644 --- a/gnu/libexec/uucp/contrib/uusnap.c +++ b/gnu/libexec/uucp/contrib/uusnap.c @@ -25,7 +25,7 @@ #include "uucp.h" #if USE_RCS_ID -char uusnap_rcsid[] = "$Id: uusnap.c,v 1.4 1995/08/19 21:24:42 ache Exp $"; +char uusnap_rcsid[] = "$Id: uusnap.c,v 1.3.4.1 1995/09/01 06:02:02 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/cu/Makefile b/gnu/libexec/uucp/cu/Makefile index ed239827b683d..e363c43948076 100644 --- a/gnu/libexec/uucp/cu/Makefile +++ b/gnu/libexec/uucp/cu/Makefile @@ -1,5 +1,5 @@ # Makefile for cu -# $Id: Makefile,v 1.3.6.1 1995/09/01 06:02:08 davidg Exp $ +# $Id: Makefile,v 1.3.6.3 1996/06/05 02:39:04 jkh Exp $ BINDIR= $(bindir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/cu/cu.1 b/gnu/libexec/uucp/cu/cu.1 index 625e99416f27c..ed8d58e329333 100644 --- a/gnu/libexec/uucp/cu/cu.1 +++ b/gnu/libexec/uucp/cu/cu.1 @@ -1,4 +1,4 @@ -''' $Id: cu.1,v 1.4 1995/08/19 21:24:50 ache Exp $ +''' $Id: cu.1,v 1.3.4.1 1995/09/01 06:02:09 davidg Exp $ .TH cu 1 "Taylor UUCP 1.06" .SH NAME cu \- Call up another system diff --git a/gnu/libexec/uucp/cu/cu.c b/gnu/libexec/uucp/cu/cu.c index e8a4623f67f49..1b52bc4062ddc 100644 --- a/gnu/libexec/uucp/cu/cu.c +++ b/gnu/libexec/uucp/cu/cu.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char cu_rcsid[] = "$Id: cu.c,v 1.5 1995/08/19 21:24:51 ache Exp $"; +const char cu_rcsid[] = "$Id: cu.c,v 1.4.4.1 1995/09/01 06:02:10 davidg Exp $"; #endif #include "cu.h" diff --git a/gnu/libexec/uucp/doc/uucp.texi b/gnu/libexec/uucp/doc/uucp.texi index 7b0ac7cef729f..404bfc644e16f 100644 --- a/gnu/libexec/uucp/doc/uucp.texi +++ b/gnu/libexec/uucp/doc/uucp.texi @@ -5649,8 +5649,8 @@ Keywords: UUCP, protocol, FAQ Approved: news-answers-request@@MIT.Edu Archive-name: uucp-internals -Version: $Revision: 1.3 $ -Last-modified: $Date: 1995/08/21 11:28:17 $ +Version: $Revision: 1.1.6.1 $ +Last-modified: $Date: 1995/09/01 06:02:12 $ @end format @end ifset diff --git a/gnu/libexec/uucp/libunix/Makefile b/gnu/libexec/uucp/libunix/Makefile index aef9a6f3af900..311baf58b62cd 100644 --- a/gnu/libexec/uucp/libunix/Makefile +++ b/gnu/libexec/uucp/libunix/Makefile @@ -1,5 +1,5 @@ # This subdirectory contains Unix specific support functions. -# $Id: Makefile,v 1.4 1995/08/19 21:25:01 ache Exp $ +# $Id: Makefile,v 1.3.4.1 1995/09/01 06:02:20 davidg Exp $ LIB= unix SRCS = access.c addbas.c app3.c app4.c basnam.c bytfre.c corrup.c \ diff --git a/gnu/libexec/uucp/libunix/cusub.c b/gnu/libexec/uucp/libunix/cusub.c index 654b72a8c2071..3307c08daa057 100644 --- a/gnu/libexec/uucp/libunix/cusub.c +++ b/gnu/libexec/uucp/libunix/cusub.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char cusub_rcsid[] = "$Id: cusub.c,v 1.4 1995/08/19 21:25:06 ache Exp $"; +const char cusub_rcsid[] = "$Id: cusub.c,v 1.3.4.1 1995/09/01 06:02:23 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/lock.c b/gnu/libexec/uucp/libunix/lock.c index 23dee3fda5e1d..39399c5d981b7 100644 --- a/gnu/libexec/uucp/libunix/lock.c +++ b/gnu/libexec/uucp/libunix/lock.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char lock_rcsid[] = "$Id: lock.c,v 1.4 1995/08/19 21:25:36 ache Exp $"; +const char lock_rcsid[] = "$Id: lock.c,v 1.3.4.1 1995/09/01 06:02:44 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/picksb.c b/gnu/libexec/uucp/libunix/picksb.c index a660283c16df9..3ceae0a8f79da 100644 --- a/gnu/libexec/uucp/libunix/picksb.c +++ b/gnu/libexec/uucp/libunix/picksb.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char picksb_rcsid[] = "$Id: picksb.c,v 1.4 1995/08/19 21:25:47 ache Exp $"; +const char picksb_rcsid[] = "$Id: picksb.c,v 1.3.4.1 1995/09/01 06:02:51 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/pipe.c b/gnu/libexec/uucp/libunix/pipe.c index b59b46980a12f..098619bb6c07c 100644 --- a/gnu/libexec/uucp/libunix/pipe.c +++ b/gnu/libexec/uucp/libunix/pipe.c @@ -27,7 +27,7 @@ #include "uucp.h" #if USE_RCS_ID -const char pipe_rcsid[] = "$Id: pipe.c,v 1.2 1995/08/19 21:25:48 ache Exp $"; +const char pipe_rcsid[] = "$Id: pipe.c,v 1.1.6.1 1995/09/01 06:02:52 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/serial.c b/gnu/libexec/uucp/libunix/serial.c index 0772b05eed7fe..f6e969a8fdcef 100644 --- a/gnu/libexec/uucp/libunix/serial.c +++ b/gnu/libexec/uucp/libunix/serial.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char serial_rcsid[] = "$Id: serial.c,v 1.5.4.1 1995/09/01 06:02:58 davidg Exp $"; +const char serial_rcsid[] = "$Id: serial.c,v 1.5.4.2 1996/10/12 10:46:58 joerg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/spool.c b/gnu/libexec/uucp/libunix/spool.c index 0f51976d5aa95..65545fc2d77a5 100644 --- a/gnu/libexec/uucp/libunix/spool.c +++ b/gnu/libexec/uucp/libunix/spool.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char spool_rcsid[] = "$Id: spool.c,v 1.4 1995/08/19 21:26:02 ache Exp $"; +const char spool_rcsid[] = "$Id: spool.c,v 1.3.4.1 1995/09/01 06:03:03 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/statsb.c b/gnu/libexec/uucp/libunix/statsb.c index fdb71dc758f74..b916456a04909 100644 --- a/gnu/libexec/uucp/libunix/statsb.c +++ b/gnu/libexec/uucp/libunix/statsb.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char statsb_rcsid[] = "$Id: statsb.c,v 1.3 1995/08/19 21:26:05 ache Exp $"; +const char statsb_rcsid[] = "$Id: statsb.c,v 1.2.6.1 1995/09/01 06:03:05 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/tcp.c b/gnu/libexec/uucp/libunix/tcp.c index 6ec39f26a63ba..d38536ce231bb 100644 --- a/gnu/libexec/uucp/libunix/tcp.c +++ b/gnu/libexec/uucp/libunix/tcp.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tcp_rcsid[] = "$Id: tcp.c,v 1.5 1995/06/21 19:20:46 ian Rel $"; +const char tcp_rcsid[] = "$Id: tcp.c,v 1.1 1995/08/19 21:26:10 ache Exp $"; #endif #if HAVE_TCP diff --git a/gnu/libexec/uucp/libunix/tli.c b/gnu/libexec/uucp/libunix/tli.c index 3e546c844991b..a67e8c88c4530 100644 --- a/gnu/libexec/uucp/libunix/tli.c +++ b/gnu/libexec/uucp/libunix/tli.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tli_rcsid[] = "$Id: tli.c,v 1.4 1995/06/21 19:20:50 ian Rel $"; +const char tli_rcsid[] = "$Id: tli.c,v 1.1 1995/08/19 21:26:11 ache Exp $"; #endif #if HAVE_TLI diff --git a/gnu/libexec/uucp/libunix/work.c b/gnu/libexec/uucp/libunix/work.c index e28e480d1e34e..ad48ca56887b0 100644 --- a/gnu/libexec/uucp/libunix/work.c +++ b/gnu/libexec/uucp/libunix/work.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char work_rcsid[] = "$Id: work.c,v 1.4 1995/08/19 21:26:21 ache Exp $"; +const char work_rcsid[] = "$Id: work.c,v 1.3.4.1 1995/09/01 06:03:12 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/xqtfil.c b/gnu/libexec/uucp/libunix/xqtfil.c index 71a6b48e844d0..ee5bf0ca2706b 100644 --- a/gnu/libexec/uucp/libunix/xqtfil.c +++ b/gnu/libexec/uucp/libunix/xqtfil.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.4 1995/08/19 21:26:23 ache Exp $"; +const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.3.4.1 1995/09/01 06:03:13 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libunix/xqtsub.c b/gnu/libexec/uucp/libunix/xqtsub.c index ea0794660b553..e587e0ea27398 100644 --- a/gnu/libexec/uucp/libunix/xqtsub.c +++ b/gnu/libexec/uucp/libunix/xqtsub.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.4 1995/08/19 21:26:25 ache Exp $"; +const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.3.4.1 1995/09/01 06:03:14 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/libuuconf/Makefile b/gnu/libexec/uucp/libuuconf/Makefile index 1a8cab21aef33..eaf1d3eee1cb2 100644 --- a/gnu/libexec/uucp/libuuconf/Makefile +++ b/gnu/libexec/uucp/libuuconf/Makefile @@ -1,5 +1,5 @@ # This is the Makefile for the Taylor UUCP uuconf library -# $Id: Makefile,v 1.3 1995/08/19 21:26:30 ache Exp $ +# $Id: Makefile,v 1.2.6.1 1995/09/01 06:03:19 davidg Exp $ LIB= uuconf SRCS = addblk.c addstr.c allblk.c alloc.c base.c bool.c callin.c \ diff --git a/gnu/libexec/uucp/libuuconf/addblk.c b/gnu/libexec/uucp/libuuconf/addblk.c index 91763c7f3cbeb..b833a73dd6316 100644 --- a/gnu/libexec/uucp/libuuconf/addblk.c +++ b/gnu/libexec/uucp/libuuconf/addblk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_addblk_rcsid[] = "$Id: addblk.c,v 1.3 1995/08/19 21:26:32 ache Exp $"; +const char _uuconf_addblk_rcsid[] = "$Id: addblk.c,v 1.2.6.1 1995/09/01 06:03:21 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/addstr.c b/gnu/libexec/uucp/libuuconf/addstr.c index 80d9d5850bfa2..3b29d0944e6ae 100644 --- a/gnu/libexec/uucp/libuuconf/addstr.c +++ b/gnu/libexec/uucp/libuuconf/addstr.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_addstr_rcsid[] = "$Id: addstr.c,v 1.3 1995/08/19 21:26:33 ache Exp $"; +const char _uuconf_addstr_rcsid[] = "$Id: addstr.c,v 1.2.6.1 1995/09/01 06:03:22 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/allblk.c b/gnu/libexec/uucp/libuuconf/allblk.c index 859f4ebdc317c..fa4aa45365e5a 100644 --- a/gnu/libexec/uucp/libuuconf/allblk.c +++ b/gnu/libexec/uucp/libuuconf/allblk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_allblk_rcsid[] = "$Id: allblk.c,v 1.3 1995/08/19 21:26:34 ache Exp $"; +const char _uuconf_allblk_rcsid[] = "$Id: allblk.c,v 1.2.6.1 1995/09/01 06:03:23 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/alloc.c b/gnu/libexec/uucp/libuuconf/alloc.c index f51268676dd46..c2b2099f72d5f 100644 --- a/gnu/libexec/uucp/libuuconf/alloc.c +++ b/gnu/libexec/uucp/libuuconf/alloc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_alloc_rcsid[] = "$Id: alloc.c,v 1.3 1995/08/19 21:26:36 ache Exp $"; +const char _uuconf_alloc_rcsid[] = "$Id: alloc.c,v 1.2.6.1 1995/09/01 06:03:24 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/base.c b/gnu/libexec/uucp/libuuconf/base.c index de1dca343cf1c..0f38e062fff91 100644 --- a/gnu/libexec/uucp/libuuconf/base.c +++ b/gnu/libexec/uucp/libuuconf/base.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_base_rcsid[] = "$Id: base.c,v 1.3 1995/08/19 21:26:39 ache Exp $"; +const char _uuconf_base_rcsid[] = "$Id: base.c,v 1.2.6.1 1995/09/01 06:03:26 davidg Exp $"; #endif /* This turns a cmdtab_offset table into a uuconf_cmdtab table. Each diff --git a/gnu/libexec/uucp/libuuconf/bool.c b/gnu/libexec/uucp/libuuconf/bool.c index c0a28b536524a..8ed9166363b90 100644 --- a/gnu/libexec/uucp/libuuconf/bool.c +++ b/gnu/libexec/uucp/libuuconf/bool.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.4 1995/08/19 21:26:41 ache Exp $"; +const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.3.4.1 1995/09/01 06:03:27 davidg Exp $"; #endif /* Parse a boolean string into a variable. This is called by diff --git a/gnu/libexec/uucp/libuuconf/callin.c b/gnu/libexec/uucp/libuuconf/callin.c index b49b0e0e2a569..12c7f5eb1f6bf 100644 --- a/gnu/libexec/uucp/libuuconf/callin.c +++ b/gnu/libexec/uucp/libuuconf/callin.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.4 1995/08/19 21:26:43 ache Exp $"; +const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.3.4.1 1995/09/01 06:03:28 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/calout.c b/gnu/libexec/uucp/libuuconf/calout.c index 0f540b3729115..60efa1cb3d337 100644 --- a/gnu/libexec/uucp/libuuconf/calout.c +++ b/gnu/libexec/uucp/libuuconf/calout.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.4 1995/08/19 21:26:44 ache Exp $"; +const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.3.4.1 1995/09/01 06:03:29 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/chatc.c b/gnu/libexec/uucp/libuuconf/chatc.c index e97a8b5a13d41..cc75d7e41600d 100644 --- a/gnu/libexec/uucp/libuuconf/chatc.c +++ b/gnu/libexec/uucp/libuuconf/chatc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_chatc_rcsid[] = "$Id: chatc.c,v 1.3 1995/08/19 21:26:45 ache Exp $"; +const char _uuconf_chatc_rcsid[] = "$Id: chatc.c,v 1.2.6.1 1995/09/01 06:03:30 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/cmdarg.c b/gnu/libexec/uucp/libuuconf/cmdarg.c index e2503d61c2db8..992f1df8e246e 100644 --- a/gnu/libexec/uucp/libuuconf/cmdarg.c +++ b/gnu/libexec/uucp/libuuconf/cmdarg.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.4 1995/08/19 21:26:48 ache Exp $"; +const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.3.4.1 1995/09/01 06:03:31 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/cmdfil.c b/gnu/libexec/uucp/libuuconf/cmdfil.c index 143f98ea49cf2..b98056128e299 100644 --- a/gnu/libexec/uucp/libuuconf/cmdfil.c +++ b/gnu/libexec/uucp/libuuconf/cmdfil.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_cmdfil_rcsid[] = "$Id: cmdfil.c,v 1.3 1995/08/19 21:26:50 ache Exp $"; +const char _uuconf_cmdfil_rcsid[] = "$Id: cmdfil.c,v 1.2.6.1 1995/09/01 06:03:33 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/cmdlin.c b/gnu/libexec/uucp/libuuconf/cmdlin.c index a242db132ea7a..09f15bb5e0639 100644 --- a/gnu/libexec/uucp/libuuconf/cmdlin.c +++ b/gnu/libexec/uucp/libuuconf/cmdlin.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_cmdlin_rcsid[] = "$Id: cmdlin.c,v 1.4 1995/08/19 21:26:51 ache Exp $"; +const char _uuconf_cmdlin_rcsid[] = "$Id: cmdlin.c,v 1.3.6.1 1995/09/01 06:03:33 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/debfil.c b/gnu/libexec/uucp/libuuconf/debfil.c index 527a5e8ef3a59..570bebbfde8e1 100644 --- a/gnu/libexec/uucp/libuuconf/debfil.c +++ b/gnu/libexec/uucp/libuuconf/debfil.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_debfil_rcsid[] = "$Id: debfil.c,v 1.3 1995/08/19 21:26:53 ache Exp $"; +const char _uuconf_debfil_rcsid[] = "$Id: debfil.c,v 1.2.6.1 1995/09/01 06:03:34 davidg Exp $"; #endif /* Get the name of the UUCP debugging file. */ diff --git a/gnu/libexec/uucp/libuuconf/deblev.c b/gnu/libexec/uucp/libuuconf/deblev.c index f543fc78c4cc7..1cebb665fad67 100644 --- a/gnu/libexec/uucp/libuuconf/deblev.c +++ b/gnu/libexec/uucp/libuuconf/deblev.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_deblev_rcsid[] = "$Id: deblev.c,v 1.3 1995/08/19 21:26:54 ache Exp $"; +const char _uuconf_deblev_rcsid[] = "$Id: deblev.c,v 1.2.6.1 1995/09/01 06:03:35 davidg Exp $"; #endif /* Get the UUCP debugging level. */ diff --git a/gnu/libexec/uucp/libuuconf/diacod.c b/gnu/libexec/uucp/libuuconf/diacod.c index f9f3357b00ee0..1278d58027d94 100644 --- a/gnu/libexec/uucp/libuuconf/diacod.c +++ b/gnu/libexec/uucp/libuuconf/diacod.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_diacod_rcsid[] = "$Id: diacod.c,v 1.3 1995/08/19 21:26:55 ache Exp $"; +const char _uuconf_diacod_rcsid[] = "$Id: diacod.c,v 1.2.6.1 1995/09/01 06:03:36 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/dial.c b/gnu/libexec/uucp/libuuconf/dial.c index bb5177c330b27..c6ab94997c94e 100644 --- a/gnu/libexec/uucp/libuuconf/dial.c +++ b/gnu/libexec/uucp/libuuconf/dial.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_dial_rcsid[] = "$Id: dial.c,v 1.3 1995/08/19 21:26:56 ache Exp $"; +const char _uuconf_dial_rcsid[] = "$Id: dial.c,v 1.2.6.1 1995/09/01 06:03:37 davidg Exp $"; #endif /* Find a dialer by name. */ diff --git a/gnu/libexec/uucp/libuuconf/diasub.c b/gnu/libexec/uucp/libuuconf/diasub.c index 882257fa73ec9..694c98dff9688 100644 --- a/gnu/libexec/uucp/libuuconf/diasub.c +++ b/gnu/libexec/uucp/libuuconf/diasub.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_diasub_rcsid[] = "$Id: diasub.c,v 1.3 1995/08/19 21:26:57 ache Exp $"; +const char _uuconf_diasub_rcsid[] = "$Id: diasub.c,v 1.2.6.1 1995/09/01 06:03:38 davidg Exp $"; #endif /* Clear the information in a dialer. */ diff --git a/gnu/libexec/uucp/libuuconf/dnams.c b/gnu/libexec/uucp/libuuconf/dnams.c index 9bedd16e28333..9bdd051a4f285 100644 --- a/gnu/libexec/uucp/libuuconf/dnams.c +++ b/gnu/libexec/uucp/libuuconf/dnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_dnams_rcsid[] = "$Id: dnams.c,v 1.3 1995/08/19 21:26:59 ache Exp $"; +const char _uuconf_dnams_rcsid[] = "$Id: dnams.c,v 1.2.6.1 1995/09/01 06:03:39 davidg Exp $"; #endif /* Get all known dialer names. */ diff --git a/gnu/libexec/uucp/libuuconf/errno.c b/gnu/libexec/uucp/libuuconf/errno.c index 283833a6e044c..bb1361d2f6fbd 100644 --- a/gnu/libexec/uucp/libuuconf/errno.c +++ b/gnu/libexec/uucp/libuuconf/errno.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_errno_rcsid[] = "$Id: errno.c,v 1.3 1995/08/19 21:27:00 ache Exp $"; +const char _uuconf_errno_rcsid[] = "$Id: errno.c,v 1.2.6.1 1995/09/01 06:03:40 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/errstr.c b/gnu/libexec/uucp/libuuconf/errstr.c index 760dc75b88a3d..db6564f72b2a0 100644 --- a/gnu/libexec/uucp/libuuconf/errstr.c +++ b/gnu/libexec/uucp/libuuconf/errstr.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.4 1995/08/19 21:27:01 ache Exp $"; +const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.3.4.1 1995/09/01 06:03:41 davidg Exp $"; #endif static char *zeprint_num P((char *zbuf, size_t cbuf, int ival)); diff --git a/gnu/libexec/uucp/libuuconf/filnam.c b/gnu/libexec/uucp/libuuconf/filnam.c index 82b6aee73353d..eb033258bec1a 100644 --- a/gnu/libexec/uucp/libuuconf/filnam.c +++ b/gnu/libexec/uucp/libuuconf/filnam.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_filnam_rcsid[] = "$Id: filnam.c,v 1.3 1995/08/19 21:27:02 ache Exp $"; +const char _uuconf_filnam_rcsid[] = "$Id: filnam.c,v 1.2.6.1 1995/09/01 06:03:42 davidg Exp $"; #endif /* Return the saved file name. */ diff --git a/gnu/libexec/uucp/libuuconf/freblk.c b/gnu/libexec/uucp/libuuconf/freblk.c index aa7f6583d8abe..84c82302b416d 100644 --- a/gnu/libexec/uucp/libuuconf/freblk.c +++ b/gnu/libexec/uucp/libuuconf/freblk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_freblk_rcsid[] = "$Id: freblk.c,v 1.3 1995/08/19 21:27:04 ache Exp $"; +const char _uuconf_freblk_rcsid[] = "$Id: freblk.c,v 1.2.6.1 1995/09/01 06:03:43 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/fredia.c b/gnu/libexec/uucp/libuuconf/fredia.c index 5098058e6d9a8..6255512fb4d7d 100644 --- a/gnu/libexec/uucp/libuuconf/fredia.c +++ b/gnu/libexec/uucp/libuuconf/fredia.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_fredia_rcsid[] = "$Id: fredia.c,v 1.3 1995/08/19 21:27:05 ache Exp $"; +const char _uuconf_fredia_rcsid[] = "$Id: fredia.c,v 1.2.6.1 1995/09/01 06:03:43 davidg Exp $"; #endif /* Free the memory allocated for a dialer. */ diff --git a/gnu/libexec/uucp/libuuconf/free.c b/gnu/libexec/uucp/libuuconf/free.c index a36c6eb51b557..0c9e266b121da 100644 --- a/gnu/libexec/uucp/libuuconf/free.c +++ b/gnu/libexec/uucp/libuuconf/free.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_free_rcsid[] = "$Id: free.c,v 1.3 1995/08/19 21:27:07 ache Exp $"; +const char _uuconf_free_rcsid[] = "$Id: free.c,v 1.2.6.1 1995/09/01 06:03:44 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/freprt.c b/gnu/libexec/uucp/libuuconf/freprt.c index 6ead66ee74172..095e7f9a6dea1 100644 --- a/gnu/libexec/uucp/libuuconf/freprt.c +++ b/gnu/libexec/uucp/libuuconf/freprt.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_freprt_rcsid[] = "$Id: freprt.c,v 1.3 1995/08/19 21:27:09 ache Exp $"; +const char _uuconf_freprt_rcsid[] = "$Id: freprt.c,v 1.2.6.1 1995/09/01 06:03:45 davidg Exp $"; #endif /* Free the memory allocated for a port. */ diff --git a/gnu/libexec/uucp/libuuconf/fresys.c b/gnu/libexec/uucp/libuuconf/fresys.c index 0711875f2fc7c..62f1a68f5699c 100644 --- a/gnu/libexec/uucp/libuuconf/fresys.c +++ b/gnu/libexec/uucp/libuuconf/fresys.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_fresys_rcsid[] = "$Id: fresys.c,v 1.3 1995/08/19 21:27:10 ache Exp $"; +const char _uuconf_fresys_rcsid[] = "$Id: fresys.c,v 1.2.6.1 1995/09/01 06:03:46 davidg Exp $"; #endif /* Free the memory allocated for a system. */ diff --git a/gnu/libexec/uucp/libuuconf/grdcmp.c b/gnu/libexec/uucp/libuuconf/grdcmp.c index 6a25e622fbf47..be7fb95eb0097 100644 --- a/gnu/libexec/uucp/libuuconf/grdcmp.c +++ b/gnu/libexec/uucp/libuuconf/grdcmp.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_grdcmp_rcsid[] = "$Id: grdcmp.c,v 1.3 1995/08/19 21:27:11 ache Exp $"; +const char _uuconf_grdcmp_rcsid[] = "$Id: grdcmp.c,v 1.2.6.1 1995/09/01 06:03:47 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hdial.c b/gnu/libexec/uucp/libuuconf/hdial.c index c4933783331ce..3b9cf29aeb3b8 100644 --- a/gnu/libexec/uucp/libuuconf/hdial.c +++ b/gnu/libexec/uucp/libuuconf/hdial.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.4 1995/08/19 21:27:13 ache Exp $"; +const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.3.4.1 1995/09/01 06:03:48 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hdnams.c b/gnu/libexec/uucp/libuuconf/hdnams.c index b9d747d9a4926..b795f218e851c 100644 --- a/gnu/libexec/uucp/libuuconf/hdnams.c +++ b/gnu/libexec/uucp/libuuconf/hdnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.4 1995/08/19 21:27:14 ache Exp $"; +const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.3.4.1 1995/09/01 06:03:49 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hinit.c b/gnu/libexec/uucp/libuuconf/hinit.c index e0138cddb0d5b..6d30e41ef794b 100644 --- a/gnu/libexec/uucp/libuuconf/hinit.c +++ b/gnu/libexec/uucp/libuuconf/hinit.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.4 1995/08/19 21:27:16 ache Exp $"; +const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.3.4.1 1995/09/01 06:03:51 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hlocnm.c b/gnu/libexec/uucp/libuuconf/hlocnm.c index 694b489641339..972b9ca606354 100644 --- a/gnu/libexec/uucp/libuuconf/hlocnm.c +++ b/gnu/libexec/uucp/libuuconf/hlocnm.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hlocnm_rcsid[] = "$Id: hlocnm.c,v 1.3 1995/08/19 21:27:17 ache Exp $"; +const char _uuconf_hlocnm_rcsid[] = "$Id: hlocnm.c,v 1.2.6.1 1995/09/01 06:03:52 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hport.c b/gnu/libexec/uucp/libuuconf/hport.c index e39bd33e8528b..6fc0da628b949 100644 --- a/gnu/libexec/uucp/libuuconf/hport.c +++ b/gnu/libexec/uucp/libuuconf/hport.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hport_rcsid[] = "$Id: hport.c,v 1.3 1995/08/19 21:27:22 ache Exp $"; +const char _uuconf_hport_rcsid[] = "$Id: hport.c,v 1.2.6.1 1995/09/01 06:03:53 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hrmunk.c b/gnu/libexec/uucp/libuuconf/hrmunk.c index 150f57a5ea120..d928679e26ead 100644 --- a/gnu/libexec/uucp/libuuconf/hrmunk.c +++ b/gnu/libexec/uucp/libuuconf/hrmunk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hrmunk_rcsid[] = "$Id: hrmunk.c,v 1.3 1995/08/19 21:27:24 ache Exp $"; +const char _uuconf_hrmunk_rcsid[] = "$Id: hrmunk.c,v 1.2.6.1 1995/09/01 06:03:54 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hsinfo.c b/gnu/libexec/uucp/libuuconf/hsinfo.c index 7903122f6f5cb..d256f028e531a 100644 --- a/gnu/libexec/uucp/libuuconf/hsinfo.c +++ b/gnu/libexec/uucp/libuuconf/hsinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.4 1995/08/19 21:27:25 ache Exp $"; +const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.3.4.1 1995/09/01 06:03:55 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hsnams.c b/gnu/libexec/uucp/libuuconf/hsnams.c index 0e4d9b173f9bc..43f6bda3ec891 100644 --- a/gnu/libexec/uucp/libuuconf/hsnams.c +++ b/gnu/libexec/uucp/libuuconf/hsnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.4 1995/08/19 21:27:26 ache Exp $"; +const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.3.4.1 1995/09/01 06:03:56 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/hsys.c b/gnu/libexec/uucp/libuuconf/hsys.c index f8959c76f773d..01d63929f7e70 100644 --- a/gnu/libexec/uucp/libuuconf/hsys.c +++ b/gnu/libexec/uucp/libuuconf/hsys.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hsys_rcsid[] = "$Id: hsys.c,v 1.3 1995/08/19 21:27:28 ache Exp $"; +const char _uuconf_hsys_rcsid[] = "$Id: hsys.c,v 1.2.6.1 1995/09/01 06:03:57 davidg Exp $"; #endif /* Get system information from the HDB configuration files. This is a diff --git a/gnu/libexec/uucp/libuuconf/hunk.c b/gnu/libexec/uucp/libuuconf/hunk.c index 470e1ffe66cb0..05b50b9fdbca2 100644 --- a/gnu/libexec/uucp/libuuconf/hunk.c +++ b/gnu/libexec/uucp/libuuconf/hunk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_hunk_rcsid[] = "$Id: hunk.c,v 1.3 1995/08/19 21:27:29 ache Exp $"; +const char _uuconf_hunk_rcsid[] = "$Id: hunk.c,v 1.2.6.1 1995/09/01 06:03:57 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/iniglb.c b/gnu/libexec/uucp/libuuconf/iniglb.c index f406e906094af..aafbe20f3cdbb 100644 --- a/gnu/libexec/uucp/libuuconf/iniglb.c +++ b/gnu/libexec/uucp/libuuconf/iniglb.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_iniglb_rcsid[] = "$Id: iniglb.c,v 1.3 1995/08/19 21:27:30 ache Exp $"; +const char _uuconf_iniglb_rcsid[] = "$Id: iniglb.c,v 1.2.6.1 1995/09/01 06:03:58 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/init.c b/gnu/libexec/uucp/libuuconf/init.c index f9b6432faaa26..aa1ce70dc852d 100644 --- a/gnu/libexec/uucp/libuuconf/init.c +++ b/gnu/libexec/uucp/libuuconf/init.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_init_rcsid[] = "$Id: init.c,v 1.3 1995/08/19 21:27:32 ache Exp $"; +const char _uuconf_init_rcsid[] = "$Id: init.c,v 1.2.6.1 1995/09/01 06:03:59 davidg Exp $"; #endif /* Initialize the UUCP configuration file reading routines. This is diff --git a/gnu/libexec/uucp/libuuconf/int.c b/gnu/libexec/uucp/libuuconf/int.c index cfa1a9a534309..a7ef1c62631ae 100644 --- a/gnu/libexec/uucp/libuuconf/int.c +++ b/gnu/libexec/uucp/libuuconf/int.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_int_rcsid[] = "$Id: int.c,v 1.3 1995/08/19 21:27:33 ache Exp $"; +const char _uuconf_int_rcsid[] = "$Id: int.c,v 1.2.6.1 1995/09/01 06:04:00 davidg Exp $"; #endif /* Parse a string into a variable. This is called by uuconf_cmd_args, diff --git a/gnu/libexec/uucp/libuuconf/lckdir.c b/gnu/libexec/uucp/libuuconf/lckdir.c index b87420ca3781f..704a102b93b4c 100644 --- a/gnu/libexec/uucp/libuuconf/lckdir.c +++ b/gnu/libexec/uucp/libuuconf/lckdir.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_lckdir_rcsid[] = "$Id: lckdir.c,v 1.3 1995/08/19 21:27:34 ache Exp $"; +const char _uuconf_lckdir_rcsid[] = "$Id: lckdir.c,v 1.2.6.1 1995/09/01 06:04:01 davidg Exp $"; #endif /* Get the name of the UUCP lock directory. */ diff --git a/gnu/libexec/uucp/libuuconf/lineno.c b/gnu/libexec/uucp/libuuconf/lineno.c index af10039e13947..4caa6a949e2e2 100644 --- a/gnu/libexec/uucp/libuuconf/lineno.c +++ b/gnu/libexec/uucp/libuuconf/lineno.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_lineno_rcsid[] = "$Id: lineno.c,v 1.3 1995/08/19 21:27:35 ache Exp $"; +const char _uuconf_lineno_rcsid[] = "$Id: lineno.c,v 1.2.6.1 1995/09/01 06:04:02 davidg Exp $"; #endif /* Return the saved line number. */ diff --git a/gnu/libexec/uucp/libuuconf/llocnm.c b/gnu/libexec/uucp/libuuconf/llocnm.c index 5cb8600b664af..2c9053f5cbec1 100644 --- a/gnu/libexec/uucp/libuuconf/llocnm.c +++ b/gnu/libexec/uucp/libuuconf/llocnm.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_llocnm_rcsid[] = "$Id: llocnm.c,v 1.3 1995/08/19 21:27:36 ache Exp $"; +const char _uuconf_llocnm_rcsid[] = "$Id: llocnm.c,v 1.2.6.1 1995/09/01 06:04:03 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/local.c b/gnu/libexec/uucp/libuuconf/local.c index f124802e899b1..37040ab2ce3cb 100644 --- a/gnu/libexec/uucp/libuuconf/local.c +++ b/gnu/libexec/uucp/libuuconf/local.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_local_rcsid[] = "$Id: local.c,v 1.3 1995/08/19 21:27:37 ache Exp $"; +const char _uuconf_local_rcsid[] = "$Id: local.c,v 1.2.6.1 1995/09/01 06:04:04 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/locnm.c b/gnu/libexec/uucp/libuuconf/locnm.c index 730f368a82bcb..8d60626d37982 100644 --- a/gnu/libexec/uucp/libuuconf/locnm.c +++ b/gnu/libexec/uucp/libuuconf/locnm.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_locnm_rcsid[] = "$Id: locnm.c,v 1.3 1995/08/19 21:27:39 ache Exp $"; +const char _uuconf_locnm_rcsid[] = "$Id: locnm.c,v 1.2.6.1 1995/09/01 06:04:05 davidg Exp $"; #endif /* Get the local node name. */ diff --git a/gnu/libexec/uucp/libuuconf/logfil.c b/gnu/libexec/uucp/libuuconf/logfil.c index 8b146259e0c93..f2a600f0032dc 100644 --- a/gnu/libexec/uucp/libuuconf/logfil.c +++ b/gnu/libexec/uucp/libuuconf/logfil.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_logfil_rcsid[] = "$Id: logfil.c,v 1.3 1995/08/19 21:27:41 ache Exp $"; +const char _uuconf_logfil_rcsid[] = "$Id: logfil.c,v 1.2.6.1 1995/09/01 06:04:06 davidg Exp $"; #endif /* Get the name of the UUCP log file. */ diff --git a/gnu/libexec/uucp/libuuconf/maxuxq.c b/gnu/libexec/uucp/libuuconf/maxuxq.c index a45a0e494f36b..3c80a92061b14 100644 --- a/gnu/libexec/uucp/libuuconf/maxuxq.c +++ b/gnu/libexec/uucp/libuuconf/maxuxq.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_maxuxq_rcsid[] = "$Id: maxuxq.c,v 1.3 1995/08/19 21:27:42 ache Exp $"; +const char _uuconf_maxuxq_rcsid[] = "$Id: maxuxq.c,v 1.2.6.1 1995/09/01 06:04:06 davidg Exp $"; #endif /* Get the maximum number of simultaneous uuxqt executions. When diff --git a/gnu/libexec/uucp/libuuconf/mrgblk.c b/gnu/libexec/uucp/libuuconf/mrgblk.c index 21d13eafa81c4..6e3b66ad50ec8 100644 --- a/gnu/libexec/uucp/libuuconf/mrgblk.c +++ b/gnu/libexec/uucp/libuuconf/mrgblk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_mrgblk_rcsid[] = "$Id: mrgblk.c,v 1.3 1995/08/19 21:27:44 ache Exp $"; +const char _uuconf_mrgblk_rcsid[] = "$Id: mrgblk.c,v 1.2.6.1 1995/09/01 06:04:07 davidg Exp $"; #endif #include "alloc.h" diff --git a/gnu/libexec/uucp/libuuconf/paramc.c b/gnu/libexec/uucp/libuuconf/paramc.c index feaf4d19b131b..15e43f859689e 100644 --- a/gnu/libexec/uucp/libuuconf/paramc.c +++ b/gnu/libexec/uucp/libuuconf/paramc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_paramc_rcsid[] = "$Id: paramc.c,v 1.3 1995/08/19 21:27:45 ache Exp $"; +const char _uuconf_paramc_rcsid[] = "$Id: paramc.c,v 1.2.6.1 1995/09/01 06:04:08 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/port.c b/gnu/libexec/uucp/libuuconf/port.c index bd15a7f8ad258..f128a1ebf1a0b 100644 --- a/gnu/libexec/uucp/libuuconf/port.c +++ b/gnu/libexec/uucp/libuuconf/port.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_port_rcsid[] = "$Id: port.c,v 1.3 1995/08/19 21:27:47 ache Exp $"; +const char _uuconf_port_rcsid[] = "$Id: port.c,v 1.2.6.1 1995/09/01 06:04:09 davidg Exp $"; #endif /* Find a port by name, baud rate, and special purpose function. */ diff --git a/gnu/libexec/uucp/libuuconf/prtsub.c b/gnu/libexec/uucp/libuuconf/prtsub.c index 47d24bb1f489b..b6221ee5edc01 100644 --- a/gnu/libexec/uucp/libuuconf/prtsub.c +++ b/gnu/libexec/uucp/libuuconf/prtsub.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_prtsub_rcsid[] = "$Id: prtsub.c,v 1.3 1995/08/19 21:27:49 ache Exp $"; +const char _uuconf_prtsub_rcsid[] = "$Id: prtsub.c,v 1.2.6.1 1995/09/01 06:04:10 davidg Exp $"; #endif /* Clear the information in a port. This can only clear the type diff --git a/gnu/libexec/uucp/libuuconf/pubdir.c b/gnu/libexec/uucp/libuuconf/pubdir.c index fbfed1b169d6c..c384a68f2c592 100644 --- a/gnu/libexec/uucp/libuuconf/pubdir.c +++ b/gnu/libexec/uucp/libuuconf/pubdir.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_pubdir_rcsid[] = "$Id: pubdir.c,v 1.3 1995/08/19 21:27:50 ache Exp $"; +const char _uuconf_pubdir_rcsid[] = "$Id: pubdir.c,v 1.2.6.1 1995/09/01 06:04:11 davidg Exp $"; #endif /* Get the name of the UUCP public directory. */ diff --git a/gnu/libexec/uucp/libuuconf/rdlocs.c b/gnu/libexec/uucp/libuuconf/rdlocs.c index e2f465a4f3318..accdc728d7c20 100644 --- a/gnu/libexec/uucp/libuuconf/rdlocs.c +++ b/gnu/libexec/uucp/libuuconf/rdlocs.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.4 1995/08/19 21:27:51 ache Exp $"; +const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.3.4.1 1995/09/01 06:04:12 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/rdperm.c b/gnu/libexec/uucp/libuuconf/rdperm.c index d3cf81de9c2a1..c78ba7b140173 100644 --- a/gnu/libexec/uucp/libuuconf/rdperm.c +++ b/gnu/libexec/uucp/libuuconf/rdperm.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_rdperm_rcsid[] = "$Id: rdperm.c,v 1.3 1995/08/19 21:27:55 ache Exp $"; +const char _uuconf_rdperm_rcsid[] = "$Id: rdperm.c,v 1.2.6.1 1995/09/01 06:04:13 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/reliab.c b/gnu/libexec/uucp/libuuconf/reliab.c index 36567eb9b4bd5..370983b0e5488 100644 --- a/gnu/libexec/uucp/libuuconf/reliab.c +++ b/gnu/libexec/uucp/libuuconf/reliab.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_reliab_rcsid[] = "$Id: reliab.c,v 1.3 1995/08/19 21:27:56 ache Exp $"; +const char _uuconf_reliab_rcsid[] = "$Id: reliab.c,v 1.2.6.1 1995/09/01 06:04:14 davidg Exp $"; #endif /* Handle the "seven-bit" command for a port or a dialer. The pvar diff --git a/gnu/libexec/uucp/libuuconf/remunk.c b/gnu/libexec/uucp/libuuconf/remunk.c index 546aefdc6c4ec..260d4bcbe27cf 100644 --- a/gnu/libexec/uucp/libuuconf/remunk.c +++ b/gnu/libexec/uucp/libuuconf/remunk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_remunk_rcsid[] = "$Id: remunk.c,v 1.3 1995/08/19 21:27:58 ache Exp $"; +const char _uuconf_remunk_rcsid[] = "$Id: remunk.c,v 1.2.6.1 1995/09/01 06:04:15 davidg Exp $"; #endif /* Get the name of the remote.unknown shell script. */ diff --git a/gnu/libexec/uucp/libuuconf/runuxq.c b/gnu/libexec/uucp/libuuconf/runuxq.c index 9dbf92b660004..a27830b8762c8 100644 --- a/gnu/libexec/uucp/libuuconf/runuxq.c +++ b/gnu/libexec/uucp/libuuconf/runuxq.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_runuxq_rcsid[] = "$Id: runuxq.c,v 1.2 1995/08/19 21:27:59 ache Exp $"; +const char _uuconf_runuxq_rcsid[] = "$Id: runuxq.c,v 1.1.6.1 1995/09/01 06:04:16 davidg Exp $"; #endif /* Return how often to spawn a uuxqt process. This is either a diff --git a/gnu/libexec/uucp/libuuconf/sinfo.c b/gnu/libexec/uucp/libuuconf/sinfo.c index e904fff5b37ae..54ccf71128738 100644 --- a/gnu/libexec/uucp/libuuconf/sinfo.c +++ b/gnu/libexec/uucp/libuuconf/sinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_sinfo_rcsid[] = "$Id: sinfo.c,v 1.3 1995/08/19 21:28:00 ache Exp $"; +const char _uuconf_sinfo_rcsid[] = "$Id: sinfo.c,v 1.2.6.1 1995/09/01 06:04:17 davidg Exp $"; #endif /* Get information about a particular system. We combine the diff --git a/gnu/libexec/uucp/libuuconf/snams.c b/gnu/libexec/uucp/libuuconf/snams.c index 407f522c74736..f695a557530f0 100644 --- a/gnu/libexec/uucp/libuuconf/snams.c +++ b/gnu/libexec/uucp/libuuconf/snams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_snams_rcsid[] = "$Id: snams.c,v 1.3 1995/08/19 21:28:02 ache Exp $"; +const char _uuconf_snams_rcsid[] = "$Id: snams.c,v 1.2.6.1 1995/09/01 06:04:18 davidg Exp $"; #endif /* Get all known system names. */ diff --git a/gnu/libexec/uucp/libuuconf/split.c b/gnu/libexec/uucp/libuuconf/split.c index 12c71fd1bd6a3..9080e4b625f20 100644 --- a/gnu/libexec/uucp/libuuconf/split.c +++ b/gnu/libexec/uucp/libuuconf/split.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_split_rcsid[] = "$Id: split.c,v 1.3 1995/08/19 21:28:04 ache Exp $"; +const char _uuconf_split_rcsid[] = "$Id: split.c,v 1.2.6.1 1995/09/01 06:04:19 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/spool.c b/gnu/libexec/uucp/libuuconf/spool.c index f871f2be3b51d..e69f09ea86875 100644 --- a/gnu/libexec/uucp/libuuconf/spool.c +++ b/gnu/libexec/uucp/libuuconf/spool.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_spool_rcsid[] = "$Id: spool.c,v 1.3 1995/08/19 21:28:05 ache Exp $"; +const char _uuconf_spool_rcsid[] = "$Id: spool.c,v 1.2.6.1 1995/09/01 06:04:20 davidg Exp $"; #endif /* Get the name of the UUCP spool directory. */ diff --git a/gnu/libexec/uucp/libuuconf/stafil.c b/gnu/libexec/uucp/libuuconf/stafil.c index d733b3c4c02d4..d7c705ae89e21 100644 --- a/gnu/libexec/uucp/libuuconf/stafil.c +++ b/gnu/libexec/uucp/libuuconf/stafil.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_stafil_rcsid[] = "$Id: stafil.c,v 1.3 1995/08/19 21:28:06 ache Exp $"; +const char _uuconf_stafil_rcsid[] = "$Id: stafil.c,v 1.2.6.1 1995/09/01 06:04:21 davidg Exp $"; #endif /* Get the name of the UUCP statistics file. */ diff --git a/gnu/libexec/uucp/libuuconf/strip.c b/gnu/libexec/uucp/libuuconf/strip.c index fc314a77e939f..973fad1efd0a4 100644 --- a/gnu/libexec/uucp/libuuconf/strip.c +++ b/gnu/libexec/uucp/libuuconf/strip.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_strip_rcsid[] = "$Id: strip.c,v 1.2 1995/06/28 15:43:14 ian Rel $"; +const char _uuconf_strip_rcsid[] = "$Id: strip.c,v 1.1 1995/08/19 21:28:07 ache Exp $"; #endif /* Get information about what types of global information should be diff --git a/gnu/libexec/uucp/libuuconf/syssub.c b/gnu/libexec/uucp/libuuconf/syssub.c index 11dd7f2f0ff94..3424368c48cc0 100644 --- a/gnu/libexec/uucp/libuuconf/syssub.c +++ b/gnu/libexec/uucp/libuuconf/syssub.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.4 1995/08/19 21:28:10 ache Exp $"; +const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.3.4.1 1995/09/01 06:04:23 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tcalou.c b/gnu/libexec/uucp/libuuconf/tcalou.c index b675b8ee9c2ef..0b70f5819c54f 100644 --- a/gnu/libexec/uucp/libuuconf/tcalou.c +++ b/gnu/libexec/uucp/libuuconf/tcalou.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tcalou_rcsid[] = "$Id: tcalou.c,v 1.3 1995/08/19 21:28:12 ache Exp $"; +const char _uuconf_tcalou_rcsid[] = "$Id: tcalou.c,v 1.2.6.1 1995/09/01 06:04:24 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tdial.c b/gnu/libexec/uucp/libuuconf/tdial.c index d3a8a751444da..fe346d91ea5b5 100644 --- a/gnu/libexec/uucp/libuuconf/tdial.c +++ b/gnu/libexec/uucp/libuuconf/tdial.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tdial_rcsid[] = "$Id: tdial.c,v 1.3 1995/08/19 21:28:13 ache Exp $"; +const char _uuconf_tdial_rcsid[] = "$Id: tdial.c,v 1.2.6.1 1995/09/01 06:04:25 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tdialc.c b/gnu/libexec/uucp/libuuconf/tdialc.c index 3e642b23eda15..85a1740281e13 100644 --- a/gnu/libexec/uucp/libuuconf/tdialc.c +++ b/gnu/libexec/uucp/libuuconf/tdialc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.4 1995/08/19 21:28:15 ache Exp $"; +const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.3.4.1 1995/09/01 06:04:26 davidg Exp $"; #endif static int idchat P((pointer pglobal, int argc, char **argv, pointer pvar, diff --git a/gnu/libexec/uucp/libuuconf/tdnams.c b/gnu/libexec/uucp/libuuconf/tdnams.c index afd0814fa7111..31e6ad05c96c5 100644 --- a/gnu/libexec/uucp/libuuconf/tdnams.c +++ b/gnu/libexec/uucp/libuuconf/tdnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.4 1995/08/19 21:28:16 ache Exp $"; +const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.3.4.1 1995/09/01 06:04:27 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tgcmp.c b/gnu/libexec/uucp/libuuconf/tgcmp.c index 081c6ab36b54d..24be7309d128e 100644 --- a/gnu/libexec/uucp/libuuconf/tgcmp.c +++ b/gnu/libexec/uucp/libuuconf/tgcmp.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tgcmp_rcsid[] = "$Id: tgcmp.c,v 1.3 1995/08/19 21:28:17 ache Exp $"; +const char _uuconf_tgcmp_rcsid[] = "$Id: tgcmp.c,v 1.2.6.1 1995/09/01 06:04:28 davidg Exp $"; #endif /* A comparison function to pass to _uuconf_itime_parse. This diff --git a/gnu/libexec/uucp/libuuconf/thread.c b/gnu/libexec/uucp/libuuconf/thread.c index 91aae72f754a5..c8425e0042a60 100644 --- a/gnu/libexec/uucp/libuuconf/thread.c +++ b/gnu/libexec/uucp/libuuconf/thread.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_thread_rcsid[] = "$Id: thread.c,v 1.3 1995/08/19 21:28:18 ache Exp $"; +const char _uuconf_thread_rcsid[] = "$Id: thread.c,v 1.2.6.1 1995/09/01 06:04:29 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/time.c b/gnu/libexec/uucp/libuuconf/time.c index 928b4482bacbc..bfc7ebe87e392 100644 --- a/gnu/libexec/uucp/libuuconf/time.c +++ b/gnu/libexec/uucp/libuuconf/time.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_time_rcsid[] = "$Id: time.c,v 1.3 1995/08/19 21:28:19 ache Exp $"; +const char _uuconf_time_rcsid[] = "$Id: time.c,v 1.2.6.1 1995/09/01 06:04:30 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tinit.c b/gnu/libexec/uucp/libuuconf/tinit.c index 808850efeae04..e31d89ffb38fd 100644 --- a/gnu/libexec/uucp/libuuconf/tinit.c +++ b/gnu/libexec/uucp/libuuconf/tinit.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tinit_rcsid[] = "$Id: tinit.c,v 1.3 1995/08/19 21:28:21 ache Exp $"; +const char _uuconf_tinit_rcsid[] = "$Id: tinit.c,v 1.2.6.1 1995/09/01 06:04:31 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tlocnm.c b/gnu/libexec/uucp/libuuconf/tlocnm.c index 60b1c91f08196..dfb08abdfdaeb 100644 --- a/gnu/libexec/uucp/libuuconf/tlocnm.c +++ b/gnu/libexec/uucp/libuuconf/tlocnm.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tlocnm_rcsid[] = "$Id: tlocnm.c,v 1.3 1995/08/19 21:28:23 ache Exp $"; +const char _uuconf_tlocnm_rcsid[] = "$Id: tlocnm.c,v 1.2.6.1 1995/09/01 06:04:32 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tport.c b/gnu/libexec/uucp/libuuconf/tport.c index 7cb22b200a386..6ad4d1c5c24dc 100644 --- a/gnu/libexec/uucp/libuuconf/tport.c +++ b/gnu/libexec/uucp/libuuconf/tport.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tport_rcsid[] = "$Id: tport.c,v 1.3 1995/08/19 21:28:24 ache Exp $"; +const char _uuconf_tport_rcsid[] = "$Id: tport.c,v 1.2.6.1 1995/09/01 06:04:33 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tportc.c b/gnu/libexec/uucp/libuuconf/tportc.c index 7fc284dc3bb40..fecf013423f4c 100644 --- a/gnu/libexec/uucp/libuuconf/tportc.c +++ b/gnu/libexec/uucp/libuuconf/tportc.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.4 1995/08/19 21:28:27 ache Exp $"; +const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.3.4.1 1995/09/01 06:04:34 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tsinfo.c b/gnu/libexec/uucp/libuuconf/tsinfo.c index 32f7fc0d24f04..b6fcd58233460 100644 --- a/gnu/libexec/uucp/libuuconf/tsinfo.c +++ b/gnu/libexec/uucp/libuuconf/tsinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tsinfo_rcsid[] = "$Id: tsinfo.c,v 1.3 1995/08/19 21:28:29 ache Exp $"; +const char _uuconf_tsinfo_rcsid[] = "$Id: tsinfo.c,v 1.2.6.1 1995/09/01 06:04:35 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/tsnams.c b/gnu/libexec/uucp/libuuconf/tsnams.c index e5cacf1a19ea6..c0ae6a3e46605 100644 --- a/gnu/libexec/uucp/libuuconf/tsnams.c +++ b/gnu/libexec/uucp/libuuconf/tsnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tsnams_rcsid[] = "$Id: tsnams.c,v 1.3 1995/08/19 21:28:30 ache Exp $"; +const char _uuconf_tsnams_rcsid[] = "$Id: tsnams.c,v 1.2.6.1 1995/09/01 06:04:36 davidg Exp $"; #endif /* Get all the system names from the Taylor UUCP configuration files. diff --git a/gnu/libexec/uucp/libuuconf/tsys.c b/gnu/libexec/uucp/libuuconf/tsys.c index daec0e6b51b6e..540abd16d5c85 100644 --- a/gnu/libexec/uucp/libuuconf/tsys.c +++ b/gnu/libexec/uucp/libuuconf/tsys.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tsys_rcsid[] = "$Id: tsys.c,v 1.3 1995/08/19 21:28:31 ache Exp $"; +const char _uuconf_tsys_rcsid[] = "$Id: tsys.c,v 1.2.6.1 1995/09/01 06:04:37 davidg Exp $"; #endif /* Get system information from the Taylor UUCP configuration files. diff --git a/gnu/libexec/uucp/libuuconf/tval.c b/gnu/libexec/uucp/libuuconf/tval.c index b8beab3f38f07..939755be348e9 100644 --- a/gnu/libexec/uucp/libuuconf/tval.c +++ b/gnu/libexec/uucp/libuuconf/tval.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_tval_rcsid[] = "$Id: tval.c,v 1.3 1995/08/19 21:28:33 ache Exp $"; +const char _uuconf_tval_rcsid[] = "$Id: tval.c,v 1.2.6.1 1995/09/01 06:04:38 davidg Exp $"; #endif /* Validate a login name for a system using Taylor UUCP configuration diff --git a/gnu/libexec/uucp/libuuconf/ugtlin.c b/gnu/libexec/uucp/libuuconf/ugtlin.c index 95dbbe5bab2f1..ed81b42079d8f 100644 --- a/gnu/libexec/uucp/libuuconf/ugtlin.c +++ b/gnu/libexec/uucp/libuuconf/ugtlin.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_ugtlin_rcsid[] = "$Id: ugtlin.c,v 1.3 1995/08/19 21:28:34 ache Exp $"; +const char _uuconf_ugtlin_rcsid[] = "$Id: ugtlin.c,v 1.2.6.1 1995/09/01 06:04:39 davidg Exp $"; #endif /* Read a line from a file with backslash continuations. This updates diff --git a/gnu/libexec/uucp/libuuconf/unk.c b/gnu/libexec/uucp/libuuconf/unk.c index 7fd386760bc2c..b72cb81bed677 100644 --- a/gnu/libexec/uucp/libuuconf/unk.c +++ b/gnu/libexec/uucp/libuuconf/unk.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_unk_rcsid[] = "$Id: unk.c,v 1.3 1995/08/19 21:28:35 ache Exp $"; +const char _uuconf_unk_rcsid[] = "$Id: unk.c,v 1.2.6.1 1995/09/01 06:04:40 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/val.c b/gnu/libexec/uucp/libuuconf/val.c index b6c4eaca833c4..19e7dee5e9bbb 100644 --- a/gnu/libexec/uucp/libuuconf/val.c +++ b/gnu/libexec/uucp/libuuconf/val.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_val_rcsid[] = "$Id: val.c,v 1.3 1995/08/19 21:28:38 ache Exp $"; +const char _uuconf_val_rcsid[] = "$Id: val.c,v 1.2.6.1 1995/09/01 06:04:42 davidg Exp $"; #endif /* Validate a login name for a system. */ diff --git a/gnu/libexec/uucp/libuuconf/vinit.c b/gnu/libexec/uucp/libuuconf/vinit.c index 2097145f83d57..29e385e37fe09 100644 --- a/gnu/libexec/uucp/libuuconf/vinit.c +++ b/gnu/libexec/uucp/libuuconf/vinit.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vinit_rcsid[] = "$Id: vinit.c,v 1.3 1995/08/19 21:28:39 ache Exp $"; +const char _uuconf_vinit_rcsid[] = "$Id: vinit.c,v 1.2.6.1 1995/09/01 06:04:43 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/vport.c b/gnu/libexec/uucp/libuuconf/vport.c index ce4623dd67d7f..99c8c4c55810f 100644 --- a/gnu/libexec/uucp/libuuconf/vport.c +++ b/gnu/libexec/uucp/libuuconf/vport.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.4 1995/08/19 21:28:40 ache Exp $"; +const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.3.4.1 1995/09/01 06:04:44 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/vsinfo.c b/gnu/libexec/uucp/libuuconf/vsinfo.c index 04e06be263d38..43b046659eac9 100644 --- a/gnu/libexec/uucp/libuuconf/vsinfo.c +++ b/gnu/libexec/uucp/libuuconf/vsinfo.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.4 1995/08/19 21:28:43 ache Exp $"; +const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.3.4.1 1995/09/01 06:04:45 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/vsnams.c b/gnu/libexec/uucp/libuuconf/vsnams.c index f90ec249e0fad..aba4ca9f3c79b 100644 --- a/gnu/libexec/uucp/libuuconf/vsnams.c +++ b/gnu/libexec/uucp/libuuconf/vsnams.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vsnams_rcsid[] = "$Id: vsnams.c,v 1.3 1995/08/19 21:28:46 ache Exp $"; +const char _uuconf_vsnams_rcsid[] = "$Id: vsnams.c,v 1.2.6.1 1995/09/01 06:04:46 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/libuuconf/vsys.c b/gnu/libexec/uucp/libuuconf/vsys.c index 29eed8c35e42e..81c0d86ee02d5 100644 --- a/gnu/libexec/uucp/libuuconf/vsys.c +++ b/gnu/libexec/uucp/libuuconf/vsys.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_vsys_rcsid[] = "$Id: vsys.c,v 1.3 1995/08/19 21:28:49 ache Exp $"; +const char _uuconf_vsys_rcsid[] = "$Id: vsys.c,v 1.2.6.1 1995/09/01 06:04:47 davidg Exp $"; #endif /* Get system information from the V2 configuration files. This is a diff --git a/gnu/libexec/uucp/libuucp/Makefile b/gnu/libexec/uucp/libuucp/Makefile index 33e0a02518505..e709431abc6a5 100644 --- a/gnu/libexec/uucp/libuucp/Makefile +++ b/gnu/libexec/uucp/libuucp/Makefile @@ -1,5 +1,5 @@ # This is the Makefile for the libuucp subdirectory of Taylor UUCP -# $Id: Makefile,v 1.2 1993/08/16 16:22:34 jtc Exp $ +# $Id: Makefile,v 1.3 1994/05/07 18:13:29 ache Exp $ LIB= uucp SRCS = buffer.c crc.c debug.c escape.c getopt.c getop1.c parse.c spool.c \ diff --git a/gnu/libexec/uucp/libuucp/parse.c b/gnu/libexec/uucp/libuucp/parse.c index ab047d08dfb93..884174a8283e8 100644 --- a/gnu/libexec/uucp/libuucp/parse.c +++ b/gnu/libexec/uucp/libuucp/parse.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char parse_rcsid[] = "$Id: parse.c,v 1.4 1995/08/19 21:29:22 ache Exp $"; +const char parse_rcsid[] = "$Id: parse.c,v 1.3.4.1 1995/09/01 06:05:01 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/sample/Makefile b/gnu/libexec/uucp/sample/Makefile index 585a0fa66c508..36a84d8e44b21 100644 --- a/gnu/libexec/uucp/sample/Makefile +++ b/gnu/libexec/uucp/sample/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/07/25 00:31:29 bde Exp $ +# $Id: Makefile,v 1.2.6.1 1995/09/01 06:05:06 davidg Exp $ FILES= call.sample config.sample dial.sample dialcode.sample passwd.sample \ port.sample sys1.sample sys2.sample diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c index ee04353ffc821..4dd789a030e1a 100644 --- a/gnu/libexec/uucp/tstuu.c +++ b/gnu/libexec/uucp/tstuu.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.4 1995/08/19 21:23:11 ache Exp $"; +const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.3.4.1 1995/09/01 06:01:19 davidg Exp $"; #endif #include "sysdep.h" diff --git a/gnu/libexec/uucp/uuchk/Makefile b/gnu/libexec/uucp/uuchk/Makefile index 707dcee0dc173..3fa79f205866d 100644 --- a/gnu/libexec/uucp/uuchk/Makefile +++ b/gnu/libexec/uucp/uuchk/Makefile @@ -1,5 +1,5 @@ # Makefile for uuchk -# $Id: Makefile,v 1.3 1994/05/31 05:46:20 ache Exp $ +# $Id: Makefile,v 1.4 1995/05/14 17:00:58 ache Exp $ BINDIR= $(sbindir) diff --git a/gnu/libexec/uucp/uuchk/uuchk.c b/gnu/libexec/uucp/uuchk/uuchk.c index 4e9540a225846..96ef5b333e834 100644 --- a/gnu/libexec/uucp/uuchk/uuchk.c +++ b/gnu/libexec/uucp/uuchk/uuchk.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.4 1995/08/19 21:29:30 ache Exp $"; +const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.3.4.1 1995/09/01 06:05:07 davidg Exp $"; #endif #include "getopt.h" diff --git a/gnu/libexec/uucp/uucico/Makefile b/gnu/libexec/uucp/uucico/Makefile index 96fe4ac41b416..3c8a08d876e1b 100644 --- a/gnu/libexec/uucp/uucico/Makefile +++ b/gnu/libexec/uucp/uucico/Makefile @@ -1,5 +1,5 @@ # Makefile for uucico -# $Id: Makefile,v 1.7.4.1 1995/09/01 06:05:10 davidg Exp $ +# $Id: Makefile,v 1.7.4.3 1996/06/05 02:39:05 jkh Exp $ BINDIR= $(libxdir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uucico/prote.c b/gnu/libexec/uucp/uucico/prote.c index c6f0c97483c27..ffc26c4df765a 100644 --- a/gnu/libexec/uucp/uucico/prote.c +++ b/gnu/libexec/uucp/uucico/prote.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char prote_rcsid[] = "$Id: prote.c,v 1.4 1995/08/19 21:29:36 ache Exp $"; +const char prote_rcsid[] = "$Id: prote.c,v 1.3.4.1 1995/09/01 06:05:11 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/uucico/protf.c b/gnu/libexec/uucp/uucico/protf.c index 7c70ede274c2e..fa01b94243750 100644 --- a/gnu/libexec/uucp/uucico/protf.c +++ b/gnu/libexec/uucp/uucico/protf.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protf_rcsid[] = "$Id: protf.c,v 1.4 1995/08/19 21:29:38 ache Exp $"; +const char protf_rcsid[] = "$Id: protf.c,v 1.3.4.1 1995/09/01 06:05:12 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/protg.c b/gnu/libexec/uucp/uucico/protg.c index d106c5d7ac8ff..749145921033a 100644 --- a/gnu/libexec/uucp/uucico/protg.c +++ b/gnu/libexec/uucp/uucico/protg.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protg_rcsid[] = "$Id: protg.c,v 1.4 1995/08/19 21:29:40 ache Exp $"; +const char protg_rcsid[] = "$Id: protg.c,v 1.3.4.1 1995/09/01 06:05:13 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/proti.c b/gnu/libexec/uucp/uucico/proti.c index e8acd483dd345..233865a9009f0 100644 --- a/gnu/libexec/uucp/uucico/proti.c +++ b/gnu/libexec/uucp/uucico/proti.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char proti_rcsid[] = "$Id: proti.c,v 1.4 1995/08/19 21:29:42 ache Exp $"; +const char proti_rcsid[] = "$Id: proti.c,v 1.3.4.1 1995/09/01 06:05:15 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/protj.c b/gnu/libexec/uucp/uucico/protj.c index 8d8cffd092f36..de70c2c0c50b8 100644 --- a/gnu/libexec/uucp/uucico/protj.c +++ b/gnu/libexec/uucp/uucico/protj.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protj_rcsid[] = "$Id: protj.c,v 1.3 1995/08/19 21:29:44 ache Exp $"; +const char protj_rcsid[] = "$Id: protj.c,v 1.2.6.1 1995/09/01 06:05:16 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/prott.c b/gnu/libexec/uucp/uucico/prott.c index 0d38bed6f269b..f2bfe16398bd1 100644 --- a/gnu/libexec/uucp/uucico/prott.c +++ b/gnu/libexec/uucp/uucico/prott.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char prott_rcsid[] = "$Id: prott.c,v 1.4 1995/08/19 21:29:45 ache Exp $"; +const char prott_rcsid[] = "$Id: prott.c,v 1.3.4.1 1995/09/01 06:05:17 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/uucico/proty.c b/gnu/libexec/uucp/uucico/proty.c index f15671e2b4d34..2d5d5fb747758 100644 --- a/gnu/libexec/uucp/uucico/proty.c +++ b/gnu/libexec/uucp/uucico/proty.c @@ -23,7 +23,7 @@ #include "uucp.h" #if USE_RCS_ID -const char proty_id[] = "$Id: proty.c,v 1.4 1995/06/21 19:15:40 ian Rel $"; +const char proty_id[] = "$Id: proty.c,v 1.1 1995/08/19 21:29:47 ache Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/uucico/protz.c b/gnu/libexec/uucp/uucico/protz.c index 878bae7c2382f..19fb22b390f1a 100644 --- a/gnu/libexec/uucp/uucico/protz.c +++ b/gnu/libexec/uucp/uucico/protz.c @@ -181,7 +181,7 @@ #include "uucp.h" #if USE_RCS_ID -const char protz_rcsid[] = "$Id: protz.c,v 1.4 1995/08/19 21:29:48 ache Exp $"; +const char protz_rcsid[] = "$Id: protz.c,v 1.3.4.1 1995/09/01 06:05:18 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/rec.c b/gnu/libexec/uucp/uucico/rec.c index 69ed0dbb14e89..e557a23a0f4ec 100644 --- a/gnu/libexec/uucp/uucico/rec.c +++ b/gnu/libexec/uucp/uucico/rec.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char rec_rcsid[] = "$Id: rec.c,v 1.5 1995/08/19 21:29:50 ache Exp $"; +const char rec_rcsid[] = "$Id: rec.c,v 1.4.4.1 1995/09/01 06:05:21 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/send.c b/gnu/libexec/uucp/uucico/send.c index abe3384dc8236..fbabf2b6d2242 100644 --- a/gnu/libexec/uucp/uucico/send.c +++ b/gnu/libexec/uucp/uucico/send.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char send_rcsid[] = "$Id: send.c,v 1.5 1995/08/19 21:29:52 ache Exp $"; +const char send_rcsid[] = "$Id: send.c,v 1.4.4.1 1995/09/01 06:05:23 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/time.c b/gnu/libexec/uucp/uucico/time.c index 4b81a48696e22..7b96b2c9d9d5c 100644 --- a/gnu/libexec/uucp/uucico/time.c +++ b/gnu/libexec/uucp/uucico/time.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char time_rcsid[] = "$Id: time.c,v 1.3 1995/08/19 21:29:54 ache Exp $"; +const char time_rcsid[] = "$Id: time.c,v 1.2.6.1 1995/09/01 06:05:25 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/trans.c b/gnu/libexec/uucp/uucico/trans.c index e3860a4c1c936..f6d738cc9646c 100644 --- a/gnu/libexec/uucp/uucico/trans.c +++ b/gnu/libexec/uucp/uucico/trans.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char trans_rcsid[] = "$Id: trans.c,v 1.5 1995/08/21 11:28:22 ache Exp $"; +const char trans_rcsid[] = "$Id: trans.c,v 1.3.4.1 1995/09/01 06:05:26 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/uucico.8 b/gnu/libexec/uucp/uucico/uucico.8 index 3b3b293e1b8bb..3539c2c1dc39f 100644 --- a/gnu/libexec/uucp/uucico/uucico.8 +++ b/gnu/libexec/uucp/uucico/uucico.8 @@ -1,4 +1,4 @@ -''' $Id: uucico.8,v 1.5 1995/08/19 21:29:57 ache Exp $ +''' $Id: uucico.8,v 1.4.4.1 1995/09/01 06:05:27 davidg Exp $ .TH uucico 8 "Taylor UUCP 1.06" .SH NAME uucico \- UUCP file transfer daemon diff --git a/gnu/libexec/uucp/uucico/uucico.c b/gnu/libexec/uucp/uucico/uucico.c index 0699faf781ebf..ae5a1c97b27e2 100644 --- a/gnu/libexec/uucp/uucico/uucico.c +++ b/gnu/libexec/uucp/uucico/uucico.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uucico_rcsid[] = "$Id: uucico.c,v 1.6 1995/08/21 11:28:23 ache Exp $"; +const char uucico_rcsid[] = "$Id: uucico.c,v 1.4.4.1 1995/09/01 06:05:28 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uucico/xcmd.c b/gnu/libexec/uucp/uucico/xcmd.c index 728356260e536..b5be1a9fc1e03 100644 --- a/gnu/libexec/uucp/uucico/xcmd.c +++ b/gnu/libexec/uucp/uucico/xcmd.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char xcmd_rcsid[] = "$Id: xcmd.c,v 1.3 1995/08/19 21:30:01 ache Exp $"; +const char xcmd_rcsid[] = "$Id: xcmd.c,v 1.2.6.1 1995/09/01 06:05:29 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile index 1f9feff7b987d..e33e311a43ed2 100644 --- a/gnu/libexec/uucp/uuconv/Makefile +++ b/gnu/libexec/uucp/uuconv/Makefile @@ -1,5 +1,5 @@ # Makefile for uuconv -# $Id: Makefile,v 1.4 1995/05/14 17:01:07 ache Exp $ +# $Id: Makefile,v 1.5 1995/05/30 04:45:39 rgrimes Exp $ BINDIR= $(sbindir) diff --git a/gnu/libexec/uucp/uuconv/uuconv.c b/gnu/libexec/uucp/uuconv/uuconv.c index a5f2372effcd4..ffa5ca5087449 100644 --- a/gnu/libexec/uucp/uuconv/uuconv.c +++ b/gnu/libexec/uucp/uuconv/uuconv.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.4 1995/08/19 21:30:03 ache Exp $"; +const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.3.4.1 1995/09/01 06:05:31 davidg Exp $"; #endif #include "getopt.h" diff --git a/gnu/libexec/uucp/uucp/Makefile b/gnu/libexec/uucp/uucp/Makefile index 4cb4afa8138ad..b6af00ea421ac 100644 --- a/gnu/libexec/uucp/uucp/Makefile +++ b/gnu/libexec/uucp/uucp/Makefile @@ -1,5 +1,5 @@ # Makefile for uucp -# $Id: Makefile,v 1.2 1994/05/31 05:37:12 ache Exp $ +# $Id: Makefile,v 1.3 1994/05/31 07:37:14 ache Exp $ BINDIR= $(bindir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uucp/uucp.1 b/gnu/libexec/uucp/uucp/uucp.1 index a46164319b32c..a6b349d7e5b34 100644 --- a/gnu/libexec/uucp/uucp/uucp.1 +++ b/gnu/libexec/uucp/uucp/uucp.1 @@ -1,4 +1,4 @@ -''' $Id: uucp.1,v 1.4 1995/08/19 21:30:08 ache Exp $ +''' $Id: uucp.1,v 1.3.4.1 1995/09/01 06:05:33 davidg Exp $ .TH uucp 1 "Taylor UUCP 1.06" .SH NAME uucp \- Unix to Unix copy diff --git a/gnu/libexec/uucp/uucp/uucp.c b/gnu/libexec/uucp/uucp/uucp.c index 115e930013e7c..9db7ddf741680 100644 --- a/gnu/libexec/uucp/uucp/uucp.c +++ b/gnu/libexec/uucp/uucp/uucp.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uucp_rcsid[] = "$Id: uucp.c,v 1.4 1995/08/21 11:28:24 ache Exp $"; +const char uucp_rcsid[] = "$Id: uucp.c,v 1.2.6.1 1995/09/01 06:05:34 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uulog/Makefile b/gnu/libexec/uucp/uulog/Makefile index 321656f3dcf13..eb57dd2314a59 100644 --- a/gnu/libexec/uucp/uulog/Makefile +++ b/gnu/libexec/uucp/uulog/Makefile @@ -1,5 +1,5 @@ # Makefile for uulog -# $Id: Makefile,v 1.2 1993/08/05 16:15:14 jtc Exp $ +# $Id: Makefile,v 1.1 1993/08/05 18:27:39 conklin Exp $ BINDIR= $(bindir) diff --git a/gnu/libexec/uucp/uulog/uulog.c b/gnu/libexec/uucp/uulog/uulog.c index 427e32d3bbf50..0aecd55441dfc 100644 --- a/gnu/libexec/uucp/uulog/uulog.c +++ b/gnu/libexec/uucp/uulog/uulog.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uulog_rcsid[] = "$Id: uulog.c,v 1.4 1995/08/19 21:30:12 ache Exp $"; +const char uulog_rcsid[] = "$Id: uulog.c,v 1.3.4.1 1995/09/01 06:05:35 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uuname/Makefile b/gnu/libexec/uucp/uuname/Makefile index 5e7b314ba11e5..1558f6bba3f25 100644 --- a/gnu/libexec/uucp/uuname/Makefile +++ b/gnu/libexec/uucp/uuname/Makefile @@ -1,5 +1,5 @@ # Makefile for uuname -# $Id: Makefile,v 1.2 1993/08/05 16:15:16 jtc Exp $ +# $Id: Makefile,v 1.1 1993/08/05 18:27:42 conklin Exp $ BINDIR= $(bindir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uuname/uuname.c b/gnu/libexec/uucp/uuname/uuname.c index 8389498cbb895..c8f44ca27398c 100644 --- a/gnu/libexec/uucp/uuname/uuname.c +++ b/gnu/libexec/uucp/uuname/uuname.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuname_rcsid[] = "$Id: uuname.c,v 1.3 1995/08/19 21:30:14 ache Exp $"; +const char uuname_rcsid[] = "$Id: uuname.c,v 1.2.6.1 1995/09/01 06:05:37 davidg Exp $"; #endif #include "getopt.h" diff --git a/gnu/libexec/uucp/uupick/Makefile b/gnu/libexec/uucp/uupick/Makefile index c9a431219d841..871e138471c35 100644 --- a/gnu/libexec/uucp/uupick/Makefile +++ b/gnu/libexec/uucp/uupick/Makefile @@ -1,5 +1,5 @@ # Makefile for uupick -# $Id: Makefile,v 1.2 1993/08/05 16:15:19 jtc Exp $ +# $Id: Makefile,v 1.1 1993/08/05 18:27:46 conklin Exp $ BINDIR= $(bindir) diff --git a/gnu/libexec/uucp/uupick/uupick.c b/gnu/libexec/uucp/uupick/uupick.c index 1e89d932de3f4..bda22b04022c7 100644 --- a/gnu/libexec/uucp/uupick/uupick.c +++ b/gnu/libexec/uucp/uupick/uupick.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uupick_rcsid[] = "$Id: uupick.c,v 1.3 1995/08/19 21:30:16 ache Exp $"; +const char uupick_rcsid[] = "$Id: uupick.c,v 1.2.6.1 1995/09/01 06:05:38 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile index a50ce7a452a8d..60ba2f79692bd 100644 --- a/gnu/libexec/uucp/uusched/Makefile +++ b/gnu/libexec/uucp/uusched/Makefile @@ -1,5 +1,5 @@ # Makefile for uusched -# $Id: Makefile,v 1.8 1995/07/25 00:31:36 bde Exp $ +# $Id: Makefile,v 1.7.4.1 1995/09/01 06:05:40 davidg Exp $ BINDIR= $(bindir) CLEANFILES+= $(ONESHPROG) diff --git a/gnu/libexec/uucp/uustat/Makefile b/gnu/libexec/uucp/uustat/Makefile index e8814db10668e..1b166a3ea8f08 100644 --- a/gnu/libexec/uucp/uustat/Makefile +++ b/gnu/libexec/uucp/uustat/Makefile @@ -1,5 +1,5 @@ # Makefile for uustat -# $Id: Makefile,v 1.1 1993/08/05 18:28:01 conklin Exp $ +# $Id: Makefile,v 1.1.8.2 1996/06/05 02:39:07 jkh Exp $ BINDIR= $(bindir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uustat/uustat.1 b/gnu/libexec/uucp/uustat/uustat.1 index 14e98a7621599..3d48429bcb4d1 100644 --- a/gnu/libexec/uucp/uustat/uustat.1 +++ b/gnu/libexec/uucp/uustat/uustat.1 @@ -1,4 +1,4 @@ -''' $Id: uustat.1,v 1.4.4.1 1995/09/01 06:05:42 davidg Exp $ +''' $Id: uustat.1,v 1.4.4.3 1996/06/05 02:39:08 jkh Exp $ .TH uustat 1 "Taylor UUCP 1.06" .SH NAME uustat \- UUCP status inquiry and control diff --git a/gnu/libexec/uucp/uustat/uustat.c b/gnu/libexec/uucp/uustat/uustat.c index 50d1ce1e0294d..d2280f2d115c5 100644 --- a/gnu/libexec/uucp/uustat/uustat.c +++ b/gnu/libexec/uucp/uustat/uustat.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uustat_rcsid[] = "$Id: uustat.c,v 1.4 1995/08/19 21:30:21 ache Exp $"; +const char uustat_rcsid[] = "$Id: uustat.c,v 1.3.4.1 1995/09/01 06:05:43 davidg Exp $"; #endif #include diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile index 6818e46d33650..b613ede080448 100644 --- a/gnu/libexec/uucp/uuto/Makefile +++ b/gnu/libexec/uucp/uuto/Makefile @@ -1,5 +1,5 @@ # Makefile for uuto -# $Id: Makefile,v 1.6 1995/07/25 00:31:45 bde Exp $ +# $Id: Makefile,v 1.5.4.1 1995/09/01 06:05:44 davidg Exp $ BINDIR= $(bindir) CLEANFILES+= $(ONESHPROG) diff --git a/gnu/libexec/uucp/uux/Makefile b/gnu/libexec/uucp/uux/Makefile index 4ee45a4314556..1fe92f2fa2c27 100644 --- a/gnu/libexec/uucp/uux/Makefile +++ b/gnu/libexec/uucp/uux/Makefile @@ -1,5 +1,5 @@ # Makefile for uux -# $Id: Makefile,v 1.2 1994/05/31 05:46:38 ache Exp $ +# $Id: Makefile,v 1.3 1994/05/31 07:37:25 ache Exp $ BINDIR= $(bindir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uux/uux.1 b/gnu/libexec/uucp/uux/uux.1 index 4d740998fb530..5cb0df5ea9ec5 100644 --- a/gnu/libexec/uucp/uux/uux.1 +++ b/gnu/libexec/uucp/uux/uux.1 @@ -1,4 +1,4 @@ -''' $Id: uux.1,v 1.4 1995/08/19 21:30:25 ache Exp $ +''' $Id: uux.1,v 1.3.4.1 1995/09/01 06:05:46 davidg Exp $ .TH uux 1 "Taylor UUCP 1.06" .SH NAME uux \- Remote command execution over UUCP diff --git a/gnu/libexec/uucp/uux/uux.c b/gnu/libexec/uucp/uux/uux.c index 71a9123d637a9..3ac7b560bdb48 100644 --- a/gnu/libexec/uucp/uux/uux.c +++ b/gnu/libexec/uucp/uux/uux.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uux_rcsid[] = "$Id: uux.c,v 1.8 1995/08/21 11:28:26 ache Exp $"; +const char uux_rcsid[] = "$Id: uux.c,v 1.6.4.1 1995/09/01 06:05:47 davidg Exp $"; #endif #include "uudefs.h" diff --git a/gnu/libexec/uucp/uuxqt/Makefile b/gnu/libexec/uucp/uuxqt/Makefile index 8669d541e2265..a64620bd26390 100644 --- a/gnu/libexec/uucp/uuxqt/Makefile +++ b/gnu/libexec/uucp/uuxqt/Makefile @@ -1,5 +1,5 @@ # Makefile for uuxqt -# $Id: Makefile,v 1.5 1994/05/31 05:46:42 ache Exp $ +# $Id: Makefile,v 1.6 1995/05/13 12:30:17 ache Exp $ BINDIR= $(libxdir) BINOWN= $(owner) diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.8 b/gnu/libexec/uucp/uuxqt/uuxqt.8 index 89cd4810cd6c9..48df11e9834e3 100644 --- a/gnu/libexec/uucp/uuxqt/uuxqt.8 +++ b/gnu/libexec/uucp/uuxqt/uuxqt.8 @@ -1,4 +1,4 @@ -''' $Id: uuxqt.8,v 1.4 1995/08/19 21:30:28 ache Exp $ +''' $Id: uuxqt.8,v 1.3.4.1 1995/09/01 06:05:49 davidg Exp $ .TH uuxqt 8 "Taylor UUCP 1.06" .SH NAME uuxqt \- UUCP execution daemon diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c index 08c3f3af1903c..93d722f63b355 100644 --- a/gnu/libexec/uucp/uuxqt/uuxqt.c +++ b/gnu/libexec/uucp/uuxqt/uuxqt.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.5 1995/08/19 21:30:30 ache Exp $"; +const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.4.4.1 1995/09/01 06:05:50 davidg Exp $"; #endif #include diff --git a/gnu/libexec/ypxfr/Makefile b/gnu/libexec/ypxfr/Makefile index 460d0708d9785..0e000f6d22783 100644 --- a/gnu/libexec/ypxfr/Makefile +++ b/gnu/libexec/ypxfr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/02/06 22:15:20 wpaul Exp $ +# $Id: Makefile,v 1.3 1995/03/31 05:45:18 wpaul Exp $ PROG= ypxfr MAN8= ypxfr.8 diff --git a/gnu/libexec/ypxfr/log.c b/gnu/libexec/ypxfr/log.c index 7b76a2aa41d11..0163ecca8a67a 100644 --- a/gnu/libexec/ypxfr/log.c +++ b/gnu/libexec/ypxfr/log.c @@ -34,7 +34,7 @@ * error logging/reporting facilities * stolen from /usr/libexec/mail.local via ypserv * - * $Id$ + * $Id: log.c,v 1.1 1995/03/31 05:45:19 wpaul Exp $ */ #include diff --git a/gnu/libexec/ypxfr/ypclnt.c b/gnu/libexec/ypxfr/ypclnt.c index 04e58b9c03b37..adfe2da7187bd 100644 --- a/gnu/libexec/ypxfr/ypclnt.c +++ b/gnu/libexec/ypxfr/ypclnt.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: ypclnt.c,v 1.3 1995/03/31 05:45:21 wpaul Exp $ + $Id: ypclnt.c,v 1.4 1995/05/30 04:45:50 rgrimes Exp $ */ #include diff --git a/gnu/libexec/ypxfr/ypxfr.8 b/gnu/libexec/ypxfr/ypxfr.8 index 9b021e5ecb32a..589ebdffcb741 100644 --- a/gnu/libexec/ypxfr/ypxfr.8 +++ b/gnu/libexec/ypxfr/ypxfr.8 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ypxfr.8,v 1.2 1995/03/30 04:14:45 wpaul Exp $ +.\" $Id: ypxfr.8,v 1.3 1995/03/31 05:45:22 wpaul Exp $ .\" .Dd February 5, 1995 .Dt YPXFR 8 diff --git a/gnu/libexec/ypxfr/ypxfr.c b/gnu/libexec/ypxfr/ypxfr.c index e3a47345f6a19..ab1c479335993 100644 --- a/gnu/libexec/ypxfr/ypxfr.c +++ b/gnu/libexec/ypxfr/ypxfr.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: ypxfr.c,v 1.5 1995/03/31 05:45:23 wpaul Exp $ + $Id: ypxfr.c,v 1.6 1995/05/30 04:45:51 rgrimes Exp $ */ #include diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index ca63802ed06f6..1a176a65c662d 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.27 1995/04/11 17:28:26 nate Exp $ +# $Id: Makefile,v 1.27.4.2 1996/06/05 02:39:10 jkh Exp $ SUBDIR= as awk bc cc cpio cvs dc dialog diff diff3 gdb \ grep groff gzip ld man mkisofs patch perl ptx rcs sdiff send-pr \ diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc index 5371a22cca25b..07604ed971c24 100644 --- a/gnu/usr.bin/Makefile.inc +++ b/gnu/usr.bin/Makefile.inc @@ -1,3 +1,3 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1994/01/30 00:31:51 rgrimes Exp $ BINDIR?= /usr/bin diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile index 879a48078122c..e051ef997712a 100644 --- a/gnu/usr.bin/as/Makefile +++ b/gnu/usr.bin/as/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.1 (Berkeley) 3/3/91 -# $Id: Makefile,v 1.8 1995/05/30 04:45:55 rgrimes Exp $ +# $Id: Makefile,v 1.8.4.2 1996/06/05 02:39:14 jkh Exp $ .include "config/Makefile.$(MACHINE)" diff --git a/gnu/usr.bin/as/app.c b/gnu/usr.bin/as/app.c index 15e88e9140501..08c07d0543724 100644 --- a/gnu/usr.bin/as/app.c +++ b/gnu/usr.bin/as/app.c @@ -24,7 +24,7 @@ pair. This needs better error-handling. */ #ifndef lint -static char rcsid[] = "$Id: app.c,v 1.3 1994/12/23 22:35:59 nate Exp $"; +static char rcsid[] = "$Id: app.c,v 1.4 1995/05/30 04:45:59 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/as.c b/gnu/usr.bin/as/as.c index 920efb73e3f44..27aefc60f5300 100644 --- a/gnu/usr.bin/as/as.c +++ b/gnu/usr.bin/as/as.c @@ -32,7 +32,7 @@ * */ #ifndef lint -static char rcsid[] = "$Id: as.c,v 1.2 1993/11/03 00:51:09 paul Exp $"; +static char rcsid[] = "$Id: as.c,v 1.3 1995/05/30 04:46:01 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/as.h b/gnu/usr.bin/as/as.h index 2e7243da4fe81..e8bbabf19317d 100644 --- a/gnu/usr.bin/as/as.h +++ b/gnu/usr.bin/as/as.h @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: as.h,v 1.3 1994/12/23 22:36:01 nate Exp $ + * $Id: as.h,v 1.4 1995/05/30 04:46:02 rgrimes Exp $ */ #define GAS 1 diff --git a/gnu/usr.bin/as/atof-generic.c b/gnu/usr.bin/as/atof-generic.c index 47a58b1409a47..55bdbc72d0a58 100644 --- a/gnu/usr.bin/as/atof-generic.c +++ b/gnu/usr.bin/as/atof-generic.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: atof-generic.c,v 1.2 1993/11/03 00:51:14 paul Exp $"; +static char rcsid[] = "$Id: atof-generic.c,v 1.3 1995/05/30 04:46:04 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/bignum-copy.c b/gnu/usr.bin/as/bignum-copy.c index ec90e39975ca0..f1fe529c38e17 100644 --- a/gnu/usr.bin/as/bignum-copy.c +++ b/gnu/usr.bin/as/bignum-copy.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: bignum-copy.c,v 1.2 1993/11/03 00:51:16 paul Exp $"; +static char rcsid[] = "$Id: bignum-copy.c,v 1.3 1995/05/30 04:46:05 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/bignum.h b/gnu/usr.bin/as/bignum.h index 64efadc1f27c2..f5e3a1dcacc9c 100644 --- a/gnu/usr.bin/as/bignum.h +++ b/gnu/usr.bin/as/bignum.h @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: bignum.h,v 1.2 1993/11/03 00:51:18 paul Exp $ + * $Id: bignum.h,v 1.3 1995/05/30 04:46:06 rgrimes Exp $ */ /***********************************************************************\ diff --git a/gnu/usr.bin/as/bit_fix.h b/gnu/usr.bin/as/bit_fix.h index 14988ff2000e3..91d526b515ff7 100644 --- a/gnu/usr.bin/as/bit_fix.h +++ b/gnu/usr.bin/as/bit_fix.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: bit_fix.h,v 1.1 1993/11/03 00:51:19 paul Exp $ + * $Id: bit_fix.h,v 1.2 1995/05/30 04:46:07 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/cond.c b/gnu/usr.bin/as/cond.c index 3eb8db7f41142..74488f4dc9570 100644 --- a/gnu/usr.bin/as/cond.c +++ b/gnu/usr.bin/as/cond.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: cond.c,v 1.2 1994/12/23 22:36:03 nate Exp $"; +static char rcsid[] = "$Id: cond.c,v 1.3 1995/05/30 04:46:08 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/config/Makefile.hp300 b/gnu/usr.bin/as/config/Makefile.hp300 index 4261d35b39bc3..388501cf8dc82 100644 --- a/gnu/usr.bin/as/config/Makefile.hp300 +++ b/gnu/usr.bin/as/config/Makefile.hp300 @@ -1,5 +1,5 @@ # from: @(#)Makefile.hp300 6.1 (Berkeley) 3/3/91 -# $Id: Makefile.hp300,v 1.4 1993/10/16 03:23:04 cgd Exp $ +# $Id: Makefile.hp300,v 1.1 1993/11/03 00:52:56 paul Exp $ CFLAGS+= -Dm68851 SRCS+= tc-m68k.c atof-ieee.c diff --git a/gnu/usr.bin/as/config/Makefile.i386 b/gnu/usr.bin/as/config/Makefile.i386 index 4cee91937bf9c..06c3d737cfcae 100644 --- a/gnu/usr.bin/as/config/Makefile.i386 +++ b/gnu/usr.bin/as/config/Makefile.i386 @@ -1,5 +1,5 @@ # from: @(#)Makefile.i386 6.1 (Berkeley) 3/3/91 -# $Id: Makefile.i386,v 1.2 1993/11/03 00:52:58 paul Exp $ +# $Id: Makefile.i386,v 1.3 1994/12/23 22:37:31 nate Exp $ CFLAGS+= -DNON_BROKEN_WORDS -DPIC SRCS+= tc-i386.c atof-ieee.c diff --git a/gnu/usr.bin/as/config/Makefile.pc532 b/gnu/usr.bin/as/config/Makefile.pc532 index d4b22aba6c807..5336a25a5eee6 100644 --- a/gnu/usr.bin/as/config/Makefile.pc532 +++ b/gnu/usr.bin/as/config/Makefile.pc532 @@ -1,4 +1,4 @@ -# $Id: Makefile.pc532,v 1.1 1993/10/16 03:23:37 cgd Exp $ +# $Id: Makefile.pc532,v 1.1 1993/11/03 00:52:59 paul Exp $ SRCS+= tc-ns32k.c atof-ns32k.c diff --git a/gnu/usr.bin/as/config/Makefile.sparc b/gnu/usr.bin/as/config/Makefile.sparc index 6dc9658536f7b..2e9c8f197219c 100644 --- a/gnu/usr.bin/as/config/Makefile.sparc +++ b/gnu/usr.bin/as/config/Makefile.sparc @@ -1,5 +1,5 @@ # from: @(#)Makefile.i386 6.1 (Berkeley) 3/3/91 -# $Id: Makefile.sparc,v 1.1 1993/11/03 00:53:00 paul Exp $ +# $Id: Makefile.sparc,v 1.2 1994/12/23 22:37:31 nate Exp $ CFLAGS+= -DNON_BROKEN_WORDS -DPIC SRCS+= tc-sparc.c atof-ieee.c diff --git a/gnu/usr.bin/as/config/Makefile.vax b/gnu/usr.bin/as/config/Makefile.vax index f62b087d3df33..060f15d9ddaee 100644 --- a/gnu/usr.bin/as/config/Makefile.vax +++ b/gnu/usr.bin/as/config/Makefile.vax @@ -1,4 +1,4 @@ # from: @(#)Makefile.vax 6.1 (Berkeley) 3/3/91 -# $Id: Makefile.vax,v 1.3 1993/10/02 20:58:23 pk Exp $ +# $Id: Makefile.vax,v 1.1 1993/11/03 00:53:01 paul Exp $ SRCS+= tc-vax.c atof-vax.c diff --git a/gnu/usr.bin/as/config/atof-ieee.c b/gnu/usr.bin/as/config/atof-ieee.c index 7040f11da8200..f785d0ae7782b 100644 --- a/gnu/usr.bin/as/config/atof-ieee.c +++ b/gnu/usr.bin/as/config/atof-ieee.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: atof-ieee.c,v 1.2 1993/11/03 00:53:04 paul Exp $"; +static char rcsid[] = "$Id: atof-ieee.c,v 1.3 1995/05/30 04:46:46 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/config/ho-i386.h b/gnu/usr.bin/as/config/ho-i386.h index 04de36681d1c0..7e7dbc330fce7 100644 --- a/gnu/usr.bin/as/config/ho-i386.h +++ b/gnu/usr.bin/as/config/ho-i386.h @@ -17,7 +17,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: ho-i386.h,v 1.1 1993/11/03 00:53:21 paul Exp $ + * $Id: ho-i386.h,v 1.2 1995/05/30 04:46:55 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/config/obj-aout.h b/gnu/usr.bin/as/config/obj-aout.h index 1ac0f5c2b3e5c..dcafcf13b3582 100644 --- a/gnu/usr.bin/as/config/obj-aout.h +++ b/gnu/usr.bin/as/config/obj-aout.h @@ -17,7 +17,7 @@ License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: obj-aout.h,v 1.3 1994/12/23 22:37:34 nate Exp $ + $Id: obj-aout.h,v 1.4 1995/05/30 04:47:04 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/config/tc-i386.c b/gnu/usr.bin/as/config/tc-i386.c index 7aa2174e60876..abc8205b93eca 100644 --- a/gnu/usr.bin/as/config/tc-i386.c +++ b/gnu/usr.bin/as/config/tc-i386.c @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: tc-i386.c,v 1.3 1994/12/23 22:37:35 nate Exp $"; +static char rcsid[] = "$Id: tc-i386.c,v 1.4 1995/05/30 04:47:29 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/config/tc-i386.h b/gnu/usr.bin/as/config/tc-i386.h index fd4d335ab2d94..5dc82e144768c 100644 --- a/gnu/usr.bin/as/config/tc-i386.h +++ b/gnu/usr.bin/as/config/tc-i386.h @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc-i386.h,v 1.2 1994/12/23 22:37:36 nate Exp $ + * $Id: tc-i386.h,v 1.3 1995/05/30 04:47:31 rgrimes Exp $ */ #ifndef TC_I386 diff --git a/gnu/usr.bin/as/config/tc-sparc.c b/gnu/usr.bin/as/config/tc-sparc.c index 238e5f7c1163c..9c9063dd297e9 100644 --- a/gnu/usr.bin/as/config/tc-sparc.c +++ b/gnu/usr.bin/as/config/tc-sparc.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: tc-sparc.c,v 1.3 1994/12/23 22:37:40 nate Exp $"; +static char rcsid[] = "$Id: tc-sparc.c,v 1.4 1995/05/30 04:47:49 rgrimes Exp $"; #endif #define cypress 1234 diff --git a/gnu/usr.bin/as/config/tc-sparc.h b/gnu/usr.bin/as/config/tc-sparc.h index c6dfa317da6c9..0463ebef45fe0 100644 --- a/gnu/usr.bin/as/config/tc-sparc.h +++ b/gnu/usr.bin/as/config/tc-sparc.h @@ -18,7 +18,7 @@ to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc-sparc.h,v 1.2 1994/12/23 22:37:41 nate Exp $ + * $Id: tc-sparc.h,v 1.3 1995/05/30 04:47:50 rgrimes Exp $ */ #define TC_SPARC 1 diff --git a/gnu/usr.bin/as/config/te-generic.h b/gnu/usr.bin/as/config/te-generic.h index f72d5ee95fea3..8bf93bf4ad39c 100644 --- a/gnu/usr.bin/as/config/te-generic.h +++ b/gnu/usr.bin/as/config/te-generic.h @@ -6,7 +6,7 @@ * compile, and copying as an aid for testing and porting. xoxorich. */ /* - * $Id: te-generic.h,v 1.1 1993/10/02 20:59:49 pk Exp $ + * $Id: te-generic.h,v 1.1 1993/11/03 00:55:03 paul Exp $ */ diff --git a/gnu/usr.bin/as/debug.c b/gnu/usr.bin/as/debug.c index d0a0c2d052cae..63e64dfdbfad5 100644 --- a/gnu/usr.bin/as/debug.c +++ b/gnu/usr.bin/as/debug.c @@ -21,7 +21,7 @@ /* Routines for debug use only. */ #ifndef lint -static char rcsid[] = "$Id: debug.c,v 1.1 1993/11/03 00:51:26 paul Exp $"; +static char rcsid[] = "$Id: debug.c,v 1.2 1995/05/30 04:46:09 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/expr.c b/gnu/usr.bin/as/expr.c index b504a4bdd8171..e0e18c8318599 100644 --- a/gnu/usr.bin/as/expr.c +++ b/gnu/usr.bin/as/expr.c @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: expr.c,v 1.2 1993/11/03 00:51:28 paul Exp $"; +static char rcsid[] = "$Id: expr.c,v 1.3 1995/05/30 04:46:10 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/expr.h b/gnu/usr.bin/as/expr.h index d0b68a53b013c..52b591326c074 100644 --- a/gnu/usr.bin/as/expr.h +++ b/gnu/usr.bin/as/expr.h @@ -17,7 +17,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: expr.h,v 1.2 1993/11/03 00:51:31 paul Exp $ + * $Id: expr.h,v 1.3 1995/05/30 04:46:11 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/flo-const.c b/gnu/usr.bin/as/flo-const.c index 90f0af108bea0..4df2e46309a6b 100644 --- a/gnu/usr.bin/as/flo-const.c +++ b/gnu/usr.bin/as/flo-const.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: flo-const.c,v 1.1 1993/11/03 00:51:32 paul Exp $"; +static char rcsid[] = "$Id: flo-const.c,v 1.2 1995/05/30 04:46:12 rgrimes Exp $"; #endif #include "flonum.h" diff --git a/gnu/usr.bin/as/flo-copy.c b/gnu/usr.bin/as/flo-copy.c index 6e1b30685d1c0..8eb41627cf720 100644 --- a/gnu/usr.bin/as/flo-copy.c +++ b/gnu/usr.bin/as/flo-copy.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: flo-copy.c,v 1.1 1993/11/03 00:51:34 paul Exp $"; +static char rcsid[] = "$Id: flo-copy.c,v 1.2 1995/05/30 04:46:13 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/flonum-mult.c b/gnu/usr.bin/as/flonum-mult.c index 4fe8f38dbc0be..6b718758388b3 100644 --- a/gnu/usr.bin/as/flonum-mult.c +++ b/gnu/usr.bin/as/flonum-mult.c @@ -19,7 +19,7 @@ notice and this notice must be preserved on all copies. */ #ifndef lint -static char rcsid[] = "$Id: flonum-mult.c,v 1.2 1993/11/03 00:51:36 paul Exp $"; +static char rcsid[] = "$Id: flonum-mult.c,v 1.3 1995/05/30 04:46:14 rgrimes Exp $"; #endif #include "flonum.h" diff --git a/gnu/usr.bin/as/flonum.h b/gnu/usr.bin/as/flonum.h index cc05dbf0267df..7bb3c0dec3ba8 100644 --- a/gnu/usr.bin/as/flonum.h +++ b/gnu/usr.bin/as/flonum.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: flonum.h,v 1.2 1993/11/03 00:51:37 paul Exp $ + * $Id: flonum.h,v 1.3 1995/05/30 04:46:15 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/frags.c b/gnu/usr.bin/as/frags.c index 71f4669b3f5e3..262e058a25b9e 100644 --- a/gnu/usr.bin/as/frags.c +++ b/gnu/usr.bin/as/frags.c @@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: frags.c,v 1.2 1993/11/03 00:51:39 paul Exp $"; +static char rcsid[] = "$Id: frags.c,v 1.3 1995/05/30 04:46:16 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/frags.h b/gnu/usr.bin/as/frags.h index 0e82c65f362ae..23753a7a44e7a 100644 --- a/gnu/usr.bin/as/frags.h +++ b/gnu/usr.bin/as/frags.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: frags.h,v 1.2 1993/11/03 00:51:40 paul Exp $ + * $Id: frags.h,v 1.3 1995/05/30 04:46:17 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/hash.c b/gnu/usr.bin/as/hash.c index e8b82d2030f69..c03157bcc461d 100644 --- a/gnu/usr.bin/as/hash.c +++ b/gnu/usr.bin/as/hash.c @@ -123,7 +123,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: hash.c,v 1.3 1995/05/30 04:46:18 rgrimes Exp $"; +static char rcsid[] = "$Id: hash.c,v 1.3.4.2 1996/06/05 02:39:16 jkh Exp $"; #endif #include diff --git a/gnu/usr.bin/as/hash.h b/gnu/usr.bin/as/hash.h index 034c2aa62c311..c9a2ab2db95d4 100644 --- a/gnu/usr.bin/as/hash.h +++ b/gnu/usr.bin/as/hash.h @@ -17,7 +17,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: hash.h,v 1.2 1993/11/03 00:51:46 paul Exp $ + * $Id: hash.h,v 1.3 1995/05/30 04:46:19 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/hex-value.c b/gnu/usr.bin/as/hex-value.c index 432aa02422109..f55a64bc947ef 100644 --- a/gnu/usr.bin/as/hex-value.c +++ b/gnu/usr.bin/as/hex-value.c @@ -23,7 +23,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: hex-value.c,v 1.2 1993/11/03 00:51:47 paul Exp $"; +static char rcsid[] = "$Id: hex-value.c,v 1.3 1995/05/30 04:46:20 rgrimes Exp $"; #endif #define __ (42) /* blatently illegal digit value */ diff --git a/gnu/usr.bin/as/input-file.c b/gnu/usr.bin/as/input-file.c index 39e19ac0c52a5..86c6a7734c84b 100644 --- a/gnu/usr.bin/as/input-file.c +++ b/gnu/usr.bin/as/input-file.c @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: input-file.c,v 1.2 1993/11/03 00:51:48 paul Exp $"; +static char rcsid[] = "$Id: input-file.c,v 1.3 1995/05/30 04:46:21 rgrimes Exp $"; #endif #ifdef USG diff --git a/gnu/usr.bin/as/input-file.h b/gnu/usr.bin/as/input-file.h index 0c6da7d004e51..b9fb65fd04a9d 100644 --- a/gnu/usr.bin/as/input-file.h +++ b/gnu/usr.bin/as/input-file.h @@ -20,7 +20,7 @@ /*"input_file.c":Operating-system dependant functions to read source files.*/ /* - * $Id: input-file.h,v 1.2 1993/11/03 00:51:50 paul Exp $ + * $Id: input-file.h,v 1.3 1995/05/30 04:46:22 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/input-scrub.c b/gnu/usr.bin/as/input-scrub.c index 0e0a1790f3bd4..47ba0d29f7346 100644 --- a/gnu/usr.bin/as/input-scrub.c +++ b/gnu/usr.bin/as/input-scrub.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: input-scrub.c,v 1.3 1994/12/23 22:36:05 nate Exp $"; +static char rcsid[] = "$Id: input-scrub.c,v 1.4 1995/05/30 04:46:23 rgrimes Exp $"; #endif #include /* Need this to make errno declaration right */ diff --git a/gnu/usr.bin/as/listing.c b/gnu/usr.bin/as/listing.c index f79a8b451041e..332d4df9e6bfa 100644 --- a/gnu/usr.bin/as/listing.c +++ b/gnu/usr.bin/as/listing.c @@ -92,7 +92,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ */ #ifndef lint -static char rcsid[] = "$Id: listing.c,v 1.2 1994/12/23 22:36:08 nate Exp $"; +static char rcsid[] = "$Id: listing.c,v 1.3 1995/05/30 04:46:24 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/listing.h b/gnu/usr.bin/as/listing.h index 2220c35eb4c26..fde349b11e4a0 100644 --- a/gnu/usr.bin/as/listing.h +++ b/gnu/usr.bin/as/listing.h @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: listing.h,v 1.1 1993/11/03 00:51:56 paul Exp $ + * $Id: listing.h,v 1.2 1994/12/23 22:36:10 nate Exp $ */ #ifndef __listing_h__ diff --git a/gnu/usr.bin/as/makefile.dos b/gnu/usr.bin/as/makefile.dos index 89c74c7873619..b9f7197c5fd6c 100644 --- a/gnu/usr.bin/as/makefile.dos +++ b/gnu/usr.bin/as/makefile.dos @@ -17,7 +17,7 @@ #along with GNU GAS; see the file COPYING. If not, write to #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# $Id: makefile.dos,v 1.1 1993/10/02 20:57:43 pk Exp $ +# $Id: makefile.dos,v 1.1 1993/11/03 00:51:59 paul Exp $ # The targets for external use include: # all, doc, proto, install, uninstall, includes, TAGS, diff --git a/gnu/usr.bin/as/messages.c b/gnu/usr.bin/as/messages.c index 55e97d943ef8c..e46d371d8d866 100644 --- a/gnu/usr.bin/as/messages.c +++ b/gnu/usr.bin/as/messages.c @@ -18,7 +18,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: messages.c,v 1.3 1994/12/23 22:36:12 nate Exp $"; +static char rcsid[] = "$Id: messages.c,v 1.4 1995/05/30 04:46:25 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/obj.h b/gnu/usr.bin/as/obj.h index a621941004aec..000641a3c6130 100644 --- a/gnu/usr.bin/as/obj.h +++ b/gnu/usr.bin/as/obj.h @@ -19,7 +19,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: obj.h,v 1.1 1993/11/03 00:52:03 paul Exp $ + * $Id: obj.h,v 1.2 1995/05/30 04:46:26 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/obstack.c b/gnu/usr.bin/as/obstack.c index d7302ea1f5d47..b36bdada55eab 100644 --- a/gnu/usr.bin/as/obstack.c +++ b/gnu/usr.bin/as/obstack.c @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: obstack.c,v 1.3 1993/10/02 20:57:47 pk Exp $"; +static char rcsid[] = "$Id: obstack.c,v 1.2 1993/11/03 00:52:04 paul Exp $"; #endif #include "obstack.h" diff --git a/gnu/usr.bin/as/obstack.h b/gnu/usr.bin/as/obstack.h index c29bb1f47921c..cd847ed7ec82c 100644 --- a/gnu/usr.bin/as/obstack.h +++ b/gnu/usr.bin/as/obstack.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: obstack.h,v 1.2 1993/11/03 00:52:06 paul Exp $ + * $Id: obstack.h,v 1.3 1995/05/30 04:46:27 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/opcode/a29k.h b/gnu/usr.bin/as/opcode/a29k.h index 8c3616747f090..1d34ff8f5ec9a 100644 --- a/gnu/usr.bin/as/opcode/a29k.h +++ b/gnu/usr.bin/as/opcode/a29k.h @@ -285,6 +285,9 @@ CONST unsigned int num_opcodes = (((sizeof a29k_opcodes) / (sizeof a29k_opcodes[ /* * $Log: a29k.h,v $ + * Revision 1.1 1993/11/03 00:55:48 paul + * Brought over NetBSD's gas ready for pk's shared libs. + * * Revision 1.1 1993/10/02 21:00:40 pk * GNU gas 1.92.3 based assembler supporting PIC code (for i386 and sparc). * diff --git a/gnu/usr.bin/as/opcode/i386.h b/gnu/usr.bin/as/opcode/i386.h index 0c663570617c9..c0677553021f8 100644 --- a/gnu/usr.bin/as/opcode/i386.h +++ b/gnu/usr.bin/as/opcode/i386.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: i386.h,v 1.2 1994/12/11 20:46:55 sef Exp $ */ +/* $Id: i386.h,v 1.3 1995/05/30 04:48:01 rgrimes Exp $ */ static const template i386_optab[] = { diff --git a/gnu/usr.bin/as/opcode/i960.h b/gnu/usr.bin/as/opcode/i960.h index 6a6ad42536bde..c32f7ae5ea523 100644 --- a/gnu/usr.bin/as/opcode/i960.h +++ b/gnu/usr.bin/as/opcode/i960.h @@ -18,7 +18,7 @@ * appropriate. */ -/* $Id: i960.h,v 1.1 1993/11/03 00:55:56 paul Exp $ */ +/* $Id: i960.h,v 1.2 1995/05/30 04:48:03 rgrimes Exp $ */ #define CTRL 0 #define COBR 1 diff --git a/gnu/usr.bin/as/opcode/sparc.h b/gnu/usr.bin/as/opcode/sparc.h index 7921cf597f432..b5e8d5e331147 100644 --- a/gnu/usr.bin/as/opcode/sparc.h +++ b/gnu/usr.bin/as/opcode/sparc.h @@ -20,7 +20,7 @@ along with GAS or GDB; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: sparc.h,v 1.2 1994/12/23 22:37:45 nate Exp $ + * $Id: sparc.h,v 1.3 1995/05/30 04:48:14 rgrimes Exp $ */ /* FIXME-someday: perhaps the ,a's and such should be embedded in the diff --git a/gnu/usr.bin/as/output-file.c b/gnu/usr.bin/as/output-file.c index 1a8683be431f5..27bcd8e615f05 100644 --- a/gnu/usr.bin/as/output-file.c +++ b/gnu/usr.bin/as/output-file.c @@ -27,7 +27,7 @@ /* note that we do need config info. xoxorich. */ #ifndef lint -static char rcsid[] = "$Id: output-file.c,v 1.2 1993/11/03 00:52:08 paul Exp $"; +static char rcsid[] = "$Id: output-file.c,v 1.3 1995/05/30 04:46:29 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/output-file.h b/gnu/usr.bin/as/output-file.h index 37878ab6d1438..26e8e45073b3f 100644 --- a/gnu/usr.bin/as/output-file.h +++ b/gnu/usr.bin/as/output-file.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: output-file.h,v 1.1 1993/11/03 00:52:10 paul Exp $ + * $Id: output-file.h,v 1.2 1995/05/30 04:46:30 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/read.c b/gnu/usr.bin/as/read.c index c9bcbca7f17f6..2f132f28d2557 100644 --- a/gnu/usr.bin/as/read.c +++ b/gnu/usr.bin/as/read.c @@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: read.c,v 1.5 1994/12/23 22:36:15 nate Exp $"; +static char rcsid[] = "$Id: read.c,v 1.6 1995/05/30 04:46:31 rgrimes Exp $"; #endif #define MASK_CHAR (0xFF) /* If your chars aren't 8 bits, you will diff --git a/gnu/usr.bin/as/read.h b/gnu/usr.bin/as/read.h index 9b2958274a2c6..405f0ce3cc610 100644 --- a/gnu/usr.bin/as/read.h +++ b/gnu/usr.bin/as/read.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: read.h,v 1.4 1994/12/23 22:36:17 nate Exp $ + * $Id: read.h,v 1.5 1995/05/30 04:46:32 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/struc-symbol.h b/gnu/usr.bin/as/struc-symbol.h index 5c405e4cc20d2..0c9455c741078 100644 --- a/gnu/usr.bin/as/struc-symbol.h +++ b/gnu/usr.bin/as/struc-symbol.h @@ -17,7 +17,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: struc-symbol.h,v 1.4 1994/12/23 22:36:20 nate Exp $ + * $Id: struc-symbol.h,v 1.5 1995/05/30 04:46:33 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/subsegs.c b/gnu/usr.bin/as/subsegs.c index 208980957dd5f..138fccb0f537c 100644 --- a/gnu/usr.bin/as/subsegs.c +++ b/gnu/usr.bin/as/subsegs.c @@ -22,7 +22,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: subsegs.c,v 1.3 1995/03/02 20:29:18 nate Exp $"; +static char rcsid[] = "$Id: subsegs.c,v 1.4 1995/05/30 04:46:34 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/subsegs.h b/gnu/usr.bin/as/subsegs.h index 9d1482a94588d..7c10a8f55f512 100644 --- a/gnu/usr.bin/as/subsegs.h +++ b/gnu/usr.bin/as/subsegs.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: subsegs.h,v 1.2 1993/11/03 00:52:20 paul Exp $ + * $Id: subsegs.h,v 1.3 1995/05/30 04:46:35 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/symbols.c b/gnu/usr.bin/as/symbols.c index 44c71d4fab855..604434ff3eab1 100644 --- a/gnu/usr.bin/as/symbols.c +++ b/gnu/usr.bin/as/symbols.c @@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef lint -static char rcsid[] = "$Id: symbols.c,v 1.2 1993/11/03 00:52:22 paul Exp $"; +static char rcsid[] = "$Id: symbols.c,v 1.3 1995/05/30 04:46:36 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/symbols.h b/gnu/usr.bin/as/symbols.h index 0906e9d38093c..11ad6375dc72d 100644 --- a/gnu/usr.bin/as/symbols.h +++ b/gnu/usr.bin/as/symbols.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: symbols.h,v 1.2 1993/11/03 00:52:23 paul Exp $ + * $Id: symbols.h,v 1.3 1995/05/30 04:46:37 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/tc.h b/gnu/usr.bin/as/tc.h index b75b0e2709ed1..9d7939fe95fca 100644 --- a/gnu/usr.bin/as/tc.h +++ b/gnu/usr.bin/as/tc.h @@ -18,7 +18,7 @@ along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - * $Id: tc.h,v 1.1 1993/11/03 00:52:25 paul Exp $ + * $Id: tc.h,v 1.2 1995/05/30 04:46:38 rgrimes Exp $ */ diff --git a/gnu/usr.bin/as/testscripts/doboth b/gnu/usr.bin/as/testscripts/doboth index 6b46a03eb1257..dc379e93d3fbb 100755 --- a/gnu/usr.bin/as/testscripts/doboth +++ b/gnu/usr.bin/as/testscripts/doboth @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: doboth,v 1.1 1993/10/02 21:01:07 pk Exp $ +# $Id: doboth,v 1.1 1993/11/03 00:56:17 paul Exp $ x=$1 ; shift y=$1 ; shift diff --git a/gnu/usr.bin/as/testscripts/doobjcmp b/gnu/usr.bin/as/testscripts/doobjcmp index 6c90cf9a05ffc..9fe6d907558e9 100755 --- a/gnu/usr.bin/as/testscripts/doobjcmp +++ b/gnu/usr.bin/as/testscripts/doobjcmp @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: doobjcmp,v 1.1 1993/10/02 21:01:08 pk Exp $ +# $Id: doobjcmp,v 1.1 1993/11/03 00:56:18 paul Exp $ # compare two object files, in depth. x=$1 diff --git a/gnu/usr.bin/as/testscripts/dostriptest b/gnu/usr.bin/as/testscripts/dostriptest index aa734c0c2b9fc..6f0c2918aeedf 100755 --- a/gnu/usr.bin/as/testscripts/dostriptest +++ b/gnu/usr.bin/as/testscripts/dostriptest @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: dostriptest,v 1.1 1993/10/02 21:01:09 pk Exp $ +# $Id: dostriptest,v 1.1 1993/11/03 00:56:19 paul Exp $ x=striptest.xx.$$ y=striptest.yy.$$ diff --git a/gnu/usr.bin/as/testscripts/dotest b/gnu/usr.bin/as/testscripts/dotest index 051ee11ef7908..ff39433d32b9d 100755 --- a/gnu/usr.bin/as/testscripts/dotest +++ b/gnu/usr.bin/as/testscripts/dotest @@ -1,6 +1,6 @@ #!/bin/sh # ad hoc debug tool -# $Id: dotest,v 1.1 1993/10/02 21:01:10 pk Exp $ +# $Id: dotest,v 1.1 1993/11/03 00:56:21 paul Exp $ x=$1 y=$2 diff --git a/gnu/usr.bin/as/testscripts/dounsortreloc b/gnu/usr.bin/as/testscripts/dounsortreloc index 0a4771c6425ea..b990553fa6e7c 100755 --- a/gnu/usr.bin/as/testscripts/dounsortreloc +++ b/gnu/usr.bin/as/testscripts/dounsortreloc @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: dounsortreloc,v 1.1 1993/10/02 21:01:11 pk Exp $ +# $Id: dounsortreloc,v 1.1 1993/11/03 00:56:22 paul Exp $ # objdump the reloc table, but strip off the headings and reloc # numbers and sort the result. Intended for use in comparing reloc # tables that may not be in the same order. diff --git a/gnu/usr.bin/as/testscripts/dounsortsymbols b/gnu/usr.bin/as/testscripts/dounsortsymbols index 2dc5acd65e003..480fe555317ef 100755 --- a/gnu/usr.bin/as/testscripts/dounsortsymbols +++ b/gnu/usr.bin/as/testscripts/dounsortsymbols @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: dounsortsymbols,v 1.1 1993/10/02 21:01:12 pk Exp $ +# $Id: dounsortsymbols,v 1.1 1993/11/03 00:56:24 paul Exp $ # objdump the symbol table, but strip off the headings and symbol # numbers and sort the result. Intended for use in comparing symbol # tables that may not be in the same order. diff --git a/gnu/usr.bin/as/version.c b/gnu/usr.bin/as/version.c index c18109a7a414d..64c4caa4b6e19 100644 --- a/gnu/usr.bin/as/version.c +++ b/gnu/usr.bin/as/version.c @@ -16,10 +16,10 @@ const */ #ifndef lint -static char rcsid[] = "$Id: version.c,v 1.3 1994/02/14 21:18:05 nate Exp $"; +static char rcsid[] = "$Id: version.c,v 1.4 1995/05/30 04:46:39 rgrimes Exp $"; #endif -char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.3 $\n"; +char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.4 $\n"; #ifdef HO_VMS dummy3() diff --git a/gnu/usr.bin/as/write.c b/gnu/usr.bin/as/write.c index 66906b0d09d24..42c5c43317c89 100644 --- a/gnu/usr.bin/as/write.c +++ b/gnu/usr.bin/as/write.c @@ -21,7 +21,7 @@ /* This thing should be set up to do byteordering correctly. But... */ #ifndef lint -static char rcsid[] = "$Id: write.c,v 1.6 1994/12/23 22:36:22 nate Exp $"; +static char rcsid[] = "$Id: write.c,v 1.7 1995/05/30 04:46:40 rgrimes Exp $"; #endif #include "as.h" diff --git a/gnu/usr.bin/as/xmalloc.c b/gnu/usr.bin/as/xmalloc.c index 4ecb289237de4..b6a6932c1e536 100644 --- a/gnu/usr.bin/as/xmalloc.c +++ b/gnu/usr.bin/as/xmalloc.c @@ -42,7 +42,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: xmalloc.c,v 1.2 1993/11/03 00:52:32 paul Exp $"; +static char rcsid[] = "$Id: xmalloc.c,v 1.3 1995/05/30 04:46:42 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/as/xrealloc.c b/gnu/usr.bin/as/xrealloc.c index 8b2db1623d57f..057d4a27dac11 100644 --- a/gnu/usr.bin/as/xrealloc.c +++ b/gnu/usr.bin/as/xrealloc.c @@ -43,7 +43,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: xrealloc.c,v 1.2 1993/11/03 00:52:34 paul Exp $"; +static char rcsid[] = "$Id: xrealloc.c,v 1.3 1995/05/30 04:46:42 rgrimes Exp $"; #endif diff --git a/gnu/usr.bin/bc/scan.c b/gnu/usr.bin/bc/scan.c index 94f1aedaa3d12..6c2c13e3d8c6f 100644 --- a/gnu/usr.bin/bc/scan.c +++ b/gnu/usr.bin/bc/scan.c @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* scanner skeleton version: - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/bc/scan.c,v 1.2 1995/05/30 04:49:02 rgrimes Exp $ + * $Header: /home/ncvs/src/gnu/usr.bin/bc/Attic/scan.c,v 1.2.4.1 1996/06/05 02:39:23 jkh Exp $ */ #define FLEX_SCANNER diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index 8be131e8ec3fc..758f9337e9719 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1994/11/15 04:51:20 phk Exp $ +# $Id: Makefile,v 1.5 1995/01/22 21:56:38 ache Exp $ # PGMDIR= cc_int cpp cc1 cc cc1plus c++ f77 libgcc doc diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 16d12bf87b034..8f485ff72e863 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc,v 1.12 1995/03/10 19:39:32 davidg Exp $ +# $Id: Makefile.inc,v 1.13 1995/03/11 03:48:42 nate Exp $ # CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../include diff --git a/gnu/usr.bin/cc/README b/gnu/usr.bin/cc/README index e47729a5d7508..c984169358918 100644 --- a/gnu/usr.bin/cc/README +++ b/gnu/usr.bin/cc/README @@ -1,5 +1,5 @@ -$Id$ +$Id: README,v 1.3 1994/11/15 04:51:22 phk Exp $ This directory contains gcc in a form that uses "bmake" makefiles. This is not the place you want to start, if you want to hack gcc. diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index 5557c627dfdc9..4eb3926dc2536 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.5 1994/11/15 04:51:26 phk Exp $ # PROG = c++ diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile index e796b53533151..c3fc5af6b32a8 100644 --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.8 1994/12/26 19:15:19 ats Exp $ +# $Id: Makefile,v 1.8.4.2 1996/06/05 02:39:25 jkh Exp $ # PROG = cc diff --git a/gnu/usr.bin/cc/cc/cc.1 b/gnu/usr.bin/cc/cc/cc.1 index dc5d5b2bf4322..5c285124cfc40 100644 --- a/gnu/usr.bin/cc/cc/cc.1 +++ b/gnu/usr.bin/cc/cc/cc.1 @@ -20,7 +20,7 @@ .if n .sp .if t .sp 0.4 .. -.Id $Id: cc.1,v 1.2 1994/11/15 04:51:29 phk Exp $ +.Id $Id: cc.1,v 1.2.4.2 1996/06/05 02:39:26 jkh Exp $ .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools" .SH NAME gcc, g++ \- GNU project C and C++ Compiler (v2.6) diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile index 3ef7608333564..17deeb86af0f5 100644 --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.5 1994/11/15 04:51:32 phk Exp $ # PROG = cc1 diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile index 22bdba3606dbc..fc98228337b63 100644 --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.5 1994/11/15 04:51:37 phk Exp $ # PROG = cc1plus diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index a7df2a34147df..7e5fb82e90b98 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.7 1994/11/15 04:51:40 phk Exp $ +# $Id: Makefile,v 1.8 1995/03/13 01:30:02 ache Exp $ # SRCS = aux-output.c bc-emit.c bc-optab.c c-common.c caller-save.c calls.c combine.c convert.c cse.c dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c final.c flow.c fold-const.c function.c getpwd.c global.c insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c insn-output.c insn-peep.c insn-recog.c integrate.c jump.c local-alloc.c loop.c obstack.c optabs.c print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c reload.c reload1.c reorg.c rtl.c rtlanal.c sched.c sdbout.c stmt.c stor-layout.c stupid.c toplev.c tree.c unroll.c varasm.c version.c xcoffout.c diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile index 43ec78c3a49fc..0be24522688ea 100644 --- a/gnu/usr.bin/cc/cpp/Makefile +++ b/gnu/usr.bin/cc/cpp/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.4 1994/11/15 04:52:05 phk Exp $ # PROG = cpp diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile index 04f667bd98bdd..d84cc848761ec 100644 --- a/gnu/usr.bin/cc/f77/Makefile +++ b/gnu/usr.bin/cc/f77/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1994/10/25 14:36:49 ljo Exp $ +# $Id: Makefile,v 1.1.6.2 1996/06/05 02:39:33 jkh Exp $ # PROG = f77 diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile index 45a301df0fef1..090ddcaf21cae 100644 --- a/gnu/usr.bin/cc/libgcc/Makefile +++ b/gnu/usr.bin/cc/libgcc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.8 1995/03/12 20:17:07 phk Exp $ +# $Id: Makefile,v 1.8.4.2 1996/06/05 02:39:36 jkh Exp $ # LIB= gcc diff --git a/gnu/usr.bin/cvs/FAQ b/gnu/usr.bin/cvs/FAQ index b848e468c9340..51d51cffda903 100644 --- a/gnu/usr.bin/cvs/FAQ +++ b/gnu/usr.bin/cvs/FAQ @@ -2,8 +2,8 @@ Archive-name: cvs-faq Hand Revision: 3.5 <<== Include this in your comments Last Updated: 1995/03/09 -$Revision: 1.1.1.2 $ -$Date: 1995/12/10 22:27:35 $ +$Revision: 1.1.1.1.6.1 $ +$Date: 1996/02/23 12:17:15 $ =========================================================================== == Frequently Asked Questions about CVS (The Concurrent Versions System) == diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile index 4a3793b57ce3f..d6979ed7fb01e 100644 --- a/gnu/usr.bin/cvs/Makefile +++ b/gnu/usr.bin/cvs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 1995/12/10 22:58:29 peter Exp $ +# $Id: Makefile,v 1.6.4.1 1996/02/23 12:17:20 peter Exp $ SUBDIR = lib cvs mkmodules contrib cvsbug cvsinit doc examples diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile index 3e21c047ec134..2043a0c9f382f 100644 --- a/gnu/usr.bin/cvs/contrib/Makefile +++ b/gnu/usr.bin/cvs/contrib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/12/11 01:23:42 peter Exp $ +# $Id: Makefile,v 1.4 1995/12/11 01:58:47 peter Exp $ SUBDIR= pcl-cvs diff --git a/gnu/usr.bin/cvs/contrib/cln_hist.pl b/gnu/usr.bin/cvs/contrib/cln_hist.pl index 041eeffeb1ac7..370055882b938 100644 --- a/gnu/usr.bin/cvs/contrib/cln_hist.pl +++ b/gnu/usr.bin/cvs/contrib/cln_hist.pl @@ -1,7 +1,7 @@ #! xPERL_PATHx # -*-Perl-*- # -# $Id: cln_hist.pl,v 1.1.1.2 1995/03/31 07:43:34 nate Exp $ +# $Id: cln_hist.pl,v 1.1.1.2.6.1 1996/02/23 12:17:26 peter Exp $ # Contributed by David G. Grubbs # # Clean up the history file. 10 Record types: MAR OFT WUCG diff --git a/gnu/usr.bin/cvs/contrib/commit_prep.pl b/gnu/usr.bin/cvs/contrib/commit_prep.pl index 5c4442727947c..4266057ced080 100644 --- a/gnu/usr.bin/cvs/contrib/commit_prep.pl +++ b/gnu/usr.bin/cvs/contrib/commit_prep.pl @@ -1,7 +1,7 @@ #! xPERL_PATHx # -*-Perl-*- # -#ident "@(#)cvs/contrib:$Name: $:$Id: commit_prep.pl,v 1.2 1995/12/10 22:59:25 peter Exp $" +#ident "@(#)cvs/contrib:$Name: RELENG_2_1_7_RELEASE $:$Id: commit_prep.pl,v 1.1.1.1.10.1 1996/02/23 12:17:26 peter Exp $" # # Perl filter to handle pre-commit checking of files. This program # records the last directory where commits will be taking place for diff --git a/gnu/usr.bin/cvs/contrib/cvs_acls.pl b/gnu/usr.bin/cvs/contrib/cvs_acls.pl index 41d1677d8a671..1cab53ad43494 100644 --- a/gnu/usr.bin/cvs/contrib/cvs_acls.pl +++ b/gnu/usr.bin/cvs/contrib/cvs_acls.pl @@ -1,7 +1,7 @@ #! xPERL_PATHx # -*-Perl-*- # -# $Id: cvs_acls.pl,v 1.1.1.2 1995/03/31 07:43:36 nate Exp $ +# $Id: cvs_acls.pl,v 1.1.1.2.6.1 1996/02/23 12:17:28 peter Exp $ # # Access control lists for CVS. dgg@ksr.com (David G. Grubbs) # diff --git a/gnu/usr.bin/cvs/contrib/cvscheck.man b/gnu/usr.bin/cvs/contrib/cvscheck.man index 84d7db7de8865..798dc57988da4 100644 --- a/gnu/usr.bin/cvs/contrib/cvscheck.man +++ b/gnu/usr.bin/cvs/contrib/cvscheck.man @@ -1,4 +1,4 @@ -.\" $Id: cvscheck.man,v 1.1 1992/04/10 03:04:20 berliner Exp $ +.\" $Id: cvscheck.man,v 1.1.1.2 1995/03/31 07:43:40 nate Exp $ .\" Contributed by Lowell Skoog .TH CVSCHECK LOCAL "4 March 1991" FLUKE .SH NAME diff --git a/gnu/usr.bin/cvs/contrib/cvscheck.sh b/gnu/usr.bin/cvs/contrib/cvscheck.sh index 96dba6e1f87e4..3911296a99696 100644 --- a/gnu/usr.bin/cvs/contrib/cvscheck.sh +++ b/gnu/usr.bin/cvs/contrib/cvscheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: cvscheck.sh,v 1.1 1995/07/10 02:26:29 kfogel Exp $ +# $Id: cvscheck.sh,v 1.2 1995/12/10 22:59:36 peter Exp $ # # cvscheck - identify files added, changed, or removed # in CVS working directory diff --git a/gnu/usr.bin/cvs/contrib/cvshelp.man b/gnu/usr.bin/cvs/contrib/cvshelp.man index ba6590a63e431..11a8605f68bd2 100644 --- a/gnu/usr.bin/cvs/contrib/cvshelp.man +++ b/gnu/usr.bin/cvs/contrib/cvshelp.man @@ -1,4 +1,4 @@ -.\" $Id: cvshelp.man,v 1.1 1992/04/10 03:04:21 berliner Exp $ +.\" $Id: cvshelp.man,v 1.1.1.2 1995/03/31 07:43:42 nate Exp $ .\" Contributed by Lowell Skoog .\" Full space in nroff; half space in troff .de SP diff --git a/gnu/usr.bin/cvs/contrib/descend.man b/gnu/usr.bin/cvs/contrib/descend.man index a38d4caa7f651..576dcbce0541b 100644 --- a/gnu/usr.bin/cvs/contrib/descend.man +++ b/gnu/usr.bin/cvs/contrib/descend.man @@ -1,4 +1,4 @@ -.\" $Id: descend.man,v 1.1 1992/04/03 05:22:53 berliner Exp $ +.\" $Id: descend.man,v 1.1.1.2 1995/03/31 07:43:44 nate Exp $ .TH DESCEND 1 "31 March 1992" .SH NAME descend \- walk directory tree and execute a command at each node diff --git a/gnu/usr.bin/cvs/contrib/descend.sh b/gnu/usr.bin/cvs/contrib/descend.sh index e6a788079416b..d1de3a3dda604 100644 --- a/gnu/usr.bin/cvs/contrib/descend.sh +++ b/gnu/usr.bin/cvs/contrib/descend.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: descend.sh,v 1.1 1995/07/10 02:26:32 kfogel Exp $ +# $Id: descend.sh,v 1.2 1995/12/10 22:59:46 peter Exp $ # # descend - walk down a directory tree and execute a command at each node diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl index 8047c424ec8f3..e39d60b9db3ea 100644 --- a/gnu/usr.bin/cvs/contrib/easy-import.pl +++ b/gnu/usr.bin/cvs/contrib/easy-import.pl @@ -8,7 +8,7 @@ # # Written by Jörg Wunsch, 95/03/07, and placed in the public domain. # -# $Id: easy-import.pl,v 1.5.2.2 1996/06/05 02:39:41 jkh Exp $ +# $Id: easy-import.pl,v 1.5.2.3 1996/06/25 14:45:10 joerg Exp $ require "complete.pl"; require "getopts.pl"; @@ -22,7 +22,7 @@ sub scan_opts $dont_do_it = "-n" if $opt_n; if($opt_v) { - print STDERR '$Source: /home/ncvs/src/gnu/usr.bin/cvs/contrib/easy-import.pl,v $ $Revision: 1.5.2.2 $' . "\n"; # 'emacs kludge + print STDERR '$Source: /home/ncvs/src/gnu/usr.bin/cvs/contrib/easy-import.pl,v $ $Revision: 1.5.2.3 $' . "\n"; # 'emacs kludge exit 0; } die "usage: $0 [-v] [-n] [moduledir]\n" . diff --git a/gnu/usr.bin/cvs/contrib/mfpipe.pl b/gnu/usr.bin/cvs/contrib/mfpipe.pl index cfb2f8573bd33..25bc693ba8ae3 100644 --- a/gnu/usr.bin/cvs/contrib/mfpipe.pl +++ b/gnu/usr.bin/cvs/contrib/mfpipe.pl @@ -12,7 +12,7 @@ # Especially if they regularly beat on the same directory. Anyway if you # think anyone would be interested here it is. # -# $Id: mfpipe.pl,v 1.1.1.2 1995/03/31 07:43:50 nate Exp $ +# $Id: mfpipe.pl,v 1.1.1.2.6.1 1996/02/23 12:17:31 peter Exp $ # # # File: mfpipe diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile index 0d644623e4c10..36fa5c787054d 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 1995/12/11 01:58:50 peter Exp $ +# $Id: Makefile,v 1.2.4.1 1996/02/23 12:17:36 peter Exp $ FILES= ChangeLog INSTALL NEWS README \ compile-all.el pcl-cvs-lucid.el pcl-cvs-startup.el \ diff --git a/gnu/usr.bin/cvs/contrib/rcs-to-cvs.sh b/gnu/usr.bin/cvs/contrib/rcs-to-cvs.sh index 3af83d708ca4a..6f4e249a2c2e9 100644 --- a/gnu/usr.bin/cvs/contrib/rcs-to-cvs.sh +++ b/gnu/usr.bin/cvs/contrib/rcs-to-cvs.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: rcs-to-cvs.sh,v 1.2 1995/07/15 03:40:34 jimb Exp $ +# $Id: rcs-to-cvs.sh,v 1.2 1995/12/10 22:59:51 peter Exp $ # Based on the CVS 1.0 checkin csh script. # Contributed by Per Cederqvist . # Rewritten in sh by David MacKenzie . diff --git a/gnu/usr.bin/cvs/contrib/rcs2log.sh b/gnu/usr.bin/cvs/contrib/rcs2log.sh index ccea907ea37b6..b5c8b24a47991 100644 --- a/gnu/usr.bin/cvs/contrib/rcs2log.sh +++ b/gnu/usr.bin/cvs/contrib/rcs2log.sh @@ -12,7 +12,7 @@ # Author: Paul Eggert -# $Id: rcs2log.sh,v 1.2 1995/07/28 19:48:45 eggert Exp $ +# $Id: rcs2log.sh,v 1.2 1995/12/10 22:59:54 peter Exp $ # Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc. diff --git a/gnu/usr.bin/cvs/contrib/rcs2sccs.sh b/gnu/usr.bin/cvs/contrib/rcs2sccs.sh index af701384e4b61..78a830c67182f 100644 --- a/gnu/usr.bin/cvs/contrib/rcs2sccs.sh +++ b/gnu/usr.bin/cvs/contrib/rcs2sccs.sh @@ -2,7 +2,7 @@ # # # OrigId: rcs2sccs,v 1.12 90/10/04 20:52:23 kenc Exp Locker: kenc -# $Id: rcs2sccs.sh,v 1.1 1995/07/10 02:26:45 kfogel Exp $ +# $Id: rcs2sccs.sh,v 1.2 1995/12/10 22:59:58 peter Exp $ ############################################################ # Error checking diff --git a/gnu/usr.bin/cvs/contrib/sccs2rcs.csh b/gnu/usr.bin/cvs/contrib/sccs2rcs.csh index 0f31893d3b245..f5b00c1534c50 100644 --- a/gnu/usr.bin/cvs/contrib/sccs2rcs.csh +++ b/gnu/usr.bin/cvs/contrib/sccs2rcs.csh @@ -43,7 +43,7 @@ # # Various hacks made by Brian Berliner before inclusion in CVS contrib area. # -# $Id: sccs2rcs.csh,v 1.1 1995/07/10 02:26:48 kfogel Exp $ +# $Id: sccs2rcs.csh,v 1.2 1995/12/10 23:00:01 peter Exp $ #we'll assume the user set up the path correctly diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 626cd420232d5..f705014ae24e8 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 1995/12/11 04:24:02 peter Exp $ +# $Id: Makefile,v 1.10.6.1 1996/02/23 12:17:40 peter Exp $ PROG= cvs MAN1= cvs.1 diff --git a/gnu/usr.bin/cvs/cvs/cvs.1 b/gnu/usr.bin/cvs/cvs/cvs.1 index 8934272aa3c20..21f79d22ab6c8 100644 --- a/gnu/usr.bin/cvs/cvs/cvs.1 +++ b/gnu/usr.bin/cvs/cvs/cvs.1 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: cvs.1,v 1.1.1.2.6.1 1995/08/29 11:46:09 davidg Exp $ +.Id $Id: cvs.1,v 1.1.1.2.6.2 1996/02/23 12:17:47 peter Exp $ .TH CVS 1 "\*(Dt" .\" Full space in nroff; half space in troff .de SP diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile index 336fd135ef7f2..ebaa4776b39df 100644 --- a/gnu/usr.bin/cvs/cvsbug/Makefile +++ b/gnu/usr.bin/cvs/cvsbug/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/11 01:58:51 peter Exp $ +# $Id: Makefile,v 1.3 1995/12/11 04:24:06 peter Exp $ MAN8= cvsbug.8 diff --git a/gnu/usr.bin/cvs/cvsbug/cvsbug.sh b/gnu/usr.bin/cvs/cvsbug/cvsbug.sh index ab26cfce570a8..de9bbb935e263 100644 --- a/gnu/usr.bin/cvs/cvsbug/cvsbug.sh +++ b/gnu/usr.bin/cvs/cvsbug/cvsbug.sh @@ -7,7 +7,7 @@ # This file is part of GNU GNATS. # Modified by Berliner for CVS. # -#ident "@(#)cvs/src:$Name: $:$Id: cvsbug.sh,v 1.10 1995/11/15 00:18:00 woods Exp $" +#ident "@(#)cvs/src:$Name: RELENG_2_1_7_RELEASE $:$Id: cvsbug.sh,v 1.2 1995/12/10 23:05:59 peter Exp $" # # GNU GNATS is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gnu/usr.bin/cvs/cvsinit/Makefile b/gnu/usr.bin/cvs/cvsinit/Makefile index 601d4eac576cd..dd2afc266d991 100644 --- a/gnu/usr.bin/cvs/cvsinit/Makefile +++ b/gnu/usr.bin/cvs/cvsinit/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/12/11 04:24:11 peter Exp $ +# $Id: Makefile,v 1.1.8.1 1996/02/23 12:18:27 peter Exp $ MAN8= cvsinit.8 diff --git a/gnu/usr.bin/cvs/cvsinit/cvsinit.8 b/gnu/usr.bin/cvs/cvsinit/cvsinit.8 index 1012d62b687eb..e41b6138b70e8 100644 --- a/gnu/usr.bin/cvs/cvsinit/cvsinit.8 +++ b/gnu/usr.bin/cvs/cvsinit/cvsinit.8 @@ -2,7 +2,7 @@ .ds Rv \\$4 .ds Dt \\$5 .. -.Id @(#)ccvs/man:$Name: $:$Id: cvsinit.8,v 1.2 1995/11/14 20:48:54 woods Exp $ +.Id @(#)ccvs/man:$Name: RELENG_2_1_7_RELEASE $:$Id: cvsinit.8,v 1.2 1995/12/10 23:06:49 peter Exp $ .TH CVSINIT 8 "\*(Dt" .\" Full space in nroff; half space in troff .de SP diff --git a/gnu/usr.bin/cvs/cvsinit/cvsinit.sh b/gnu/usr.bin/cvs/cvsinit/cvsinit.sh index 020e0548999f5..dac53d1014e15 100644 --- a/gnu/usr.bin/cvs/cvsinit/cvsinit.sh +++ b/gnu/usr.bin/cvs/cvsinit/cvsinit.sh @@ -1,7 +1,7 @@ #! /bin/sh : # -#ident "@(#)cvs:$Name: $:$Id: cvsinit.sh,v 1.5 1996/01/11 05:56:35 peter Exp $" +#ident "@(#)cvs:$Name: RELENG_2_1_7_RELEASE $:$Id: cvsinit.sh,v 1.2.6.1 1996/02/23 12:18:28 peter Exp $" # Copyright (c) 1992, Brian Berliner # # You may distribute under the terms of the GNU General Public License as diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile index e254647639091..e0c85821e9f7d 100644 --- a/gnu/usr.bin/cvs/doc/Makefile +++ b/gnu/usr.bin/cvs/doc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/10 23:07:16 peter Exp $ +# $Id: Makefile,v 1.1.6.1 1996/02/23 12:18:29 peter Exp $ INFO = cvs cvsclient diff --git a/gnu/usr.bin/cvs/examples/Makefile b/gnu/usr.bin/cvs/examples/Makefile index e35847d161899..3671f9f5c5bc9 100644 --- a/gnu/usr.bin/cvs/examples/Makefile +++ b/gnu/usr.bin/cvs/examples/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/12/10 23:07:36 peter Exp $ +# $Id: Makefile,v 1.1.4.1 1996/02/23 12:18:32 peter Exp $ CVSFILES= checkoutlist commitinfo cvswrappers editinfo loginfo modules \ rcsinfo rcstemplate taginfo unwrap wrap diff --git a/gnu/usr.bin/cvs/examples/checkoutlist b/gnu/usr.bin/cvs/examples/checkoutlist index 45ee6dc44f15a..496a3b31e4195 100644 --- a/gnu/usr.bin/cvs/examples/checkoutlist +++ b/gnu/usr.bin/cvs/examples/checkoutlist @@ -1,5 +1,5 @@ # -#ident "@(#)cvs/examples:$Name: $:$Id: checkoutlist,v 1.2 1995/11/14 23:24:49 woods Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: checkoutlist,v 1.2 1995/12/10 23:07:45 peter Exp $" # # The "checkoutlist" file is used to support additional version controlled # administrative files in $CVSROOT/CVSROOT, such as template files. diff --git a/gnu/usr.bin/cvs/examples/commitinfo b/gnu/usr.bin/cvs/examples/commitinfo index 2846c713b024b..5efadd492dbb2 100644 --- a/gnu/usr.bin/cvs/examples/commitinfo +++ b/gnu/usr.bin/cvs/examples/commitinfo @@ -1,5 +1,5 @@ # -# $Id: commitinfo,v 1.1.1.2 1995/03/31 07:44:32 nate Exp $ +# $Id: commitinfo,v 1.1.1.2.6.1 1996/02/23 12:18:33 peter Exp $ # # The "commitinfo" file is used to control pre-commit checks. # The filter on the right is invoked with the repository and a list diff --git a/gnu/usr.bin/cvs/examples/cvswrappers b/gnu/usr.bin/cvs/examples/cvswrappers index c666292e6460b..9c0001e077e89 100644 --- a/gnu/usr.bin/cvs/examples/cvswrappers +++ b/gnu/usr.bin/cvs/examples/cvswrappers @@ -1,5 +1,5 @@ # -#ident "@(#)cvs/examples:$Name: $:$Id: cvswrappers,v 1.3 1995/11/14 23:23:11 woods Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: cvswrappers,v 1.2 1995/12/10 23:07:52 peter Exp $" # # This file describes wrappers and other binary files to CVS. # diff --git a/gnu/usr.bin/cvs/examples/editinfo b/gnu/usr.bin/cvs/examples/editinfo index 09b9f160a8210..9702ea0d64182 100644 --- a/gnu/usr.bin/cvs/examples/editinfo +++ b/gnu/usr.bin/cvs/examples/editinfo @@ -1,5 +1,5 @@ # -# $Id: editinfo,v 1.1.1.2 1995/03/31 07:44:37 nate Exp $ +# $Id: editinfo,v 1.1.1.2.6.1 1996/02/23 12:18:33 peter Exp $ # # The "editinfo" file is used to allow verification of logging # information. It works best when a template (as specified in the diff --git a/gnu/usr.bin/cvs/examples/modules b/gnu/usr.bin/cvs/examples/modules index 254add1e3674e..2e5b1e3edb41a 100644 --- a/gnu/usr.bin/cvs/examples/modules +++ b/gnu/usr.bin/cvs/examples/modules @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.2 1995/12/10 23:08:01 peter Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: modules,v 1.1.1.2.6.1 1996/02/23 12:18:34 peter Exp $" # # Three different line formats are valid: # key -a aliases... diff --git a/gnu/usr.bin/cvs/examples/rcsinfo b/gnu/usr.bin/cvs/examples/rcsinfo index b7e9cc09298d5..21e21c229f7b7 100644 --- a/gnu/usr.bin/cvs/examples/rcsinfo +++ b/gnu/usr.bin/cvs/examples/rcsinfo @@ -1,5 +1,5 @@ # -#ident "@(#)cvs/examples:$Name: $:$Id: rcsinfo,v 1.2 1995/12/10 23:08:06 peter Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: rcsinfo,v 1.1.1.2.6.1 1996/02/23 12:18:35 peter Exp $" # # The "rcsinfo" file is used to control templates with which the editor # is invoked on commit and import. diff --git a/gnu/usr.bin/cvs/examples/taginfo b/gnu/usr.bin/cvs/examples/taginfo index 02de62b2808e4..7ff17259707c1 100644 --- a/gnu/usr.bin/cvs/examples/taginfo +++ b/gnu/usr.bin/cvs/examples/taginfo @@ -1,5 +1,5 @@ # -#ident "@(#)cvs/examples:$Name: $:$Id: taginfo,v 1.3 1995/11/14 23:27:52 woods Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: taginfo,v 1.2 1995/12/10 23:08:17 peter Exp $" # # The "taginfo" file is used to control pre-tag checks. # The filter on the right is invoked with the following arguments: diff --git a/gnu/usr.bin/cvs/examples/unwrap b/gnu/usr.bin/cvs/examples/unwrap index def05610f5513..8b33ac139ce4b 100644 --- a/gnu/usr.bin/cvs/examples/unwrap +++ b/gnu/usr.bin/cvs/examples/unwrap @@ -2,7 +2,7 @@ # # unwrap - extract the combined package (created with wrap) # -#ident "@(#)cvs/examples:$Name: $:$Id: unwrap,v 1.1 1995/11/14 23:20:30 woods Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: unwrap,v 1.2 1995/12/10 23:08:21 peter Exp $" # move the file to a new name with an extension rm -rf $1.cvswrap diff --git a/gnu/usr.bin/cvs/examples/wrap b/gnu/usr.bin/cvs/examples/wrap index b6a6a772c2400..023313a346dc2 100644 --- a/gnu/usr.bin/cvs/examples/wrap +++ b/gnu/usr.bin/cvs/examples/wrap @@ -2,7 +2,7 @@ # # wrap - Combine a directory into a single tar package. # -#ident "@(#)cvs/examples:$Name: $:$Id: wrap,v 1.1 1995/11/14 23:20:32 woods Exp $" +#ident "@(#)cvs/examples:$Name: RELENG_2_1_7_RELEASE $:$Id: wrap,v 1.2 1995/12/10 23:08:25 peter Exp $" # This script is always called with the current directory set to # where the file to be combined exists. but i may get called with a diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index 59a70786e8cbf..7331d0435670d 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 1995/12/11 02:22:30 peter Exp $ +# $Id: Makefile,v 1.8.6.1 1996/02/23 12:18:37 peter Exp $ LIB = cvs NOPROFILE= yes diff --git a/gnu/usr.bin/cvs/mkmodules/Makefile b/gnu/usr.bin/cvs/mkmodules/Makefile index 67a2e4e1cb237..747e807739ed0 100644 --- a/gnu/usr.bin/cvs/mkmodules/Makefile +++ b/gnu/usr.bin/cvs/mkmodules/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1995/12/10 23:10:38 peter Exp $ +# $Id: Makefile,v 1.5.6.1 1996/02/23 12:18:51 peter Exp $ PROG = mkmodules SRCS = mkmodules.c diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 436519a7e32a9..f6ae2938cedc5 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -1,5 +1,5 @@ # Makefile for dialog -# $Id: Makefile,v 1.3 1994/10/11 23:51:06 ache Exp $ +# $Id: Makefile,v 1.4 1994/10/28 03:12:45 ache Exp $ PROG= dialog MAN1= dialog.1 diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile index b4b1378b100b4..d461c484d857e 100644 --- a/gnu/usr.bin/diff/Makefile +++ b/gnu/usr.bin/diff/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/10/29 09:08:32 peter Exp $ +# $Id: Makefile,v 1.4.4.1 1996/02/22 21:52:24 peter Exp $ PROG= diff SRCS= diff.c analyze.c io.c context.c ed.c normal.c ifdef.c util.c dir.c \ version.c getopt.c getopt1.c side.c cmpbuf.c diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile index 033d464aa0cdb..6a0104e4fde2a 100644 --- a/gnu/usr.bin/diff/doc/Makefile +++ b/gnu/usr.bin/diff/doc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/10/29 09:08:35 peter Exp $ INFO = diff diff --git a/gnu/usr.bin/gdb/doc/gdbint.texinfo b/gnu/usr.bin/gdb/doc/gdbint.texinfo index 59e5a7f548e16..6ce27717028a3 100644 --- a/gnu/usr.bin/gdb/doc/gdbint.texinfo +++ b/gnu/usr.bin/gdb/doc/gdbint.texinfo @@ -1,6 +1,6 @@ \input texinfo @setfilename gdbint.info -@c $Id: gdbint.texinfo,v 1.76 1994/07/17 21:17:18 shebs Exp $ +@c $Id: gdbint.texinfo,v 1.2 1995/01/11 16:29:41 ache Exp $ @ifinfo @format @@ -42,7 +42,7 @@ regarded as a program in the language TeX). @page @tex \def\$#1${{#1}} % Kluge: collect RCS revision info without $...$ -\xdef\manvers{\$Revision: 1.76 $} % For use in headers, footers too +\xdef\manvers{\$Revision: 1.2 $} % For use in headers, footers too {\parskip=0pt \hfill Cygnus Support\par \hfill \manvers\par diff --git a/gnu/usr.bin/gdb/doc/stabs.texinfo b/gnu/usr.bin/gdb/doc/stabs.texinfo index 1c8d4071a4122..9d4f794ca8632 100644 --- a/gnu/usr.bin/gdb/doc/stabs.texinfo +++ b/gnu/usr.bin/gdb/doc/stabs.texinfo @@ -43,7 +43,7 @@ regarded as a program in the language TeX). @page @tex \def\$#1${{#1}} % Kluge: collect RCS revision info without $...$ -\xdef\manvers{\$Revision: 2.120 $} % For use in headers, footers too +\xdef\manvers{\$Revision: 1.2 $} % For use in headers, footers too {\parskip=0pt \hfill Cygnus Support\par \hfill \manvers\par diff --git a/gnu/usr.bin/gdb/gdb/freebsd-nat.c b/gnu/usr.bin/gdb/gdb/freebsd-nat.c index 5a3935474ef29..791a361b18e8e 100644 --- a/gnu/usr.bin/gdb/gdb/freebsd-nat.c +++ b/gnu/usr.bin/gdb/gdb/freebsd-nat.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: freebsd-nat.c,v 1.7 1995/05/30 04:57:05 rgrimes Exp $ + $Id: freebsd-nat.c,v 1.7.4.2 1996/06/05 02:39:56 jkh Exp $ */ #include diff --git a/gnu/usr.bin/gdb/gdb/gdb.1 b/gnu/usr.bin/gdb/gdb/gdb.1 index 2a2af1f9a0e66..61b8d209c16fc 100644 --- a/gnu/usr.bin/gdb/gdb/gdb.1 +++ b/gnu/usr.bin/gdb/gdb/gdb.1 @@ -1,6 +1,6 @@ .\" Copyright (c) 1991 Free Software Foundation .\" See section COPYING for conditions for redistribution -.\" $Id: gdb.1,v 1.2 1994/12/30 23:25:45 jkh Exp $ +.\" $Id: gdb.1,v 1.2.4.2 1996/06/05 02:39:56 jkh Exp $ .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools" .SH NAME gdb \- The GNU Debugger diff --git a/gnu/usr.bin/gdb/gdb/kcorelow.c b/gnu/usr.bin/gdb/gdb/kcorelow.c index e08c486b3fef4..c28f5dc389a22 100644 --- a/gnu/usr.bin/gdb/gdb/kcorelow.c +++ b/gnu/usr.bin/gdb/gdb/kcorelow.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: kcorelow.c,v 1.3 1995/04/26 01:01:09 jkh Exp $ + $Id: kcorelow.c,v 1.4 1995/05/30 04:57:22 rgrimes Exp $ */ #include "defs.h" diff --git a/gnu/usr.bin/gdb/mmalloc/mmalloc.texi b/gnu/usr.bin/gdb/mmalloc/mmalloc.texi index 5e28398c334ce..f70ae68621ee7 100644 --- a/gnu/usr.bin/gdb/mmalloc/mmalloc.texi +++ b/gnu/usr.bin/gdb/mmalloc/mmalloc.texi @@ -47,7 +47,7 @@ into another language, under the above conditions for modified versions. @tex \def\$#1${{#1}} % Kluge: collect RCS revision info without $...$ -\xdef\manvers{\$Revision: 1.1.1.1 $} % For use in headers, footers too +\xdef\manvers{\$Revision: 1.1 $} % For use in headers, footers too {\parskip=0pt \hfill Cygnus Support\par \hfill fnf\@cygnus.com\par diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c index fae17801fa649..27bff48f71c1d 100644 --- a/gnu/usr.bin/gzip/bits.c +++ b/gnu/usr.bin/gzip/bits.c @@ -60,7 +60,7 @@ #endif #ifdef RCSID -static char rcsid[] = "$Id: bits.c,v 1.3 1993/10/14 00:32:24 nate Exp $"; +static char rcsid[] = "$Id: bits.c,v 1.4 1995/05/30 05:00:30 rgrimes Exp $"; #endif /* =========================================================================== diff --git a/gnu/usr.bin/gzip/crypt.c b/gnu/usr.bin/gzip/crypt.c index cbce024a01aac..57f62340ecda6 100644 --- a/gnu/usr.bin/gzip/crypt.c +++ b/gnu/usr.bin/gzip/crypt.c @@ -2,5 +2,5 @@ * Hardly worth copyrighting :-) */ #ifdef RCSID -static char rcsid[] = "$Id: crypt.c,v 0.6 1993/03/22 09:48:47 jloup Exp $"; +static char rcsid[] = "$Id: crypt.c,v 1.3 1993/10/14 00:32:26 nate Exp $"; #endif diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c index 0bc0ed4108153..5ed86205973bc 100644 --- a/gnu/usr.bin/gzip/deflate.c +++ b/gnu/usr.bin/gzip/deflate.c @@ -68,7 +68,7 @@ #include "lzw.h" /* just for consistency checking */ #ifdef RCSID -static char rcsid[] = "$Id: deflate.c,v 1.3 1993/10/14 00:32:29 nate Exp $"; +static char rcsid[] = "$Id: deflate.c,v 1.4 1995/05/30 05:00:31 rgrimes Exp $"; #endif /* =========================================================================== diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c index 846b69e6b37a1..c10b4a095b828 100644 --- a/gnu/usr.bin/gzip/gzip.c +++ b/gnu/usr.bin/gzip/gzip.c @@ -45,7 +45,7 @@ static char *license_msg[] = { */ #ifdef RCSID -static char rcsid[] = "$Id: gzip.c,v 1.3 1993/10/14 00:32:48 nate Exp $"; +static char rcsid[] = "$Id: gzip.c,v 1.4 1995/05/30 05:00:33 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c index a53d013dbcbba..a59d0ae5e1326 100644 --- a/gnu/usr.bin/gzip/inflate.c +++ b/gnu/usr.bin/gzip/inflate.c @@ -97,7 +97,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: inflate.c,v 1.3 1993/10/14 00:32:55 nate Exp $"; +static char rcsid[] = "$Id: inflate.c,v 1.4 1995/05/30 05:00:37 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/gzip/lzw.c b/gnu/usr.bin/gzip/lzw.c index 12bf5c611d0cc..92b3ce4c5515e 100644 --- a/gnu/usr.bin/gzip/lzw.c +++ b/gnu/usr.bin/gzip/lzw.c @@ -3,7 +3,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: lzw.c,v 0.9 1993/06/10 13:27:31 jloup Exp $"; +static char rcsid[] = "$Id: lzw.c,v 1.3 1993/10/14 00:32:59 nate Exp $"; #endif #include "tailor.h" diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S index 4a3d681c3d2bc..6ff3623082037 100644 --- a/gnu/usr.bin/gzip/match.S +++ b/gnu/usr.bin/gzip/match.S @@ -9,7 +9,7 @@ * Kristoffer Eriksson */ -/* $Id: match.S,v 0.14 1993/06/11 18:33:24 jloup Exp $ */ +/* $Id: match.S,v 1.3 1993/10/14 00:33:02 nate Exp $ */ /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix * external symbols with an underline character '_'. diff --git a/gnu/usr.bin/gzip/revision.h b/gnu/usr.bin/gzip/revision.h index f99b65f9bbd25..4e5362fb2c6f3 100644 --- a/gnu/usr.bin/gzip/revision.h +++ b/gnu/usr.bin/gzip/revision.h @@ -13,4 +13,4 @@ # undef LZW #endif -/* $Id: revision.h,v 0.25 1993/06/24 08:29:52 jloup Exp $ */ +/* $Id: revision.h,v 1.3 1993/10/14 00:33:05 nate Exp $ */ diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h index 840733ab50e26..a3e6321680357 100644 --- a/gnu/usr.bin/gzip/tailor.h +++ b/gnu/usr.bin/gzip/tailor.h @@ -8,7 +8,7 @@ * The target dependent functions should be defined in tailor.c. */ -/* $Id: tailor.h,v 1.3 1993/10/14 00:33:08 nate Exp $ */ +/* $Id: tailor.h,v 1.4 1995/05/30 05:00:38 rgrimes Exp $ */ #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c index d5b41c8ab7d17..b3f452f4cb90d 100644 --- a/gnu/usr.bin/gzip/trees.c +++ b/gnu/usr.bin/gzip/trees.c @@ -59,7 +59,7 @@ #include "gzip.h" #ifdef RCSID -static char rcsid[] = "$Id: trees.c,v 1.3 1993/10/14 00:33:11 nate Exp $"; +static char rcsid[] = "$Id: trees.c,v 1.4 1995/05/30 05:00:40 rgrimes Exp $"; #endif /* =========================================================================== diff --git a/gnu/usr.bin/gzip/unlzh.c b/gnu/usr.bin/gzip/unlzh.c index e318e5ed94187..f8d7989588d65 100644 --- a/gnu/usr.bin/gzip/unlzh.c +++ b/gnu/usr.bin/gzip/unlzh.c @@ -4,7 +4,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzh.c,v 1.2 1993/06/24 10:59:01 jloup Exp $"; +static char rcsid[] = "$Id: unlzh.c,v 1.2 1993/10/14 00:33:14 nate Exp $"; #endif #include diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c index fe2110fc347ac..d873fb0323cc6 100644 --- a/gnu/usr.bin/gzip/unlzw.c +++ b/gnu/usr.bin/gzip/unlzw.c @@ -8,7 +8,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzw.c,v 1.3 1993/10/14 00:33:17 nate Exp $"; +static char rcsid[] = "$Id: unlzw.c,v 1.4 1995/05/30 05:00:41 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/gzip/unpack.c b/gnu/usr.bin/gzip/unpack.c index a00fdaefc6b26..447052de75dce 100644 --- a/gnu/usr.bin/gzip/unpack.c +++ b/gnu/usr.bin/gzip/unpack.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unpack.c,v 1.4 1993/06/11 19:25:36 jloup Exp $"; +static char rcsid[] = "$Id: unpack.c,v 1.3 1993/10/14 00:33:20 nate Exp $"; #endif #include "tailor.h" diff --git a/gnu/usr.bin/gzip/unzip.c b/gnu/usr.bin/gzip/unzip.c index 7e287a157ad38..eda8046986c37 100644 --- a/gnu/usr.bin/gzip/unzip.c +++ b/gnu/usr.bin/gzip/unzip.c @@ -14,7 +14,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $"; +static char rcsid[] = "$Id: unzip.c,v 1.3 1993/10/14 00:33:24 nate Exp $"; #endif #include "tailor.h" diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c index 2cddf92f8e072..e4eb06c7fa339 100644 --- a/gnu/usr.bin/gzip/util.c +++ b/gnu/usr.bin/gzip/util.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: util.c,v 1.3 1993/10/14 00:33:26 nate Exp $"; +static char rcsid[] = "$Id: util.c,v 1.4 1995/05/30 05:00:43 rgrimes Exp $"; #endif #include diff --git a/gnu/usr.bin/gzip/zgrep.getopt b/gnu/usr.bin/gzip/zgrep.getopt index 54d56d0de4927..bcf453f88ead8 100644 --- a/gnu/usr.bin/gzip/zgrep.getopt +++ b/gnu/usr.bin/gzip/zgrep.getopt @@ -3,7 +3,7 @@ # # zgrep - search possibly compressed files for a regular expression # -# $Id: zgrep,v 1.4 1996/04/28 18:43:47 wosch Exp $ +# $Id: zgrep.getopt,v 1.1 1996/05/12 16:20:26 wosch Exp $ PATH=/bin:/usr/bin:$PATH; export PATH diff --git a/gnu/usr.bin/gzip/zip.c b/gnu/usr.bin/gzip/zip.c index 507d1616efdde..67de7c97c5f15 100644 --- a/gnu/usr.bin/gzip/zip.c +++ b/gnu/usr.bin/gzip/zip.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: zip.c,v 0.17 1993/06/10 13:29:25 jloup Exp $"; +static char rcsid[] = "$Id: zip.c,v 1.3 1993/10/14 00:33:32 nate Exp $"; #endif #include diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile index 218164eee68eb..91d4acdbc4bb9 100644 --- a/gnu/usr.bin/ld/Makefile +++ b/gnu/usr.bin/ld/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.15 1994/08/19 12:24:45 davidg Exp $ +# $Id: Makefile,v 1.16 1994/12/23 22:30:29 nate Exp $ # PROG= ld diff --git a/gnu/usr.bin/ld/PORTING b/gnu/usr.bin/ld/PORTING index fc6f918a91469..cc6f0ab8b2b0e 100644 --- a/gnu/usr.bin/ld/PORTING +++ b/gnu/usr.bin/ld/PORTING @@ -1,4 +1,4 @@ -$Id$ +$Id: PORTING,v 1.1 1994/12/23 22:56:08 nate Exp $ This document describes some of the machine dependent parts in ld(1) and rtld(?) Most of the machine dependencies are a result of different ways in which diff --git a/gnu/usr.bin/ld/cplus-dem.c b/gnu/usr.bin/ld/cplus-dem.c index 27f56ef6d392a..30333965c8896 100644 --- a/gnu/usr.bin/ld/cplus-dem.c +++ b/gnu/usr.bin/ld/cplus-dem.c @@ -5,7 +5,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)cplus-dem.c 5.4 (Berkeley) 4/30/91";*/ -static char rcsid[] = "$Id: cplus-dem.c,v 1.3 1993/11/09 04:18:51 paul Exp $"; +static char rcsid[] = "$Id: cplus-dem.c,v 1.4 1995/05/30 05:01:42 rgrimes Exp $"; #endif /* not lint */ /* Demangler for GNU C++ diff --git a/gnu/usr.bin/ld/etc.c b/gnu/usr.bin/ld/etc.c index 59e0a18c6de45..b33db7618edad 100644 --- a/gnu/usr.bin/ld/etc.c +++ b/gnu/usr.bin/ld/etc.c @@ -1,5 +1,5 @@ /* - * $Id: etc.c,v 1.7 1994/02/13 20:41:05 jkh Exp $ + * $Id: etc.c,v 1.8 1994/06/15 22:39:32 rich Exp $ */ #include diff --git a/gnu/usr.bin/ld/i386/md-static-funcs.c b/gnu/usr.bin/ld/i386/md-static-funcs.c index ff06e66b03011..6b7983e8e21ed 100644 --- a/gnu/usr.bin/ld/i386/md-static-funcs.c +++ b/gnu/usr.bin/ld/i386/md-static-funcs.c @@ -1,5 +1,5 @@ /* - * $Id: md-static-funcs.c,v 1.3 1995/11/02 18:47:55 nate Exp $ + * $Id: md-static-funcs.c,v 1.2.8.1 1996/05/02 16:08:53 jdp Exp $ * * Called by ld.so when onanating. * This *must* be a static function, so it is not called through a jmpslot. diff --git a/gnu/usr.bin/ld/i386/md.c b/gnu/usr.bin/ld/i386/md.c index 07271fc344ad1..e00404b48397c 100644 --- a/gnu/usr.bin/ld/i386/md.c +++ b/gnu/usr.bin/ld/i386/md.c @@ -27,7 +27,7 @@ * (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: md.c,v 1.11 1994/12/23 22:31:12 nate Exp $ + * $Id: md.c,v 1.12 1995/03/04 17:46:20 nate Exp $ */ #include diff --git a/gnu/usr.bin/ld/i386/md.h b/gnu/usr.bin/ld/i386/md.h index da5283de46458..b5d6bc85107f0 100644 --- a/gnu/usr.bin/ld/i386/md.h +++ b/gnu/usr.bin/ld/i386/md.h @@ -27,7 +27,7 @@ * (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: md.h,v 1.11 1994/12/23 22:31:14 nate Exp $ + * $Id: md.h,v 1.12 1995/03/04 17:46:21 nate Exp $ */ diff --git a/gnu/usr.bin/ld/i386/mdprologue.S b/gnu/usr.bin/ld/i386/mdprologue.S index 1de0f7200f1a9..79bf4dadd486d 100644 --- a/gnu/usr.bin/ld/i386/mdprologue.S +++ b/gnu/usr.bin/ld/i386/mdprologue.S @@ -27,7 +27,7 @@ * (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: mdprologue.S,v 1.7 1994/12/04 07:42:44 mycroft Exp $ + * $Id: mdprologue.S,v 1.6 1995/03/04 17:46:22 nate Exp $ */ /* diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1 index f3a12c448c2d5..8d96c1c4d7dbd 100644 --- a/gnu/usr.bin/ld/ld.1 +++ b/gnu/usr.bin/ld/ld.1 @@ -27,7 +27,7 @@ .\" (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: ld.1,v 1.8 1994/12/11 21:39:31 ats Exp $ +.\" $Id: ld.1,v 1.9 1994/12/23 22:30:33 nate Exp $ .\" .Dd October 14, 1993 .Dt LD 1 diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 1a04825659eb8..3f0ce316bd3a8 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91"; Set, indirect, and warning symbol features added by Randy Smith. */ /* - * $Id: ld.c,v 1.27.4.3 1996/05/02 16:07:24 jdp Exp $ + * $Id: ld.c,v 1.27.4.5 1996/06/05 02:40:52 jkh Exp $ */ /* Define how to initialize system-dependent header fields. */ diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h index fe9e39e8b541d..ed64eb85a909f 100644 --- a/gnu/usr.bin/ld/ld.h +++ b/gnu/usr.bin/ld/ld.h @@ -1,5 +1,5 @@ /* - * $Id: ld.h,v 1.16 1996/04/20 18:27:55 jdp Exp $ + * $Id: ld.h,v 1.14.4.1 1996/05/02 16:07:26 jdp Exp $ */ /*- * This code is derived from software copyrighted by the Free Software diff --git a/gnu/usr.bin/ld/ldconfig/Makefile b/gnu/usr.bin/ld/ldconfig/Makefile index 28cbe5180ea49..08582c3a00446 100644 --- a/gnu/usr.bin/ld/ldconfig/Makefile +++ b/gnu/usr.bin/ld/ldconfig/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1994/02/13 20:42:18 jkh Exp $ +# $Id: Makefile,v 1.7 1994/04/13 20:49:42 ats Exp $ PROG= ldconfig SRCS= ldconfig.c shlib.c etc.c diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.8 b/gnu/usr.bin/ld/ldconfig/ldconfig.8 index b3ad454ed716d..ddfcc7cd02faa 100644 --- a/gnu/usr.bin/ld/ldconfig/ldconfig.8 +++ b/gnu/usr.bin/ld/ldconfig/ldconfig.8 @@ -27,7 +27,7 @@ .\" (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: ldconfig.8,v 1.6.4.1 1995/08/13 13:26:24 jkh Exp $ +.\" $Id: ldconfig.8,v 1.6.4.2 1996/05/02 16:09:55 jdp Exp $ .\" .Dd October 3, 1993 .Dt LDCONFIG 8 diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.c b/gnu/usr.bin/ld/ldconfig/ldconfig.c index 5b39b01a0e2a8..1f17c8bc4fa6c 100644 --- a/gnu/usr.bin/ld/ldconfig/ldconfig.c +++ b/gnu/usr.bin/ld/ldconfig/ldconfig.c @@ -27,7 +27,7 @@ * (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: ldconfig.c,v 1.9.4.3 1996/04/02 13:10:30 phk Exp $ + * $Id: ldconfig.c,v 1.9.4.4 1997/01/02 16:44:17 jdp Exp $ */ #include diff --git a/gnu/usr.bin/ld/ldd/Makefile b/gnu/usr.bin/ld/ldd/Makefile index 282a8fdb57f66..2d2473fa7661a 100644 --- a/gnu/usr.bin/ld/ldd/Makefile +++ b/gnu/usr.bin/ld/ldd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/09 04:19:24 paul Exp $ +# $Id: Makefile,v 1.3 1993/12/16 21:51:27 nate Exp $ PROG= ldd SRCS= ldd.c diff --git a/gnu/usr.bin/ld/ldd/ldd.c b/gnu/usr.bin/ld/ldd/ldd.c index 2f548063e019c..c4d381afc6558 100644 --- a/gnu/usr.bin/ld/ldd/ldd.c +++ b/gnu/usr.bin/ld/ldd/ldd.c @@ -27,7 +27,7 @@ * (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: ldd.c,v 1.4 1994/06/15 22:41:03 rich Exp $ + * $Id: ldd.c,v 1.5 1994/12/23 22:31:31 nate Exp $ */ #include diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c index fce30480f7fc4..01116fdde787b 100644 --- a/gnu/usr.bin/ld/lib.c +++ b/gnu/usr.bin/ld/lib.c @@ -1,5 +1,5 @@ /* - * $Id: lib.c,v 1.16 1995/09/28 19:43:22 bde Exp $ - library routines + * $Id: lib.c,v 1.15.4.1 1996/05/02 16:07:29 jdp Exp $ - library routines */ #include diff --git a/gnu/usr.bin/ld/rrs.c b/gnu/usr.bin/ld/rrs.c index 0b78a76de8d84..963ec3d87c8b1 100644 --- a/gnu/usr.bin/ld/rrs.c +++ b/gnu/usr.bin/ld/rrs.c @@ -27,7 +27,7 @@ * (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: rrs.c,v 1.15 1996/05/27 18:06:02 jdp Exp $ + * $Id: rrs.c,v 1.14.4.1 1996/07/03 15:47:38 jdp Exp $ */ #include diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile index b5c26468623fe..81a50f40e82ff 100644 --- a/gnu/usr.bin/ld/rtld/Makefile +++ b/gnu/usr.bin/ld/rtld/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.14.4.2 1996/05/02 16:14:02 jdp Exp $ +# $Id: Makefile,v 1.14.4.4 1996/06/05 02:40:55 jkh Exp $ PROG= ld.so SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c diff --git a/gnu/usr.bin/ld/rtld/malloc.c b/gnu/usr.bin/ld/rtld/malloc.c index 60e6ec3be7687..6ac2751d13fa9 100644 --- a/gnu/usr.bin/ld/rtld/malloc.c +++ b/gnu/usr.bin/ld/rtld/malloc.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: malloc.c,v 1.3 1995/03/04 17:46:24 nate Exp $"; +static char *rcsid = "$Id: malloc.c,v 1.4 1995/05/30 05:01:48 rgrimes Exp $"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/gnu/usr.bin/ld/rtld/rtld.1 b/gnu/usr.bin/ld/rtld/rtld.1 index 4fa96002e4da9..51fd740baf3d2 100644 --- a/gnu/usr.bin/ld/rtld/rtld.1 +++ b/gnu/usr.bin/ld/rtld/rtld.1 @@ -1,4 +1,4 @@ -.\" $Id: rtld.1,v 1.1.2.1 1995/10/05 19:59:15 davidg Exp $ +.\" $Id: rtld.1,v 1.1.2.2 1996/05/02 16:14:03 jdp Exp $ .\" .\" Copyright (c) 1995 Paul Kranenburg .\" All rights reserved. diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index f3ceee150d159..b8f23a283017d 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -27,7 +27,7 @@ * (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: rtld.c,v 1.24.4.3 1996/05/02 16:14:05 jdp Exp $ + * $Id: rtld.c,v 1.24.4.5 1996/06/05 02:40:56 jkh Exp $ */ #include diff --git a/gnu/usr.bin/ld/rtld/sbrk.c b/gnu/usr.bin/ld/rtld/sbrk.c index 2d2c610dedb9a..aee02e065e024 100644 --- a/gnu/usr.bin/ld/rtld/sbrk.c +++ b/gnu/usr.bin/ld/rtld/sbrk.c @@ -27,7 +27,7 @@ * (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$ + * $Id: sbrk.c,v 1.1 1993/12/11 21:06:36 jkh Exp $ */ #include diff --git a/gnu/usr.bin/ld/shlib.c b/gnu/usr.bin/ld/shlib.c index 0343423bc0d69..01c057eaf2f6d 100644 --- a/gnu/usr.bin/ld/shlib.c +++ b/gnu/usr.bin/ld/shlib.c @@ -27,7 +27,7 @@ * (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: shlib.c,v 1.15 1996/04/20 18:27:56 jdp Exp $ + * $Id: shlib.c,v 1.13.4.1 1996/05/02 16:07:33 jdp Exp $ */ #include diff --git a/gnu/usr.bin/ld/sparc/md-static-funcs.c b/gnu/usr.bin/ld/sparc/md-static-funcs.c index 2672cb596be60..8446daa5256c8 100644 --- a/gnu/usr.bin/ld/sparc/md-static-funcs.c +++ b/gnu/usr.bin/ld/sparc/md-static-funcs.c @@ -1,6 +1,6 @@ /* - * $Id: md-static-funcs.c,v 1.2 1993/12/08 10:28:56 pk Exp $ + * $Id: md-static-funcs.c,v 1.2 1993/12/11 12:02:08 jkh Exp $ * * Simple SPARC relocations for the benefit of self-relocation of ld.so * avoiding the use of global variables (ie. reloc_bitshift[] et. al.). diff --git a/gnu/usr.bin/ld/sparc/md.c b/gnu/usr.bin/ld/sparc/md.c index 508d37de41f4e..077f6853d851e 100644 --- a/gnu/usr.bin/ld/sparc/md.c +++ b/gnu/usr.bin/ld/sparc/md.c @@ -27,7 +27,7 @@ * (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: md.c,v 1.7 1994/02/13 20:43:03 jkh Exp $ + * $Id: md.c,v 1.8 1994/06/15 22:41:19 rich Exp $ */ #include diff --git a/gnu/usr.bin/ld/sparc/md.h b/gnu/usr.bin/ld/sparc/md.h index f83c1ff91b56b..86f5e944687aa 100644 --- a/gnu/usr.bin/ld/sparc/md.h +++ b/gnu/usr.bin/ld/sparc/md.h @@ -27,7 +27,7 @@ * (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: md.h,v 1.6 1994/02/13 20:43:07 jkh Exp $ + * $Id: md.h,v 1.7 1995/03/04 17:46:25 nate Exp $ */ /* diff --git a/gnu/usr.bin/ld/sparc/mdprologue.S b/gnu/usr.bin/ld/sparc/mdprologue.S index d3236a3866710..6a0ec5cc810b5 100644 --- a/gnu/usr.bin/ld/sparc/mdprologue.S +++ b/gnu/usr.bin/ld/sparc/mdprologue.S @@ -27,7 +27,7 @@ * (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: mdprologue.S,v 1.3 1994/02/13 20:43:13 jkh Exp $ + * $Id: mdprologue.S,v 1.4 1995/03/04 17:46:26 nate Exp $ */ /* diff --git a/gnu/usr.bin/ld/symbol.c b/gnu/usr.bin/ld/symbol.c index c07637ed5ebe9..7891e39c3c54a 100644 --- a/gnu/usr.bin/ld/symbol.c +++ b/gnu/usr.bin/ld/symbol.c @@ -1,5 +1,5 @@ /* - * $Id: symbol.c,v 1.5 1994/06/15 22:39:56 rich Exp $ - symbol table routines + * $Id: symbol.c,v 1.6 1994/12/23 22:30:54 nate Exp $ - symbol table routines */ /* Create the symbol table entries for `etext', `edata' and `end'. */ diff --git a/gnu/usr.bin/ld/symseg.h b/gnu/usr.bin/ld/symseg.h index 112dd6f0a7f59..0b9a58476bd50 100644 --- a/gnu/usr.bin/ld/symseg.h +++ b/gnu/usr.bin/ld/symseg.h @@ -4,7 +4,7 @@ * Foundation. * * from: @(#)symseg.h 5.4 (Berkeley) 4/30/91 - * $Id: symseg.h,v 1.3 1993/11/09 04:19:05 paul Exp $ + * $Id: symseg.h,v 1.4 1995/05/30 05:01:47 rgrimes Exp $ */ /* GDB symbol table format definitions. diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c index 3c65a22583638..e17287ddae24d 100644 --- a/gnu/usr.bin/ld/warnings.c +++ b/gnu/usr.bin/ld/warnings.c @@ -1,5 +1,5 @@ /* - * $Id: warnings.c,v 1.9 1994/12/23 22:30:57 nate Exp $ + * $Id: warnings.c,v 1.10 1995/03/04 17:46:10 nate Exp $ */ #include diff --git a/gnu/usr.bin/ld/xbits.c b/gnu/usr.bin/ld/xbits.c index 6374bebe23c51..ef25234db9a50 100644 --- a/gnu/usr.bin/ld/xbits.c +++ b/gnu/usr.bin/ld/xbits.c @@ -27,7 +27,7 @@ * (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: xbits.c,v 1.2 1993/11/09 04:19:08 paul Exp $ + * $Id: xbits.c,v 1.3 1994/02/13 20:41:50 jkh Exp $ */ /* diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog index 665a194917ff3..f329a8cfe881a 100644 --- a/gnu/usr.bin/man/Makefile.shprog +++ b/gnu/usr.bin/man/Makefile.shprog @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.shprog,v 1.1 1995/10/21 14:27:04 bde Exp $ # This may become bsd.shprog.mk. The general version would have to handle: # - arbitrary sed substitutions. diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile index f1a2b0566f3b2..bc17131499440 100644 --- a/gnu/usr.bin/man/apropos/Makefile +++ b/gnu/usr.bin/man/apropos/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1994/08/28 18:33:42 bde Exp $ +# $Id: Makefile,v 1.8.6.2 1996/06/05 02:40:59 jkh Exp $ .if exists(${.CURDIR}/obj) MAN1= ${.CURDIR}/obj/apropos.1 diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1 index c7d22ef8c83fc..c19cb1eea07ec 100644 --- a/gnu/usr.bin/man/catman/catman.1 +++ b/gnu/usr.bin/man/catman/catman.1 @@ -30,7 +30,7 @@ .\" .\" E-mail: Wolfram Schneider .\" -.\" $Id: catman.1,v 1.7 1996/01/23 21:27:39 joerg Exp $ +.\" $Id: catman.1,v 1.5.4.3 1996/06/23 20:30:20 wosch Exp $ .\" .Dd Mar 12, 1995 diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl index 77ca3a6703984..a9f922aa28480 100644 --- a/gnu/usr.bin/man/catman/catman.perl +++ b/gnu/usr.bin/man/catman/catman.perl @@ -35,7 +35,7 @@ # # Email: Wolfram Schneider # -# $Id: catman.perl,v 1.7 1996/03/21 18:17:41 wosch Exp $ +# $Id: catman.perl,v 1.6.4.3 1996/06/23 20:30:22 wosch Exp $ sub usage { diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1 index 143522a4e9f16..7bb626fa3303e 100644 --- a/gnu/usr.bin/man/makewhatis/makewhatis.1 +++ b/gnu/usr.bin/man/makewhatis/makewhatis.1 @@ -29,7 +29,7 @@ .\" makewhatis -- update the whatis database in the man directories. .\" .\" -.\" $Id: makewhatis.1,v 1.4 1996/05/22 00:57:39 wosch Exp $ +.\" $Id: makewhatis.1,v 1.2.4.3 1996/06/23 20:30:04 wosch Exp $ .Dd Jan, 12, 1995 diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8 index acf52121f07cf..dd28a4c5edb20 100644 --- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 +++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8 @@ -1,6 +1,6 @@ .\" (c) Wolfram Schneider, Berlin. April 1996. Public Domain. .\" -.\" $Id: makewhatis.local.8,v 1.1 1996/05/14 10:27:26 wosch Exp $ +.\" $Id: makewhatis.local.8,v 1.1 1996/05/22 00:57:40 wosch Exp $ .Dd April, 26, 1996 .Dt MAKEWHATIS.LOCAL 8 diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh index d566920cdd834..3174915747768 100644 --- a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh +++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh @@ -10,7 +10,7 @@ # # PS: this wrapper works also for catman(1) # -# $Id: makewhatis.local.sh,v 1.1 1996/05/14 10:27:27 wosch Exp $ +# $Id: makewhatis.local.sh,v 1.2 1996/05/22 00:57:40 wosch Exp $ PATH=/bin:/usr/bin:$PATH; export PATH opt= dirs= localdirs= diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.perl b/gnu/usr.bin/man/makewhatis/makewhatis.perl index 1740368e10f43..4101e927281a2 100644 --- a/gnu/usr.bin/man/makewhatis/makewhatis.perl +++ b/gnu/usr.bin/man/makewhatis/makewhatis.perl @@ -32,7 +32,7 @@ # # makewhatis -- update the whatis database in the man directories. # -# $Id: makewhatis.perl,v 1.10 1996/05/22 00:57:42 wosch Exp $ +# $Id: makewhatis.perl,v 1.6.4.3 1996/06/23 20:30:05 wosch Exp $ sub usage { diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h index be56db25fdbad..fa700cc45ef23 100644 --- a/gnu/usr.bin/patch/EXTERN.h +++ b/gnu/usr.bin/patch/EXTERN.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/EXTERN.h,v 1.2 1995/05/30 05:02:26 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/EXTERN.h,v 1.2.4.1 1996/06/05 02:41:35 jkh Exp $ * * $Log: EXTERN.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:35 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:26 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h index 706717082c589..d03f3b3ff32a9 100644 --- a/gnu/usr.bin/patch/INTERN.h +++ b/gnu/usr.bin/patch/INTERN.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/INTERN.h,v 1.2 1995/05/30 05:02:27 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/INTERN.h,v 1.2.4.1 1996/06/05 02:41:36 jkh Exp $ * * $Log: INTERN.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:36 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:27 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h index 11f48cd10338d..0f71373034f1b 100644 --- a/gnu/usr.bin/patch/common.h +++ b/gnu/usr.bin/patch/common.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/common.h,v 1.3 1995/05/30 05:02:30 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/common.h,v 1.3.4.1 1996/06/05 02:41:37 jkh Exp $ * * $Log: common.h,v $ + * Revision 1.3.4.1 1996/06/05 02:41:37 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.3 1995/05/30 05:02:30 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c index 015138cfc019f..51cddf5d9ba65 100644 --- a/gnu/usr.bin/patch/inp.c +++ b/gnu/usr.bin/patch/inp.c @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/inp.c,v 1.3 1995/05/30 05:02:31 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.c,v 1.3.4.1 1996/06/05 02:41:37 jkh Exp $ * * $Log: inp.c,v $ + * Revision 1.3.4.1 1996/06/05 02:41:37 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.3 1995/05/30 05:02:31 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h index 07b42b9cdc7ac..74595c2c7336e 100644 --- a/gnu/usr.bin/patch/inp.h +++ b/gnu/usr.bin/patch/inp.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/inp.h,v 1.2 1995/05/30 05:02:33 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/inp.h,v 1.2.4.1 1996/06/05 02:41:38 jkh Exp $ * * $Log: inp.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:38 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:33 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1 index eb7578d76c119..9c5729d6205d3 100644 --- a/gnu/usr.bin/patch/patch.1 +++ b/gnu/usr.bin/patch/patch.1 @@ -1,8 +1,12 @@ .\" -*- nroff -*- .rn '' }` -'\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/patch.1,v 1.4 1994/02/25 21:45:59 phk Exp $ +'\" $Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.4.6.2 1996/06/05 02:41:39 jkh Exp $ '\" '\" $Log: patch.1,v $ +'\" Revision 1.4.6.2 1996/06/05 02:41:39 jkh +'\" This 3rd mega-commit should hopefully bring us back to where we were. +'\" I can get it to `make world' succesfully, anyway! +'\" .\" Revision 1.4 1994/02/25 21:45:59 phk .\" added the -C/-check again. .\" diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c index 8f3e84c9a95f8..f943f5ad29327 100644 --- a/gnu/usr.bin/patch/patch.c +++ b/gnu/usr.bin/patch/patch.c @@ -1,5 +1,5 @@ char rcsid[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/patch.c,v 1.6 1995/05/30 05:02:34 rgrimes Exp $"; + "$Header: /home/ncvs/src/gnu/usr.bin/patch/patch.c,v 1.6.4.1 1996/06/05 02:41:40 jkh Exp $"; /* patch - a program to apply diffs to original files * @@ -9,6 +9,10 @@ char rcsid[] = * money off of it, or pretend that you wrote it. * * $Log: patch.c,v $ + * Revision 1.6.4.1 1996/06/05 02:41:40 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.6 1995/05/30 05:02:34 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c index 9d0ebca7675a6..604e64e3a5052 100644 --- a/gnu/usr.bin/patch/pch.c +++ b/gnu/usr.bin/patch/pch.c @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/pch.c,v 1.5.4.2 1996/04/11 10:33:45 markm Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.5.4.4 1996/06/05 02:41:41 jkh Exp $ * * $Log: pch.c,v $ + * Revision 1.5.4.4 1996/06/05 02:41:41 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.5.4.2 1996/04/11 10:33:45 markm * Merge with HEAD an improved Index: priority fix. * diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h index a8d07f89bf8a9..6269ad0a44bf0 100644 --- a/gnu/usr.bin/patch/pch.h +++ b/gnu/usr.bin/patch/pch.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/pch.h,v 1.2 1995/05/30 05:02:36 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.h,v 1.2.4.1 1996/06/05 02:41:42 jkh Exp $ * * $Log: pch.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:42 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:36 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h index 84f1ca47fcbfe..13953547659e4 100644 --- a/gnu/usr.bin/patch/util.h +++ b/gnu/usr.bin/patch/util.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/util.h,v 1.2 1995/05/30 05:02:38 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/util.h,v 1.2.4.1 1996/06/05 02:41:42 jkh Exp $ * * $Log: util.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:42 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:38 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c index 4c95e5be24859..dde42cd07b929 100644 --- a/gnu/usr.bin/patch/version.c +++ b/gnu/usr.bin/patch/version.c @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/version.c,v 1.2 1995/05/30 05:02:39 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.c,v 1.2.4.1 1996/06/05 02:41:43 jkh Exp $ * * $Log: version.c,v $ + * Revision 1.2.4.1 1996/06/05 02:41:43 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:39 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h index 498050c3dea5a..95fcd03822328 100644 --- a/gnu/usr.bin/patch/version.h +++ b/gnu/usr.bin/patch/version.h @@ -1,6 +1,10 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/patch/version.h,v 1.2 1995/05/30 05:02:40 rgrimes Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/version.h,v 1.2.4.1 1996/06/05 02:41:44 jkh Exp $ * * $Log: version.h,v $ + * Revision 1.2.4.1 1996/06/05 02:41:44 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 05:02:40 rgrimes * Remove trailing whitespace. * diff --git a/gnu/usr.bin/perl/eg/ADB b/gnu/usr.bin/perl/eg/ADB index 39c58d99e2a0a..992d9ec8253e1 100644 --- a/gnu/usr.bin/perl/eg/ADB +++ b/gnu/usr.bin/perl/eg/ADB @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/ADB,v 1.1.1.1 1994/09/10 06:27:46 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/ADB,v 1.1.1.1.6.1 1996/06/05 02:41:48 jkh Exp $ # This script is only useful when used in your crash directory. diff --git a/gnu/usr.bin/perl/eg/changes b/gnu/usr.bin/perl/eg/changes index b82efda0861e8..c3e208c9ac233 100644 --- a/gnu/usr.bin/perl/eg/changes +++ b/gnu/usr.bin/perl/eg/changes @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/changes,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/changes,v 1.1.1.1.6.1 1996/06/05 02:41:50 jkh Exp $ ($dir, $days) = @ARGV; $dir = '/' if $dir eq ''; diff --git a/gnu/usr.bin/perl/eg/dus b/gnu/usr.bin/perl/eg/dus index ccab061d62274..ccc756ec3038d 100644 --- a/gnu/usr.bin/perl/eg/dus +++ b/gnu/usr.bin/perl/eg/dus @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/dus,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/dus,v 1.1.1.1.6.1 1996/06/05 02:41:50 jkh Exp $ # This script does a du -s on any directories in the current directory that # are not mount points for another filesystem. diff --git a/gnu/usr.bin/perl/eg/findcp b/gnu/usr.bin/perl/eg/findcp index 39f7ba4830b0c..422aa4826405b 100644 --- a/gnu/usr.bin/perl/eg/findcp +++ b/gnu/usr.bin/perl/eg/findcp @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/findcp,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/findcp,v 1.1.1.1.6.1 1996/06/05 02:41:51 jkh Exp $ # This is a wrapper around the find command that pretends find has a switch # of the form -cp host:destination. It presumes your find implements -ls. diff --git a/gnu/usr.bin/perl/eg/findtar b/gnu/usr.bin/perl/eg/findtar index 046e48f83fbbe..a4e44d3f572fe 100644 --- a/gnu/usr.bin/perl/eg/findtar +++ b/gnu/usr.bin/perl/eg/findtar @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/findtar,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/findtar,v 1.1.1.1.6.1 1996/06/05 02:41:51 jkh Exp $ # findtar takes find-style arguments and spits out a tarfile on stdout. # It won't work unless your find supports -ls and your tar the I flag. diff --git a/gnu/usr.bin/perl/eg/g/gcp b/gnu/usr.bin/perl/eg/g/gcp index f5045d8fd3efd..0ba913d083b58 100644 --- a/gnu/usr.bin/perl/eg/g/gcp +++ b/gnu/usr.bin/perl/eg/g/gcp @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/g/gcp,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/g/gcp,v 1.1.1.1.6.1 1996/06/05 02:41:59 jkh Exp $ # Here is a script to do global rcps. See man page. diff --git a/gnu/usr.bin/perl/eg/g/gcp.man b/gnu/usr.bin/perl/eg/g/gcp.man index 21f15d625d30d..e11b78330a9a1 100644 --- a/gnu/usr.bin/perl/eg/g/gcp.man +++ b/gnu/usr.bin/perl/eg/g/gcp.man @@ -1,4 +1,4 @@ -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/g/gcp.man,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +.\" $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/g/gcp.man,v 1.1.1.1.6.1 1996/06/05 02:42:00 jkh Exp $ .TH GCP 1C "13 May 1988" .SH NAME gcp \- global file copy diff --git a/gnu/usr.bin/perl/eg/g/ged b/gnu/usr.bin/perl/eg/g/ged index f6fb91a1b88f9..0519a59a4c6d6 100644 --- a/gnu/usr.bin/perl/eg/g/ged +++ b/gnu/usr.bin/perl/eg/g/ged @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/g/ged,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/g/ged,v 1.1.1.1.6.1 1996/06/05 02:42:00 jkh Exp $ # Does inplace edits on a set of files on a set of machines. # diff --git a/gnu/usr.bin/perl/eg/g/gsh b/gnu/usr.bin/perl/eg/g/gsh index 14e0ae08f1192..20d777ee27f6f 100644 --- a/gnu/usr.bin/perl/eg/g/gsh +++ b/gnu/usr.bin/perl/eg/g/gsh @@ -1,6 +1,6 @@ #! /usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/g/gsh,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/g/gsh,v 1.1.1.1.6.1 1996/06/05 02:42:01 jkh Exp $ # Do rsh globally--see man page diff --git a/gnu/usr.bin/perl/eg/g/gsh.man b/gnu/usr.bin/perl/eg/g/gsh.man index 5bc5a175a8349..247f76c39ac75 100644 --- a/gnu/usr.bin/perl/eg/g/gsh.man +++ b/gnu/usr.bin/perl/eg/g/gsh.man @@ -1,4 +1,4 @@ -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/g/gsh.man,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +.\" $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/g/gsh.man,v 1.1.1.1.6.1 1996/06/05 02:42:02 jkh Exp $ .TH GSH 8 "13 May 1988" .SH NAME gsh \- global shell diff --git a/gnu/usr.bin/perl/eg/muck.man b/gnu/usr.bin/perl/eg/muck.man index 0e44926a5e0de..b24af71b595c5 100644 --- a/gnu/usr.bin/perl/eg/muck.man +++ b/gnu/usr.bin/perl/eg/muck.man @@ -1,4 +1,4 @@ -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/muck.man,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +.\" $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/muck.man,v 1.1.1.1.6.1 1996/06/05 02:41:52 jkh Exp $ .TH MUCK 1 "10 Jan 1989" .SH NAME muck \- make usage checker diff --git a/gnu/usr.bin/perl/eg/myrup b/gnu/usr.bin/perl/eg/myrup index 813a4693ace7e..30781b7a2f4b5 100644 --- a/gnu/usr.bin/perl/eg/myrup +++ b/gnu/usr.bin/perl/eg/myrup @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/myrup,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/myrup,v 1.1.1.1.6.1 1996/06/05 02:41:53 jkh Exp $ # This was a customization of ruptime requested by someone here who wanted # to be able to find the least loaded machine easily. It uses the diff --git a/gnu/usr.bin/perl/eg/nih b/gnu/usr.bin/perl/eg/nih index 5058dbe0806e8..c58651675564a 100644 --- a/gnu/usr.bin/perl/eg/nih +++ b/gnu/usr.bin/perl/eg/nih @@ -1,7 +1,7 @@ eval "exec /usr/bin/perl -Spi.bak $0 $*" if $running_under_some_shell; -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/nih,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/nih,v 1.1.1.1.6.1 1996/06/05 02:41:53 jkh Exp $ # This script makes #! scripts directly executable on machines that don't # support #!. It edits in place any scripts mentioned on the command line. diff --git a/gnu/usr.bin/perl/eg/relink b/gnu/usr.bin/perl/eg/relink index 1484f3da40b77..68352f4a00405 100644 --- a/gnu/usr.bin/perl/eg/relink +++ b/gnu/usr.bin/perl/eg/relink @@ -2,9 +2,13 @@ 'di'; 'ig00'; # -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/relink,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/relink,v 1.1.1.1.6.1 1996/06/05 02:41:54 jkh Exp $ # # $Log: relink,v $ +# Revision 1.1.1.1.6.1 1996/06/05 02:41:54 jkh +# This 3rd mega-commit should hopefully bring us back to where we were. +# I can get it to `make world' succesfully, anyway! +# # Revision 1.1.1.1 1994/09/10 06:27:47 gclarkii # Initial import of Perl 4.046 bmaked # diff --git a/gnu/usr.bin/perl/eg/rename b/gnu/usr.bin/perl/eg/rename index 64d9a595669eb..bae28861a6a10 100644 --- a/gnu/usr.bin/perl/eg/rename +++ b/gnu/usr.bin/perl/eg/rename @@ -2,9 +2,13 @@ 'di'; 'ig00'; # -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/rename,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/rename,v 1.1.1.1.6.1 1996/06/05 02:41:55 jkh Exp $ # # $Log: rename,v $ +# Revision 1.1.1.1.6.1 1996/06/05 02:41:55 jkh +# This 3rd mega-commit should hopefully bring us back to where we were. +# I can get it to `make world' succesfully, anyway! +# # Revision 1.1.1.1 1994/09/10 06:27:47 gclarkii # Initial import of Perl 4.046 bmaked # diff --git a/gnu/usr.bin/perl/eg/rmfrom b/gnu/usr.bin/perl/eg/rmfrom index 8c05ba55b9551..0204458b23873 100644 --- a/gnu/usr.bin/perl/eg/rmfrom +++ b/gnu/usr.bin/perl/eg/rmfrom @@ -1,6 +1,6 @@ #!/usr/bin/perl -n -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/rmfrom,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/rmfrom,v 1.1.1.1.6.1 1996/06/05 02:41:56 jkh Exp $ # A handy (but dangerous) script to put after a find ... -print. diff --git a/gnu/usr.bin/perl/eg/scan/scan_df b/gnu/usr.bin/perl/eg/scan/scan_df index 3904fa7bb2ed2..6f36a1d8d8eba 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_df +++ b/gnu/usr.bin/perl/eg/scan/scan_df @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_df,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_df,v 1.1.1.1.6.1 1996/06/05 02:42:03 jkh Exp $ # This report points out filesystems that are in danger of overflowing. diff --git a/gnu/usr.bin/perl/eg/scan/scan_last b/gnu/usr.bin/perl/eg/scan/scan_last index 3fef9b679ab05..deb4fc7473cf3 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_last +++ b/gnu/usr.bin/perl/eg/scan/scan_last @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_last,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_last,v 1.1.1.1.6.1 1996/06/05 02:42:04 jkh Exp $ # This reports who was logged on at weird hours diff --git a/gnu/usr.bin/perl/eg/scan/scan_messages b/gnu/usr.bin/perl/eg/scan/scan_messages index d5e6999cfae2d..d639af60fbb03 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_messages +++ b/gnu/usr.bin/perl/eg/scan/scan_messages @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_messages,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_messages,v 1.1.1.1.6.1 1996/06/05 02:42:05 jkh Exp $ # This prints out extraordinary console messages. You'll need to customize. diff --git a/gnu/usr.bin/perl/eg/scan/scan_passwd b/gnu/usr.bin/perl/eg/scan/scan_passwd index 938f86d979ee3..c7272c2f6ea35 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_passwd +++ b/gnu/usr.bin/perl/eg/scan/scan_passwd @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_passwd,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_passwd,v 1.1.1.1.6.1 1996/06/05 02:42:05 jkh Exp $ # This scans passwd file for security holes. diff --git a/gnu/usr.bin/perl/eg/scan/scan_ps b/gnu/usr.bin/perl/eg/scan/scan_ps index 890039136889c..06a82d2dc9b07 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_ps +++ b/gnu/usr.bin/perl/eg/scan/scan_ps @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_ps,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_ps,v 1.1.1.1.6.1 1996/06/05 02:42:06 jkh Exp $ # This looks for looping processes. diff --git a/gnu/usr.bin/perl/eg/scan/scan_sudo b/gnu/usr.bin/perl/eg/scan/scan_sudo index 09813cee02444..c792edbcc7ac1 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_sudo +++ b/gnu/usr.bin/perl/eg/scan/scan_sudo @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_sudo,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_sudo,v 1.1.1.1.6.1 1996/06/05 02:42:07 jkh Exp $ # Analyze the sudo log. diff --git a/gnu/usr.bin/perl/eg/scan/scan_suid b/gnu/usr.bin/perl/eg/scan/scan_suid index 2d5d6b64c70c3..72c4579e1184f 100644 --- a/gnu/usr.bin/perl/eg/scan/scan_suid +++ b/gnu/usr.bin/perl/eg/scan/scan_suid @@ -1,6 +1,6 @@ #!/usr/bin/perl -P -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scan_suid,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scan_suid,v 1.1.1.1.6.1 1996/06/05 02:42:07 jkh Exp $ # Look for new setuid root files. diff --git a/gnu/usr.bin/perl/eg/scan/scanner b/gnu/usr.bin/perl/eg/scan/scanner index 5b24dc6c03bae..c673ee5d2aa8e 100644 --- a/gnu/usr.bin/perl/eg/scan/scanner +++ b/gnu/usr.bin/perl/eg/scan/scanner @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/scan/scanner,v 1.1.1.1 1994/09/10 06:27:48 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/scan/scanner,v 1.1.1.1.6.1 1996/06/05 02:42:08 jkh Exp $ # This runs all the scan_* routines on all the machines in /etc/ghosts. # We run this every morning at about 6 am: diff --git a/gnu/usr.bin/perl/eg/shmkill b/gnu/usr.bin/perl/eg/shmkill index 967edee3d0d64..aeac4fc310030 100644 --- a/gnu/usr.bin/perl/eg/shmkill +++ b/gnu/usr.bin/perl/eg/shmkill @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/shmkill,v 1.1.1.1 1994/09/10 06:27:47 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/shmkill,v 1.1.1.1.6.1 1996/06/05 02:41:56 jkh Exp $ # A script to call from crontab periodically when people are leaving shared # memory sitting around unattached. diff --git a/gnu/usr.bin/perl/eg/van/empty b/gnu/usr.bin/perl/eg/van/empty index 61b606a426143..7c7280e9188ee 100644 --- a/gnu/usr.bin/perl/eg/van/empty +++ b/gnu/usr.bin/perl/eg/van/empty @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/van/empty,v 1.1.1.1 1994/09/10 06:27:49 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/van/empty,v 1.1.1.1.6.1 1996/06/05 02:42:10 jkh Exp $ # This script empties a trashcan. diff --git a/gnu/usr.bin/perl/eg/van/unvanish b/gnu/usr.bin/perl/eg/van/unvanish index 2e6655a4362ec..a47a6a4f2c48b 100644 --- a/gnu/usr.bin/perl/eg/van/unvanish +++ b/gnu/usr.bin/perl/eg/van/unvanish @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/van/unvanish,v 1.1.1.1 1994/09/10 06:27:50 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/van/unvanish,v 1.1.1.1.6.1 1996/06/05 02:42:11 jkh Exp $ sub it { if ($olddir ne '.') { diff --git a/gnu/usr.bin/perl/eg/van/vanexp b/gnu/usr.bin/perl/eg/van/vanexp index e494cf5d4180c..0492a47330a5b 100644 --- a/gnu/usr.bin/perl/eg/van/vanexp +++ b/gnu/usr.bin/perl/eg/van/vanexp @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/van/vanexp,v 1.1.1.1 1994/09/10 06:27:50 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/van/vanexp,v 1.1.1.1.6.1 1996/06/05 02:42:12 jkh Exp $ # This is for running from a find at night to expire old .deleteds diff --git a/gnu/usr.bin/perl/eg/van/vanish b/gnu/usr.bin/perl/eg/van/vanish index 20a5d39bd463a..9406cbc7214f6 100644 --- a/gnu/usr.bin/perl/eg/van/vanish +++ b/gnu/usr.bin/perl/eg/van/vanish @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/eg/van/vanish,v 1.1.1.1 1994/09/10 06:27:50 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/eg/van/vanish,v 1.1.1.1.6.1 1996/06/05 02:42:12 jkh Exp $ sub it { if ($olddir ne '.') { diff --git a/gnu/usr.bin/perl/emacs/perldb.pl b/gnu/usr.bin/perl/emacs/perldb.pl index eaecb2251b7da..f39d800b4fb97 100644 --- a/gnu/usr.bin/perl/emacs/perldb.pl +++ b/gnu/usr.bin/perl/emacs/perldb.pl @@ -3,7 +3,7 @@ package DB; # modified Perl debugger, to be run from Emacs in perldb-mode # Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990 -$header = '$Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/emacs/perldb.pl,v 1.1.1.1 1994/09/10 06:27:50 gclarkii Exp $'; +$header = '$Header: /home/ncvs/src/gnu/usr.bin/perl/emacs/perldb.pl,v 1.1.1.1.6.1 1996/06/05 02:42:14 jkh Exp $'; # # This file is automatically included if you do perl -d. # It's probably not useful to include this yourself. @@ -13,6 +13,10 @@ $header = '$Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/emacs/perldb.p # have a breakpoint. It also inserts a do 'perldb.pl' before the first line. # # $Log: perldb.pl,v $ +# Revision 1.1.1.1.6.1 1996/06/05 02:42:14 jkh +# This 3rd mega-commit should hopefully bring us back to where we were. +# I can get it to `make world' succesfully, anyway! +# # Revision 1.1.1.1 1994/09/10 06:27:50 gclarkii # Initial import of Perl 4.046 bmaked # diff --git a/gnu/usr.bin/perl/lib/ctime.pl b/gnu/usr.bin/perl/lib/ctime.pl index 4c59754b7b81e..4a5686c52548f 100644 --- a/gnu/usr.bin/perl/lib/ctime.pl +++ b/gnu/usr.bin/perl/lib/ctime.pl @@ -3,7 +3,7 @@ ;# Waldemar Kebsch, Federal Republic of Germany, November 1988 ;# kebsch.pad@nixpbe.UUCP ;# Modified March 1990, Feb 1991 to properly handle timezones -;# $RCSfile: ctime.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:52 $ +;# $RCSfile: ctime.pl,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:52 $ ;# Marion Hakanson (hakanson@cse.ogi.edu) ;# Oregon Graduate Institute of Science and Technology ;# diff --git a/gnu/usr.bin/perl/lib/gethostname.pl b/gnu/usr.bin/perl/lib/gethostname.pl index 2342bad7d7b9f..5c8c2c59b0b64 100644 --- a/gnu/usr.bin/perl/lib/gethostname.pl +++ b/gnu/usr.bin/perl/lib/gethostname.pl @@ -4,7 +4,7 @@ # Written 13-Feb-96 by Jörg Wunsch, interface business GmbH Dresden. # Placed in the public domain. # -# $Id: gethostname.pl,v 1.1 1996/02/13 13:17:49 joerg Exp $ +# $Id: gethostname.pl,v 1.2 1996/03/18 21:42:31 joerg Exp $ # package gethostname; diff --git a/gnu/usr.bin/perl/lib/getopt.pl b/gnu/usr.bin/perl/lib/getopt.pl index 6772d54aae206..6c3c4996f0871 100644 --- a/gnu/usr.bin/perl/lib/getopt.pl +++ b/gnu/usr.bin/perl/lib/getopt.pl @@ -1,4 +1,4 @@ -;# $RCSfile: getopt.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:52 $ +;# $RCSfile: getopt.pl,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:52 $ ;# Process single-character switches with switch clustering. Pass one argument ;# which is a string containing all switches that take an argument. For each diff --git a/gnu/usr.bin/perl/lib/importenv.pl b/gnu/usr.bin/perl/lib/importenv.pl index 002d760add5e5..9f50b3d050c59 100644 --- a/gnu/usr.bin/perl/lib/importenv.pl +++ b/gnu/usr.bin/perl/lib/importenv.pl @@ -1,4 +1,4 @@ -;# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/lib/importenv.pl,v 1.1.1.1 1994/09/10 06:27:52 gclarkii Exp $ +;# $Header: /home/ncvs/src/gnu/usr.bin/perl/lib/importenv.pl,v 1.1.1.1.6.1 1996/06/05 02:42:17 jkh Exp $ ;# This file, when interpreted, pulls the environment into normal variables. ;# Usage: diff --git a/gnu/usr.bin/perl/lib/perldb.pl b/gnu/usr.bin/perl/lib/perldb.pl index 1aadb934e979f..3d363ed26811a 100644 --- a/gnu/usr.bin/perl/lib/perldb.pl +++ b/gnu/usr.bin/perl/lib/perldb.pl @@ -4,7 +4,7 @@ package DB; # Ray Lischner (uunet!mntgfx!lisch) as of 5 Nov 1990 # Johan Vromans -- upgrade to 4.0 pl 10 -$header = '$RCSfile: perldb.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:51 $'; +$header = '$RCSfile: perldb.pl,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $'; # # This file is automatically included if you do perl -d. # It's probably not useful to include this yourself. @@ -14,6 +14,9 @@ $header = '$RCSfile: perldb.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:51 # have a breakpoint. It also inserts a do 'perldb.pl' before the first line. # # $Log: perldb.pl,v $ +# Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii +# Initial import of Perl 4.046 bmaked +# # Revision 1.1.1.1 1993/08/23 21:29:51 nate # PERL! # diff --git a/gnu/usr.bin/perl/lib/pwd.pl b/gnu/usr.bin/perl/lib/pwd.pl index 16baadcdcdd4b..1294e18de6378 100644 --- a/gnu/usr.bin/perl/lib/pwd.pl +++ b/gnu/usr.bin/perl/lib/pwd.pl @@ -1,8 +1,11 @@ ;# pwd.pl - keeps track of current working directory in PWD environment var ;# -;# $RCSfile: pwd.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:52 $ +;# $RCSfile: pwd.pl,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ ;# ;# $Log: pwd.pl,v $ +;# Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii +;# Initial import of Perl 4.046 bmaked +;# # Revision 1.1.1.1 1993/08/23 21:29:52 nate # PERL! # diff --git a/gnu/usr.bin/perl/lib/stat.pl b/gnu/usr.bin/perl/lib/stat.pl index 1fe8c90d96c04..90ba1dc28e8f5 100644 --- a/gnu/usr.bin/perl/lib/stat.pl +++ b/gnu/usr.bin/perl/lib/stat.pl @@ -1,4 +1,4 @@ -;# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/lib/stat.pl,v 1.1.1.1 1994/09/10 06:27:53 gclarkii Exp $ +;# $Header: /home/ncvs/src/gnu/usr.bin/perl/lib/stat.pl,v 1.1.1.1.6.1 1996/06/05 02:42:17 jkh Exp $ ;# Usage: ;# require 'stat.pl'; diff --git a/gnu/usr.bin/perl/lib/syslog.pl b/gnu/usr.bin/perl/lib/syslog.pl index 94a4f6a19a008..96fdc231c7834 100644 --- a/gnu/usr.bin/perl/lib/syslog.pl +++ b/gnu/usr.bin/perl/lib/syslog.pl @@ -2,6 +2,9 @@ # syslog.pl # # $Log: syslog.pl,v $ +# Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii +# Initial import of Perl 4.046 bmaked +# # Revision 1.1.1.1 1993/08/23 21:29:51 nate # PERL! # diff --git a/gnu/usr.bin/perl/lib/termcap.pl b/gnu/usr.bin/perl/lib/termcap.pl index 81556dbd3fb4b..2e173baa33cf2 100644 --- a/gnu/usr.bin/perl/lib/termcap.pl +++ b/gnu/usr.bin/perl/lib/termcap.pl @@ -1,4 +1,4 @@ -;# $RCSfile: termcap.pl,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:52 $ +;# $RCSfile: termcap.pl,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ ;# ;# Usage: ;# require 'ioctl.pl'; diff --git a/gnu/usr.bin/perl/lib/validate.pl b/gnu/usr.bin/perl/lib/validate.pl index d54dba4a0d60a..34320cd43ffdd 100644 --- a/gnu/usr.bin/perl/lib/validate.pl +++ b/gnu/usr.bin/perl/lib/validate.pl @@ -1,4 +1,4 @@ -;# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/lib/validate.pl,v 1.1.1.1 1994/09/10 06:27:53 gclarkii Exp $ +;# $Header: /home/ncvs/src/gnu/usr.bin/perl/lib/validate.pl,v 1.1.1.1.6.1 1996/06/05 02:42:18 jkh Exp $ ;# The validate routine takes a single multiline string consisting of ;# lines containing a filename plus a file test to try on it. (The diff --git a/gnu/usr.bin/perl/misc/c2ph b/gnu/usr.bin/perl/misc/c2ph index 1a2e4b8306ea3..7214e3b1d43cd 100644 --- a/gnu/usr.bin/perl/misc/c2ph +++ b/gnu/usr.bin/perl/misc/c2ph @@ -10,7 +10,7 @@ # See the usage message for more. If this isn't enough, read the code. # -$RCSID = '$RCSfile: c2ph,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:31 $'; +$RCSID = '$RCSfile: c2ph,v $$Revision: 1.2 $$Date: 1994/10/29 07:14:38 $'; ###################################################################### diff --git a/gnu/usr.bin/perl/misc/pstruct b/gnu/usr.bin/perl/misc/pstruct index 5dfea04776f66..c9f9a04aa4ea3 100644 --- a/gnu/usr.bin/perl/misc/pstruct +++ b/gnu/usr.bin/perl/misc/pstruct @@ -10,7 +10,7 @@ # See the usage message for more. If this isn't enough, read the code. # -$RCSID = '$RCSfile: pstruct,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:31 $'; +$RCSID = '$RCSfile: pstruct,v $$Revision: 1.2 $$Date: 1994/10/29 07:14:39 $'; ###################################################################### diff --git a/gnu/usr.bin/perl/perl/EXTERN.h b/gnu/usr.bin/perl/perl/EXTERN.h index fec95bf609060..31c8caecca090 100644 --- a/gnu/usr.bin/perl/perl/EXTERN.h +++ b/gnu/usr.bin/perl/perl/EXTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: EXTERN.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:46 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: EXTERN.h,v $ + * Revision 1.2 1995/05/30 05:02:46 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/INTERN.h b/gnu/usr.bin/perl/perl/INTERN.h index d1792d852ea32..6a9417dceca45 100644 --- a/gnu/usr.bin/perl/perl/INTERN.h +++ b/gnu/usr.bin/perl/perl/INTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: INTERN.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:47 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: INTERN.h,v $ + * Revision 1.2 1995/05/30 05:02:47 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/arg.h b/gnu/usr.bin/perl/perl/arg.h index b3f8d5a050ccb..53e5583b1924a 100644 --- a/gnu/usr.bin/perl/perl/arg.h +++ b/gnu/usr.bin/perl/perl/arg.h @@ -1,4 +1,4 @@ -/* $RCSfile: arg.h,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:24 $ +/* $RCSfile: arg.h,v $$Revision: 1.3 $$Date: 1995/05/30 05:02:49 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: arg.h,v $ + * Revision 1.3 1995/05/30 05:02:49 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1994/09/11 03:17:24 gclarkii * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h * Added casts to shutup warnings in doio.c diff --git a/gnu/usr.bin/perl/perl/array.c b/gnu/usr.bin/perl/perl/array.c index a413e3b2a6704..5436decde8f10 100644 --- a/gnu/usr.bin/perl/perl/array.c +++ b/gnu/usr.bin/perl/perl/array.c @@ -1,4 +1,4 @@ -/* $RCSfile: array.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:31 $ +/* $RCSfile: array.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:50 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: array.c,v $ + * Revision 1.2 1995/05/30 05:02:50 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:31 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/array.h b/gnu/usr.bin/perl/perl/array.h index 9b2207be765c2..97f97a57b6035 100644 --- a/gnu/usr.bin/perl/perl/array.h +++ b/gnu/usr.bin/perl/perl/array.h @@ -1,4 +1,4 @@ -/* $RCSfile: array.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: array.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:51 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: array.h,v $ + * Revision 1.2 1995/05/30 05:02:51 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/cmd.c b/gnu/usr.bin/perl/perl/cmd.c index 162926d0a3165..345258f7d780f 100644 --- a/gnu/usr.bin/perl/perl/cmd.c +++ b/gnu/usr.bin/perl/perl/cmd.c @@ -1,4 +1,4 @@ -/* $RCSfile: cmd.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: cmd.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:52 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: cmd.c,v $ + * Revision 1.2 1995/05/30 05:02:52 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/cmd.h b/gnu/usr.bin/perl/perl/cmd.h index da0fa8e7696d0..dc23a7ead278d 100644 --- a/gnu/usr.bin/perl/perl/cmd.h +++ b/gnu/usr.bin/perl/perl/cmd.h @@ -1,4 +1,4 @@ -/* $RCSfile: cmd.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: cmd.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: cmd.h,v $ + * Revision 1.2 1995/05/30 05:02:54 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/cons.c b/gnu/usr.bin/perl/perl/cons.c index bbf783ef7843e..c7de42152a439 100644 --- a/gnu/usr.bin/perl/perl/cons.c +++ b/gnu/usr.bin/perl/perl/cons.c @@ -1,4 +1,4 @@ -/* $RCSfile: cons.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: cons.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:02:56 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: cons.c,v $ + * Revision 1.2 1995/05/30 05:02:56 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/consarg.c b/gnu/usr.bin/perl/perl/consarg.c index d0d59b73c92ab..23b664d985c6a 100644 --- a/gnu/usr.bin/perl/perl/consarg.c +++ b/gnu/usr.bin/perl/perl/consarg.c @@ -1,4 +1,4 @@ -/* $RCSfile: consarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:29 $ +/* $RCSfile: consarg.c,v $$Revision: 1.3 $$Date: 1995/05/30 05:02:57 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: consarg.c,v $ + * Revision 1.3 1995/05/30 05:02:57 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1994/09/11 03:17:29 gclarkii * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h * Added casts to shutup warnings in doio.c diff --git a/gnu/usr.bin/perl/perl/crypt.c b/gnu/usr.bin/perl/perl/crypt.c index a60c30f771f75..1ac3ea355bbd1 100644 --- a/gnu/usr.bin/perl/perl/crypt.c +++ b/gnu/usr.bin/perl/perl/crypt.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /* from static char sccsid[] = "@(#)crypt.c 5.11 (Berkeley) 6/25/91"; */ -static char rcsid[] = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/crypt.c,v 1.2 1995/05/30 05:02:58 rgrimes Exp $"; +static char rcsid[] = "$Header: /home/ncvs/src/gnu/usr.bin/perl/perl/crypt.c,v 1.2.4.1 1996/06/05 02:42:21 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/gnu/usr.bin/perl/perl/doarg.c b/gnu/usr.bin/perl/perl/doarg.c index 2a647875b536a..0f6133887619a 100644 --- a/gnu/usr.bin/perl/perl/doarg.c +++ b/gnu/usr.bin/perl/perl/doarg.c @@ -1,4 +1,4 @@ -/* $RCSfile: doarg.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:30 $ +/* $RCSfile: doarg.c,v $$Revision: 1.3 $$Date: 1995/05/30 05:02:59 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: doarg.c,v $ + * Revision 1.3 1995/05/30 05:02:59 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1994/09/11 03:17:30 gclarkii * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h * Added casts to shutup warnings in doio.c diff --git a/gnu/usr.bin/perl/perl/doio.c b/gnu/usr.bin/perl/perl/doio.c index 9c0731f6099f1..e4d17dc0339bc 100644 --- a/gnu/usr.bin/perl/perl/doio.c +++ b/gnu/usr.bin/perl/perl/doio.c @@ -1,4 +1,4 @@ -/* $RCSfile: doio.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:32 $ +/* $RCSfile: doio.c,v $$Revision: 1.3 $$Date: 1995/05/30 05:03:00 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: doio.c,v $ + * Revision 1.3 1995/05/30 05:03:00 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1994/09/11 03:17:32 gclarkii * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h * Added casts to shutup warnings in doio.c diff --git a/gnu/usr.bin/perl/perl/dolist.c b/gnu/usr.bin/perl/perl/dolist.c index 448a260ad4e74..59fac1f1e3cb7 100644 --- a/gnu/usr.bin/perl/perl/dolist.c +++ b/gnu/usr.bin/perl/perl/dolist.c @@ -1,4 +1,4 @@ -/* $RCSfile: dolist.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: dolist.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:01 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: dolist.c,v $ + * Revision 1.2 1995/05/30 05:03:01 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/dump.c b/gnu/usr.bin/perl/perl/dump.c index 7a07135efb377..e5f2865000295 100644 --- a/gnu/usr.bin/perl/perl/dump.c +++ b/gnu/usr.bin/perl/perl/dump.c @@ -1,4 +1,4 @@ -/* $RCSfile: dump.c,v $$Revision: 1.2 $$Date: 1994/09/11 03:17:33 $ +/* $RCSfile: dump.c,v $$Revision: 1.3 $$Date: 1995/05/30 05:03:02 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: dump.c,v $ + * Revision 1.3 1995/05/30 05:03:02 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1994/09/11 03:17:33 gclarkii * Changed AF_LOCAL to AF_LOCAL_XX so as not to conflict with 4.4 socket.h * Added casts to shutup warnings in doio.c diff --git a/gnu/usr.bin/perl/perl/eval.c b/gnu/usr.bin/perl/perl/eval.c index 40155f5549fca..d62e62b66a80b 100644 --- a/gnu/usr.bin/perl/perl/eval.c +++ b/gnu/usr.bin/perl/perl/eval.c @@ -1,4 +1,4 @@ -/* $RCSfile: eval.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:32 $ +/* $RCSfile: eval.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:03 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: eval.c,v $ + * Revision 1.2 1995/05/30 05:03:03 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:32 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/form.c b/gnu/usr.bin/perl/perl/form.c index cfb7aed218c83..a0d87ce3d235d 100644 --- a/gnu/usr.bin/perl/perl/form.c +++ b/gnu/usr.bin/perl/perl/form.c @@ -1,4 +1,4 @@ -/* $RCSfile: form.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: form.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:04 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: form.c,v $ + * Revision 1.2 1995/05/30 05:03:04 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/form.h b/gnu/usr.bin/perl/perl/form.h index 3f63289744cac..39d0a15f36aba 100644 --- a/gnu/usr.bin/perl/perl/form.h +++ b/gnu/usr.bin/perl/perl/form.h @@ -1,4 +1,4 @@ -/* $RCSfile: form.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: form.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:05 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: form.h,v $ + * Revision 1.2 1995/05/30 05:03:05 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/handy.h b/gnu/usr.bin/perl/perl/handy.h index df719841233bc..5509c67739c08 100644 --- a/gnu/usr.bin/perl/perl/handy.h +++ b/gnu/usr.bin/perl/perl/handy.h @@ -1,4 +1,4 @@ -/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:34 $ +/* $RCSfile: handy.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:06 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: handy.h,v $ + * Revision 1.2 1995/05/30 05:03:06 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:34 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/hash.c b/gnu/usr.bin/perl/perl/hash.c index 5d9b5940a90df..a8cd4b12e261d 100644 --- a/gnu/usr.bin/perl/perl/hash.c +++ b/gnu/usr.bin/perl/perl/hash.c @@ -1,4 +1,4 @@ -/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: hash.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:07 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.c,v $ + * Revision 1.2 1995/05/30 05:03:07 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/hash.h b/gnu/usr.bin/perl/perl/hash.h index ddf2a11b064ea..bfec83b201cdd 100644 --- a/gnu/usr.bin/perl/perl/hash.h +++ b/gnu/usr.bin/perl/perl/hash.h @@ -1,4 +1,4 @@ -/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: hash.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:08 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.h,v $ + * Revision 1.2 1995/05/30 05:03:08 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/malloc.c b/gnu/usr.bin/perl/perl/malloc.c index 5cc86d9108825..ccae6d08b6cfe 100644 --- a/gnu/usr.bin/perl/perl/malloc.c +++ b/gnu/usr.bin/perl/perl/malloc.c @@ -1,6 +1,9 @@ -/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: malloc.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:09 $ * * $Log: malloc.c,v $ + * Revision 1.2 1995/05/30 05:03:09 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/perl.1 b/gnu/usr.bin/perl/perl/perl.1 index 15791c22b6912..003e55b4b17b3 100644 --- a/gnu/usr.bin/perl/perl/perl.1 +++ b/gnu/usr.bin/perl/perl/perl.1 @@ -1,7 +1,13 @@ .rn '' }` -''' $RCSfile: perl.1,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:36 $ +''' $RCSfile: perl.1,v $$Revision: 1.2 $$Date: 1994/10/27 23:16:52 $ ''' ''' $Log: perl.1,v $ +''' Revision 1.2 1994/10/27 23:16:52 wollman +''' Convince Perl to that is is part of the system, as /usr/bin/perl (binary) +''' and /usr/share/perl (library). The latter was chosen as analogous to other +''' directories already present in /usr/share, like /usr/share/groff_font and +''' (particularly) /usr/share/mk. +''' .\" Revision 1.1.1.1 1994/09/10 06:27:36 gclarkii .\" Initial import of Perl 4.046 bmaked .\" diff --git a/gnu/usr.bin/perl/perl/perl.c b/gnu/usr.bin/perl/perl/perl.c index a4a009c30cd1b..b138cb825b38d 100644 --- a/gnu/usr.bin/perl/perl/perl.c +++ b/gnu/usr.bin/perl/perl/perl.c @@ -1,4 +1,4 @@ -char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.4.4.1 $$Date: 1996/06/08 20:18:56 $\nPatch level: ###\n"; +char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.4.4.3 $$Date: 1996/06/30 09:52:45 $\nPatch level: ###\n"; /* * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.4.4.1 $$Date: 1996/06/08 20:18: * License or the Artistic License, as specified in the README file. * * $Log: perl.c,v $ + * Revision 1.4.4.3 1996/06/30 09:52:45 joerg + * Back out the change from rev 1.4.4.2: it was unnecessary and broke + * setuid scripts. + * * Revision 1.4.4.1 1996/06/08 20:18:56 pst * Bring in changes from head * diff --git a/gnu/usr.bin/perl/perl/perl.h b/gnu/usr.bin/perl/perl/perl.h index 7693aa0c81572..25424cca7218d 100644 --- a/gnu/usr.bin/perl/perl/perl.h +++ b/gnu/usr.bin/perl/perl/perl.h @@ -1,4 +1,4 @@ -/* $RCSfile: perl.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: perl.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:11 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: perl.h,v $ + * Revision 1.2 1995/05/30 05:03:11 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/regcomp.c b/gnu/usr.bin/perl/perl/regcomp.c index 0287778f2878a..c264a8ee6e029 100644 --- a/gnu/usr.bin/perl/perl/regcomp.c +++ b/gnu/usr.bin/perl/perl/regcomp.c @@ -7,9 +7,12 @@ * blame Henry for some of the lack of readability. */ -/* $RCSfile: regcomp.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: regcomp.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:14 $ * * $Log: regcomp.c,v $ + * Revision 1.2 1995/05/30 05:03:14 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/regcomp.h b/gnu/usr.bin/perl/perl/regcomp.h index b6b8c182aa3b0..8178189d21e77 100644 --- a/gnu/usr.bin/perl/perl/regcomp.h +++ b/gnu/usr.bin/perl/perl/regcomp.h @@ -1,6 +1,9 @@ -/* $RCSfile: regcomp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: regcomp.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:15 $ * * $Log: regcomp.h,v $ + * Revision 1.2 1995/05/30 05:03:15 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/regexec.c b/gnu/usr.bin/perl/perl/regexec.c index b8353061b2565..a1f5ebb9eafa4 100644 --- a/gnu/usr.bin/perl/perl/regexec.c +++ b/gnu/usr.bin/perl/perl/regexec.c @@ -7,9 +7,12 @@ * blame Henry for some of the lack of readability. */ -/* $RCSfile: regexec.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: regexec.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:16 $ * * $Log: regexec.c,v $ + * Revision 1.2 1995/05/30 05:03:16 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/regexp.h b/gnu/usr.bin/perl/perl/regexp.h index 634b19b913cef..075db02a5dec7 100644 --- a/gnu/usr.bin/perl/perl/regexp.h +++ b/gnu/usr.bin/perl/perl/regexp.h @@ -5,9 +5,12 @@ * not the System V one. */ -/* $RCSfile: regexp.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: regexp.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:17 $ * * $Log: regexp.h,v $ + * Revision 1.2 1995/05/30 05:03:17 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/spat.h b/gnu/usr.bin/perl/perl/spat.h index 7c392b0de11a4..dea4561b1ea9d 100644 --- a/gnu/usr.bin/perl/perl/spat.h +++ b/gnu/usr.bin/perl/perl/spat.h @@ -1,4 +1,4 @@ -/* $RCSfile: spat.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: spat.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:18 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: spat.h,v $ + * Revision 1.2 1995/05/30 05:03:18 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/stab.c b/gnu/usr.bin/perl/perl/stab.c index e34aa94028b78..bcc1a61dac8f4 100644 --- a/gnu/usr.bin/perl/perl/stab.c +++ b/gnu/usr.bin/perl/perl/stab.c @@ -1,4 +1,4 @@ -/* $RCSfile: stab.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: stab.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:19 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: stab.c,v $ + * Revision 1.2 1995/05/30 05:03:19 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/stab.h b/gnu/usr.bin/perl/perl/stab.h index 9da5a4ac5282e..097657549df9a 100644 --- a/gnu/usr.bin/perl/perl/stab.h +++ b/gnu/usr.bin/perl/perl/stab.h @@ -1,4 +1,4 @@ -/* $RCSfile: stab.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: stab.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:20 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: stab.h,v $ + * Revision 1.2 1995/05/30 05:03:20 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/str.c b/gnu/usr.bin/perl/perl/str.c index 0f8b36d793c7b..216da34f197dc 100644 --- a/gnu/usr.bin/perl/perl/str.c +++ b/gnu/usr.bin/perl/perl/str.c @@ -1,4 +1,4 @@ -/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $ +/* $RCSfile: str.c,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:21 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.c,v $ + * Revision 1.2 1995/05/30 05:03:21 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:33 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/str.h b/gnu/usr.bin/perl/perl/str.h index 8e95749e246ac..b318add1afb39 100644 --- a/gnu/usr.bin/perl/perl/str.h +++ b/gnu/usr.bin/perl/perl/str.h @@ -1,4 +1,4 @@ -/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:35 $ +/* $RCSfile: str.h,v $$Revision: 1.2 $$Date: 1995/05/30 05:03:22 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.h,v $ + * Revision 1.2 1995/05/30 05:03:22 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/10 06:27:35 gclarkii * Initial import of Perl 4.046 bmaked * diff --git a/gnu/usr.bin/perl/perl/t/TEST b/gnu/usr.bin/perl/perl/t/TEST index 957a868c5cdd4..445ab6c4f74a6 100755 --- a/gnu/usr.bin/perl/perl/t/TEST +++ b/gnu/usr.bin/perl/perl/t/TEST @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: TEST,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:01 $ +# $RCSfile: TEST,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:38 $ # This is written in a peculiar style, since we're trying to avoid # most of the constructs we'll be testing for. diff --git a/gnu/usr.bin/perl/perl/t/base/cond.t b/gnu/usr.bin/perl/perl/t/base/cond.t index 69b687033d5ea..70474c3624318 100755 --- a/gnu/usr.bin/perl/perl/t/base/cond.t +++ b/gnu/usr.bin/perl/perl/t/base/cond.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/base/cond.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/base/cond.t,v 1.1.1.1.6.1 1996/06/05 02:42:22 jkh Exp $ # make sure conditional operators work diff --git a/gnu/usr.bin/perl/perl/t/base/if.t b/gnu/usr.bin/perl/perl/t/base/if.t index 2635eb0d97a1a..3ac68342addad 100755 --- a/gnu/usr.bin/perl/perl/t/base/if.t +++ b/gnu/usr.bin/perl/perl/t/base/if.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/base/if.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/base/if.t,v 1.1.1.1.6.1 1996/06/05 02:42:23 jkh Exp $ print "1..2\n"; diff --git a/gnu/usr.bin/perl/perl/t/base/lex.t b/gnu/usr.bin/perl/perl/t/base/lex.t index 0c59d8ab84d79..983a5e6729c59 100755 --- a/gnu/usr.bin/perl/perl/t/base/lex.t +++ b/gnu/usr.bin/perl/perl/t/base/lex.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/base/lex.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/base/lex.t,v 1.1.1.1.6.1 1996/06/05 02:42:24 jkh Exp $ print "1..18\n"; diff --git a/gnu/usr.bin/perl/perl/t/base/pat.t b/gnu/usr.bin/perl/perl/t/base/pat.t index 95d9aca91670a..a4119ac4652f5 100755 --- a/gnu/usr.bin/perl/perl/t/base/pat.t +++ b/gnu/usr.bin/perl/perl/t/base/pat.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/base/pat.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/base/pat.t,v 1.1.1.1.6.1 1996/06/05 02:42:24 jkh Exp $ print "1..2\n"; diff --git a/gnu/usr.bin/perl/perl/t/base/term.t b/gnu/usr.bin/perl/perl/t/base/term.t index ed057f69e7c6a..40a2c694b17e5 100755 --- a/gnu/usr.bin/perl/perl/t/base/term.t +++ b/gnu/usr.bin/perl/perl/t/base/term.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/base/term.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/base/term.t,v 1.1.1.1.6.1 1996/06/05 02:42:25 jkh Exp $ print "1..6\n"; diff --git a/gnu/usr.bin/perl/perl/t/cmd/elsif.t b/gnu/usr.bin/perl/perl/t/cmd/elsif.t index a80983e02c049..1d0a6d1c6a29f 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/elsif.t +++ b/gnu/usr.bin/perl/perl/t/cmd/elsif.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/cmd/elsif.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/cmd/elsif.t,v 1.1.1.1.6.1 1996/06/05 02:42:27 jkh Exp $ sub foo { if ($_[0] == 1) { diff --git a/gnu/usr.bin/perl/perl/t/cmd/for.t b/gnu/usr.bin/perl/perl/t/cmd/for.t index dc0ffcd68bdc2..ec9c34472fef9 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/for.t +++ b/gnu/usr.bin/perl/perl/t/cmd/for.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/cmd/for.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/cmd/for.t,v 1.1.1.1.6.1 1996/06/05 02:42:28 jkh Exp $ print "1..7\n"; diff --git a/gnu/usr.bin/perl/perl/t/cmd/mod.t b/gnu/usr.bin/perl/perl/t/cmd/mod.t index 7117ff6c2d1a5..d03cea6da531d 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/mod.t +++ b/gnu/usr.bin/perl/perl/t/cmd/mod.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/cmd/mod.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/cmd/mod.t,v 1.1.1.1.6.1 1996/06/05 02:42:29 jkh Exp $ print "1..7\n"; diff --git a/gnu/usr.bin/perl/perl/t/cmd/subval.t b/gnu/usr.bin/perl/perl/t/cmd/subval.t index f7f411b34ab13..e7795f931223c 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/subval.t +++ b/gnu/usr.bin/perl/perl/t/cmd/subval.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: subval.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:05 $ +# $RCSfile: subval.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:39 $ sub foo1 { 'true1'; diff --git a/gnu/usr.bin/perl/perl/t/cmd/switch.t b/gnu/usr.bin/perl/perl/t/cmd/switch.t index fd33fc0a25b08..cc891cbf0046e 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/switch.t +++ b/gnu/usr.bin/perl/perl/t/cmd/switch.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/cmd/switch.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/cmd/switch.t,v 1.1.1.1.6.1 1996/06/05 02:42:29 jkh Exp $ print "1..18\n"; diff --git a/gnu/usr.bin/perl/perl/t/cmd/while.t b/gnu/usr.bin/perl/perl/t/cmd/while.t index 824c4d46d4e1f..36f9a9f14190f 100755 --- a/gnu/usr.bin/perl/perl/t/cmd/while.t +++ b/gnu/usr.bin/perl/perl/t/cmd/while.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/cmd/while.t,v 1.1.1.1 1994/09/10 06:27:39 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/cmd/while.t,v 1.1.1.1.6.1 1996/06/05 02:42:30 jkh Exp $ print "1..10\n"; diff --git a/gnu/usr.bin/perl/perl/t/comp/cmdopt.t b/gnu/usr.bin/perl/perl/t/comp/cmdopt.t index f2eed8b37401a..62f935a4eb67e 100755 --- a/gnu/usr.bin/perl/perl/t/comp/cmdopt.t +++ b/gnu/usr.bin/perl/perl/t/comp/cmdopt.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/comp/cmdopt.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/comp/cmdopt.t,v 1.1.1.1.6.1 1996/06/05 02:42:32 jkh Exp $ print "1..40\n"; diff --git a/gnu/usr.bin/perl/perl/t/comp/cpp.t b/gnu/usr.bin/perl/perl/t/comp/cpp.t index 8cceb73ca8a04..656ea25d3918f 100755 --- a/gnu/usr.bin/perl/perl/t/comp/cpp.t +++ b/gnu/usr.bin/perl/perl/t/comp/cpp.t @@ -1,6 +1,6 @@ #!./perl -P -# $RCSfile: cpp.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:06 $ +# $RCSfile: cpp.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:40 $ open(CONFIG,"../config.sh") || die; while () { diff --git a/gnu/usr.bin/perl/perl/t/comp/decl.t b/gnu/usr.bin/perl/perl/t/comp/decl.t index 3158a64000cb5..fdca18d0dcf5d 100755 --- a/gnu/usr.bin/perl/perl/t/comp/decl.t +++ b/gnu/usr.bin/perl/perl/t/comp/decl.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/comp/decl.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/comp/decl.t,v 1.1.1.1.6.1 1996/06/05 02:42:33 jkh Exp $ # check to see if subroutine declarations work everwhere diff --git a/gnu/usr.bin/perl/perl/t/comp/multiline.t b/gnu/usr.bin/perl/perl/t/comp/multiline.t index eb404c0355c34..3835dac016022 100755 --- a/gnu/usr.bin/perl/perl/t/comp/multiline.t +++ b/gnu/usr.bin/perl/perl/t/comp/multiline.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/comp/multiline.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/comp/multiline.t,v 1.1.1.1.6.1 1996/06/05 02:42:34 jkh Exp $ print "1..5\n"; diff --git a/gnu/usr.bin/perl/perl/t/comp/script.t b/gnu/usr.bin/perl/perl/t/comp/script.t index c2f6163f0a061..7f6b24ca42510 100755 --- a/gnu/usr.bin/perl/perl/t/comp/script.t +++ b/gnu/usr.bin/perl/perl/t/comp/script.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/comp/script.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/comp/script.t,v 1.1.1.1.6.1 1996/06/05 02:42:36 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/comp/term.t b/gnu/usr.bin/perl/perl/t/comp/term.t index d8ce0adb061ca..e3c5d77011665 100755 --- a/gnu/usr.bin/perl/perl/t/comp/term.t +++ b/gnu/usr.bin/perl/perl/t/comp/term.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/comp/term.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/comp/term.t,v 1.1.1.1.6.1 1996/06/05 02:42:37 jkh Exp $ # tests that aren't important enough for base.term diff --git a/gnu/usr.bin/perl/perl/t/io/argv.t b/gnu/usr.bin/perl/perl/t/io/argv.t index e0db31da8a347..13f99ef590479 100755 --- a/gnu/usr.bin/perl/perl/t/io/argv.t +++ b/gnu/usr.bin/perl/perl/t/io/argv.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/argv.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/argv.t,v 1.1.1.1.6.1 1996/06/05 02:42:41 jkh Exp $ print "1..5\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/dup.t b/gnu/usr.bin/perl/perl/t/io/dup.t index 5462c368e60ed..93365984cad82 100755 --- a/gnu/usr.bin/perl/perl/t/io/dup.t +++ b/gnu/usr.bin/perl/perl/t/io/dup.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/dup.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/dup.t,v 1.1.1.1.6.1 1996/06/05 02:42:41 jkh Exp $ print "1..6\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/fs.t b/gnu/usr.bin/perl/perl/t/io/fs.t index 1d95cdc3530cc..95f85d5572b31 100755 --- a/gnu/usr.bin/perl/perl/t/io/fs.t +++ b/gnu/usr.bin/perl/perl/t/io/fs.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: fs.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:05 $ +# $RCSfile: fs.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:40 $ print "1..22\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/inplace.t b/gnu/usr.bin/perl/perl/t/io/inplace.t index 3cd4c06a86320..b73ba50f1f5fa 100755 --- a/gnu/usr.bin/perl/perl/t/io/inplace.t +++ b/gnu/usr.bin/perl/perl/t/io/inplace.t @@ -2,7 +2,7 @@ $^I = '.bak'; -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/inplace.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/inplace.t,v 1.1.1.1.6.1 1996/06/05 02:42:42 jkh Exp $ print "1..2\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/pipe.t b/gnu/usr.bin/perl/perl/t/io/pipe.t index 371d85881c3c0..7ce0f25a807b2 100755 --- a/gnu/usr.bin/perl/perl/t/io/pipe.t +++ b/gnu/usr.bin/perl/perl/t/io/pipe.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/pipe.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/pipe.t,v 1.1.1.1.6.1 1996/06/05 02:42:43 jkh Exp $ $| = 1; print "1..8\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/print.t b/gnu/usr.bin/perl/perl/t/io/print.t index 67a71c05a2c28..2f31918dd7f12 100755 --- a/gnu/usr.bin/perl/perl/t/io/print.t +++ b/gnu/usr.bin/perl/perl/t/io/print.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/print.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/print.t,v 1.1.1.1.6.1 1996/06/05 02:42:45 jkh Exp $ print "1..16\n"; diff --git a/gnu/usr.bin/perl/perl/t/io/tell.t b/gnu/usr.bin/perl/perl/t/io/tell.t index 3943b68f41cc0..993d599900cb3 100755 --- a/gnu/usr.bin/perl/perl/t/io/tell.t +++ b/gnu/usr.bin/perl/perl/t/io/tell.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/io/tell.t,v 1.1.1.1 1994/09/10 06:27:40 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/io/tell.t,v 1.1.1.1.6.1 1996/06/05 02:42:45 jkh Exp $ print "1..13\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/append.t b/gnu/usr.bin/perl/perl/t/op/append.t index 38f8627bf7de9..0eb6d02e5813b 100755 --- a/gnu/usr.bin/perl/perl/t/op/append.t +++ b/gnu/usr.bin/perl/perl/t/op/append.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/append.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/append.t,v 1.1.1.1.6.1 1996/06/05 02:42:49 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/array.t b/gnu/usr.bin/perl/perl/t/op/array.t index 8e7b5b9ce0c4d..c5ac1896ff899 100755 --- a/gnu/usr.bin/perl/perl/t/op/array.t +++ b/gnu/usr.bin/perl/perl/t/op/array.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/array.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/array.t,v 1.1.1.1.6.1 1996/06/05 02:42:50 jkh Exp $ print "1..36\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/auto.t b/gnu/usr.bin/perl/perl/t/op/auto.t index 9ea0aa86186da..e8a534b9dbb45 100755 --- a/gnu/usr.bin/perl/perl/t/op/auto.t +++ b/gnu/usr.bin/perl/perl/t/op/auto.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/auto.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/auto.t,v 1.1.1.1.6.1 1996/06/05 02:42:52 jkh Exp $ print "1..34\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/chop.t b/gnu/usr.bin/perl/perl/t/op/chop.t index 89c9411e147fa..b118d30997fc8 100755 --- a/gnu/usr.bin/perl/perl/t/op/chop.t +++ b/gnu/usr.bin/perl/perl/t/op/chop.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/chop.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/chop.t,v 1.1.1.1.6.1 1996/06/05 02:42:53 jkh Exp $ print "1..4\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/cond.t b/gnu/usr.bin/perl/perl/t/op/cond.t index a263acd57d8b6..7d2db496735b4 100755 --- a/gnu/usr.bin/perl/perl/t/op/cond.t +++ b/gnu/usr.bin/perl/perl/t/op/cond.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/cond.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/cond.t,v 1.1.1.1.6.1 1996/06/05 02:42:55 jkh Exp $ print "1..4\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/dbm.t b/gnu/usr.bin/perl/perl/t/op/dbm.t index 23d4d98c9412f..f5bd08e15690a 100755 --- a/gnu/usr.bin/perl/perl/t/op/dbm.t +++ b/gnu/usr.bin/perl/perl/t/op/dbm.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: dbm.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:02 $ +# $RCSfile: dbm.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:41 $ if (!-r '/usr/include/dbm.h' && !-r '/usr/include/ndbm.h' && !-r '/usr/include/rpcsvc/dbm.h') { diff --git a/gnu/usr.bin/perl/perl/t/op/delete.t b/gnu/usr.bin/perl/perl/t/op/delete.t index 4796f2294b46b..8c79aad35b814 100755 --- a/gnu/usr.bin/perl/perl/t/op/delete.t +++ b/gnu/usr.bin/perl/perl/t/op/delete.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/delete.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/delete.t,v 1.1.1.1.6.1 1996/06/05 02:42:55 jkh Exp $ print "1..6\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/do.t b/gnu/usr.bin/perl/perl/t/op/do.t index ca52c0970b7a1..575c597cecad5 100755 --- a/gnu/usr.bin/perl/perl/t/op/do.t +++ b/gnu/usr.bin/perl/perl/t/op/do.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/do.t,v 1.1.1.1 1994/09/10 06:27:41 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/do.t,v 1.1.1.1.6.1 1996/06/05 02:42:56 jkh Exp $ sub foo1 { diff --git a/gnu/usr.bin/perl/perl/t/op/each.t b/gnu/usr.bin/perl/perl/t/op/each.t index 2057b85a10a2d..ef1357b57ca52 100755 --- a/gnu/usr.bin/perl/perl/t/op/each.t +++ b/gnu/usr.bin/perl/perl/t/op/each.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/each.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/each.t,v 1.1.1.1.6.1 1996/06/05 02:42:57 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/eval.t b/gnu/usr.bin/perl/perl/t/op/eval.t index b21b44d8354c9..bb3bf1297a22b 100755 --- a/gnu/usr.bin/perl/perl/t/op/eval.t +++ b/gnu/usr.bin/perl/perl/t/op/eval.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: eval.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:02 $ +# $RCSfile: eval.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:42 $ print "1..16\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/exec.t b/gnu/usr.bin/perl/perl/t/op/exec.t index e573830b9f785..08fd47df4c68c 100755 --- a/gnu/usr.bin/perl/perl/t/op/exec.t +++ b/gnu/usr.bin/perl/perl/t/op/exec.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/exec.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/exec.t,v 1.1.1.1.6.1 1996/06/05 02:42:58 jkh Exp $ $| = 1; # flush stdout print "1..8\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/exp.t b/gnu/usr.bin/perl/perl/t/op/exp.t index f3c8d2e3c36d5..8d92ec069b687 100755 --- a/gnu/usr.bin/perl/perl/t/op/exp.t +++ b/gnu/usr.bin/perl/perl/t/op/exp.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/exp.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/exp.t,v 1.1.1.1.6.1 1996/06/05 02:42:58 jkh Exp $ print "1..6\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/flip.t b/gnu/usr.bin/perl/perl/t/op/flip.t index a2f2dbed94b13..c9f57a492114a 100755 --- a/gnu/usr.bin/perl/perl/t/op/flip.t +++ b/gnu/usr.bin/perl/perl/t/op/flip.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/flip.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/flip.t,v 1.1.1.1.6.1 1996/06/05 02:42:59 jkh Exp $ print "1..8\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/fork.t b/gnu/usr.bin/perl/perl/t/op/fork.t index 9a7df615b1252..39c5af5a4ee9d 100755 --- a/gnu/usr.bin/perl/perl/t/op/fork.t +++ b/gnu/usr.bin/perl/perl/t/op/fork.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/fork.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/fork.t,v 1.1.1.1.6.1 1996/06/05 02:43:00 jkh Exp $ $| = 1; print "1..2\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/glob.t b/gnu/usr.bin/perl/perl/t/op/glob.t index e1afdde5e8f24..d239b7309bfac 100755 --- a/gnu/usr.bin/perl/perl/t/op/glob.t +++ b/gnu/usr.bin/perl/perl/t/op/glob.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/glob.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/glob.t,v 1.1.1.1.6.1 1996/06/05 02:43:00 jkh Exp $ print "1..4\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/goto.t b/gnu/usr.bin/perl/perl/t/op/goto.t index 44ef343201e44..8bd9ace214bba 100755 --- a/gnu/usr.bin/perl/perl/t/op/goto.t +++ b/gnu/usr.bin/perl/perl/t/op/goto.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: goto.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:03 $ +# $RCSfile: goto.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:42 $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/index.t b/gnu/usr.bin/perl/perl/t/op/index.t index 82ee079975863..4cd7a65e12ca3 100755 --- a/gnu/usr.bin/perl/perl/t/op/index.t +++ b/gnu/usr.bin/perl/perl/t/op/index.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/index.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/index.t,v 1.1.1.1.6.1 1996/06/05 02:43:01 jkh Exp $ print "1..20\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/int.t b/gnu/usr.bin/perl/perl/t/op/int.t index be87f5f92f9c8..7498c9e1608a8 100755 --- a/gnu/usr.bin/perl/perl/t/op/int.t +++ b/gnu/usr.bin/perl/perl/t/op/int.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/int.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/int.t,v 1.1.1.1.6.1 1996/06/05 02:43:02 jkh Exp $ print "1..4\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/join.t b/gnu/usr.bin/perl/perl/t/op/join.t index 8b46640105bb5..a8b4e5151ca01 100755 --- a/gnu/usr.bin/perl/perl/t/op/join.t +++ b/gnu/usr.bin/perl/perl/t/op/join.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/join.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/join.t,v 1.1.1.1.6.1 1996/06/05 02:43:03 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/list.t b/gnu/usr.bin/perl/perl/t/op/list.t index c1d03b425be37..8fd404b687076 100755 --- a/gnu/usr.bin/perl/perl/t/op/list.t +++ b/gnu/usr.bin/perl/perl/t/op/list.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/list.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/list.t,v 1.1.1.1.6.1 1996/06/05 02:43:03 jkh Exp $ print "1..27\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/local.t b/gnu/usr.bin/perl/perl/t/op/local.t index d2d1224f88613..3d8055f2bbf27 100755 --- a/gnu/usr.bin/perl/perl/t/op/local.t +++ b/gnu/usr.bin/perl/perl/t/op/local.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/local.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/local.t,v 1.1.1.1.6.1 1996/06/05 02:43:04 jkh Exp $ print "1..20\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/magic.t b/gnu/usr.bin/perl/perl/t/op/magic.t index da9eb7e9a18a1..2f210084b38aa 100755 --- a/gnu/usr.bin/perl/perl/t/op/magic.t +++ b/gnu/usr.bin/perl/perl/t/op/magic.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/magic.t,v 1.1.1.1 1994/09/10 06:27:42 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/magic.t,v 1.1.1.1.6.1 1996/06/05 02:43:05 jkh Exp $ $| = 1; # command buffering diff --git a/gnu/usr.bin/perl/perl/t/op/mkdir.t b/gnu/usr.bin/perl/perl/t/op/mkdir.t index ba9d400f724e2..0af5044a59bac 100755 --- a/gnu/usr.bin/perl/perl/t/op/mkdir.t +++ b/gnu/usr.bin/perl/perl/t/op/mkdir.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/mkdir.t,v 1.1.1.1 1994/09/10 06:27:43 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/mkdir.t,v 1.1.1.1.6.1 1996/06/05 02:43:06 jkh Exp $ print "1..7\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/oct.t b/gnu/usr.bin/perl/perl/t/op/oct.t index 351cc68e4a094..5bfe58493a091 100755 --- a/gnu/usr.bin/perl/perl/t/op/oct.t +++ b/gnu/usr.bin/perl/perl/t/op/oct.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/oct.t,v 1.1.1.1 1994/09/10 06:27:43 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/oct.t,v 1.1.1.1.6.1 1996/06/05 02:43:06 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/ord.t b/gnu/usr.bin/perl/perl/t/op/ord.t index 0ee5610c04ca7..3eda1378b01bd 100755 --- a/gnu/usr.bin/perl/perl/t/op/ord.t +++ b/gnu/usr.bin/perl/perl/t/op/ord.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/ord.t,v 1.1.1.1 1994/09/10 06:27:43 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/ord.t,v 1.1.1.1.6.1 1996/06/05 02:43:07 jkh Exp $ print "1..2\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/pack.t b/gnu/usr.bin/perl/perl/t/op/pack.t index 2b81445f66306..33a72bd747b94 100755 --- a/gnu/usr.bin/perl/perl/t/op/pack.t +++ b/gnu/usr.bin/perl/perl/t/op/pack.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/pack.t,v 1.1.1.1 1994/09/10 06:27:43 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/pack.t,v 1.1.1.1.6.1 1996/06/05 02:43:08 jkh Exp $ print "1..3\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/pat.t b/gnu/usr.bin/perl/perl/t/op/pat.t index ce9f35c6ee668..c6d6a50f86324 100755 --- a/gnu/usr.bin/perl/perl/t/op/pat.t +++ b/gnu/usr.bin/perl/perl/t/op/pat.t @@ -1,6 +1,6 @@ #!./perl -# $RCSfile: pat.t,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:01 $ +# $RCSfile: pat.t,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:43 $ print "1..51\n"; diff --git a/gnu/usr.bin/perl/perl/t/op/push.t b/gnu/usr.bin/perl/perl/t/op/push.t index 893bc16b6eb6e..fe39b1a8969fe 100755 --- a/gnu/usr.bin/perl/perl/t/op/push.t +++ b/gnu/usr.bin/perl/perl/t/op/push.t @@ -1,6 +1,6 @@ #!./perl -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/perl/perl/t/op/push.t,v 1.1.1.1 1994/09/10 06:27:43 gclarkii Exp $ +# $Header: /home/ncvs/src/gnu/usr.bin/perl/perl/t/op/push.t,v 1.1.1.1.6.1 1996/06/05 02:43:08 jkh Exp $ @tests = split(/\n/, < while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -98,7 +98,7 @@ extern struct tm *localtime(); #if !defined(lint) && !defined(SABER) static char RCS[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/usr.bin/tar/getdate.y,v 1.2 1994/11/04 02:12:22 jkh Exp $"; + "$Header: /home/ncvs/src/gnu/usr.bin/tar/getdate.y,v 1.2.6.1 1996/06/05 02:43:50 jkh Exp $"; #endif /* !defined(lint) && !defined(SABER) */ diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1 index f2ade73b05a98..40cc9d1f852a1 100644 --- a/gnu/usr.bin/tar/tar.1 +++ b/gnu/usr.bin/tar/tar.1 @@ -3,7 +3,7 @@ .\" .\" Written by John F. Woods .\" -.\" $Id: tar.1,v 1.3 1995/04/10 11:47:34 jkh Exp $ +.\" $Id: tar.1,v 1.3.4.2 1996/06/05 02:43:51 jkh Exp $ .\" .Dd 6 August 1994 .Os FreeBSD diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index 172255cc53c12..8412b422c6891 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -1,6 +1,6 @@ # # Bmake file for texinfo -# $Id: Makefile,v 1.2 1994/09/15 12:09:35 jkh Exp $ +# $Id: Makefile,v 1.3 1995/01/22 22:44:45 ache Exp $ # SUBDIR= info info-files makedoc makeinfo texindex doc diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index 2aa30701b8039..9c5689b264346 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -1,5 +1,5 @@ # Texinfo defaults. -# $Id: Makefile.inc,v 1.2 1994/09/15 12:09:36 jkh Exp $ +# $Id: Makefile.inc,v 1.2.6.2 1996/06/05 02:43:55 jkh Exp $ INFODIR?= /usr/share/info diff --git a/gnu/usr.bin/texinfo/makedoc/Makefile b/gnu/usr.bin/texinfo/makedoc/Makefile index d97ec098c31c8..08291ba44bde1 100644 --- a/gnu/usr.bin/texinfo/makedoc/Makefile +++ b/gnu/usr.bin/texinfo/makedoc/Makefile @@ -1,7 +1,7 @@ # # Bmakefile for GNU info # -# $Id: Makefile,v 1.2 1994/09/15 13:10:41 jkh Exp $ +# $Id: Makefile,v 1.3 1995/05/30 05:05:09 rgrimes Exp $ # PROG= makedoc diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index e102200dc7ae3..b933c9410429a 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,7 +1,7 @@ # # Bmakefile for GNU info # -# $Id: Makefile,v 1.2 1994/09/15 13:11:36 jkh Exp $ +# $Id: Makefile,v 1.3 1995/05/30 05:05:12 rgrimes Exp $ # PROG= makeinfo diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile index aee14dfc9d091..0e52b27b83d95 100644 --- a/gnu/usr.bin/texinfo/texindex/Makefile +++ b/gnu/usr.bin/texinfo/texindex/Makefile @@ -1,7 +1,7 @@ # # Bmakefile for GNU info # -# $Id: Makefile,v 1.2 1994/09/15 13:12:23 jkh Exp $ +# $Id: Makefile,v 1.3 1995/05/30 05:05:18 rgrimes Exp $ # PROG= texindex diff --git a/gnu/usr.bin/yppush/Makefile b/gnu/usr.bin/yppush/Makefile index 374760aa302ce..dcee477ec8718 100644 --- a/gnu/usr.bin/yppush/Makefile +++ b/gnu/usr.bin/yppush/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.7 1995/05/30 05:05:19 rgrimes Exp $ +# $Id: Makefile,v 1.7.4.1 1995/08/30 07:16:34 davidg Exp $ PROG= yppush SRCS= yp_clnt.c yppush.c diff --git a/gnu/usr.bin/yppush/yppush.8 b/gnu/usr.bin/yppush/yppush.8 index 92e140540b025..5a2c455377966 100644 --- a/gnu/usr.bin/yppush/yppush.8 +++ b/gnu/usr.bin/yppush/yppush.8 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: yppush.8,v 1.1 1995/02/05 21:48:04 wpaul Exp $ .\" .Dd February 5, 1995 .Dt YPPUSH 8 diff --git a/gnu/usr.bin/yppush/yppush.c b/gnu/usr.bin/yppush/yppush.c index aca50af6464a1..3d026f43fe542 100644 --- a/gnu/usr.bin/yppush/yppush.c +++ b/gnu/usr.bin/yppush/yppush.c @@ -18,7 +18,7 @@ Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu) - $Id: yppush.c,v 1.6.2.1 1995/06/04 17:15:49 davidg Exp $ + $Id: yppush.c,v 1.7 1995/06/11 19:28:55 rgrimes Exp $ */ #include diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile index 015692ca153a6..48e16f6ce2e69 100644 --- a/gnu/usr.sbin/Makefile +++ b/gnu/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/01/31 09:14:01 wpaul Exp $ +# $Id: Makefile,v 1.1.4.2 1996/06/05 02:44:06 jkh Exp $ SUBDIR= yppasswdd ypserv yp_mkdb diff --git a/gnu/usr.sbin/Makefile.inc b/gnu/usr.sbin/Makefile.inc index 1fa8c0e074f63..dce1db05c712b 100644 --- a/gnu/usr.sbin/Makefile.inc +++ b/gnu/usr.sbin/Makefile.inc @@ -1,3 +1,3 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1995/01/31 09:14:03 wpaul Exp $ BINDIR?= /usr/sbin diff --git a/gnu/usr.sbin/isdn/dbg/dbg.c b/gnu/usr.sbin/isdn/dbg/dbg.c index b57b5c7899f7b..73d2420e60208 100644 --- a/gnu/usr.sbin/isdn/dbg/dbg.c +++ b/gnu/usr.sbin/isdn/dbg/dbg.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: dbg.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: dbg.c,v 1.1.1.1 1995/02/15 00:46:20 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: dbg.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr * ******************************************************************************* * $Log: dbg.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:20 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/dbg/dbg_3008.c b/gnu/usr.sbin/isdn/dbg/dbg_3008.c index 945257290f373..fdcf8bbae1d4e 100644 --- a/gnu/usr.sbin/isdn/dbg/dbg_3008.c +++ b/gnu/usr.sbin/isdn/dbg/dbg_3008.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: dbg_3008.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: dbg_3008.c,v 1.1.1.1 1995/02/15 00:46:20 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: dbg_3008.c,v 1.1 1995/01/25 14:06:18 jkr Exp * ******************************************************************************* * $Log: dbg_3008.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:20 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/dbg/dbg_3009.c b/gnu/usr.sbin/isdn/dbg/dbg_3009.c index eee5932dc5d13..9857f98f2236e 100644 --- a/gnu/usr.sbin/isdn/dbg/dbg_3009.c +++ b/gnu/usr.sbin/isdn/dbg/dbg_3009.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: dbg_3009.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: dbg_3009.c,v 1.1.1.1 1995/02/15 00:46:20 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: dbg_3009.c,v 1.1 1995/01/25 14:06:18 jkr Exp * ******************************************************************************* * $Log: dbg_3009.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:20 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/dbg/dbg_5000.c b/gnu/usr.sbin/isdn/dbg/dbg_5000.c index 8711232a7dfaa..e95119a2e5da1 100644 --- a/gnu/usr.sbin/isdn/dbg/dbg_5000.c +++ b/gnu/usr.sbin/isdn/dbg/dbg_5000.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: dbg_5000.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: dbg_5000.c,v 1.1.1.1 1995/02/15 00:46:20 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: dbg_5000.c,v 1.1 1995/01/25 14:06:18 jkr Exp * ******************************************************************************* * $Log: dbg_5000.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:20 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/iid/Changes b/gnu/usr.sbin/isdn/iid/Changes index 49b1bbbd5dec5..fbc3bfe6a9890 100644 --- a/gnu/usr.sbin/isdn/iid/Changes +++ b/gnu/usr.sbin/isdn/iid/Changes @@ -1,11 +1,11 @@ 1c1 -< static char rcsid[] = "@(#)$Id: iid.c,v 1.1 1994/12/19 07:25:48 jkr Exp $"; +< static char rcsid[] = "@(#)$Id: Changes,v 1.1.1.1 1995/02/15 00:46:21 jkh Exp $"; --- -> static char rcsid[] = "@(#)$Id: iid.c,v 1.2 1994/12/22 16:53:13 jkr Exp $"; +> static char rcsid[] = "@(#)$Id: Changes,v 1.1.1.1 1995/02/15 00:46:21 jkh Exp $"; 3c3 -< * ISDN System - $Revision: 1.1 $ $State: Exp $ +< * ISDN System - $Revision: 1.1.1.1 $ $State: Exp $ --- -> * ISDN System - $Revision: 1.2 $ $State: Exp $ +> * ISDN System - $Revision: 1.1.1.1 $ $State: Exp $ 13a14,17 > * Revision 1.2 1994/12/22 16:53:13 jkr > * changes for rescan/signal diff --git a/gnu/usr.sbin/isdn/iid/iid.c b/gnu/usr.sbin/isdn/iid/iid.c index 11b8c36b81280..ead30fcfa9522 100644 --- a/gnu/usr.sbin/isdn/iid/iid.c +++ b/gnu/usr.sbin/isdn/iid/iid.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: iid.c,v 1.4 1995/01/25 13:42:33 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: iid.c,v 1.1.1.1 1995/02/15 00:46:20 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.4 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: iid.c,v 1.4 1995/01/25 13:42:33 jkr Exp jkr * ******************************************************************************* * $Log: iid.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:20 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/ispy/ispy.c b/gnu/usr.sbin/isdn/ispy/ispy.c index 5c2ac5a7477b4..1e443e082639b 100644 --- a/gnu/usr.sbin/isdn/ispy/ispy.c +++ b/gnu/usr.sbin/isdn/ispy/ispy.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: ispy.c,v 1.2 1995/01/25 13:41:55 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: ispy.c,v 1.1.1.1 1995/02/15 00:46:22 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: ispy.c,v 1.2 1995/01/25 13:41:55 jkr Exp jkr * ******************************************************************************* * $Log: ispy.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:22 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/itel/iteld.c b/gnu/usr.sbin/isdn/itel/iteld.c index 8df099c109a70..6f017d27c0504 100644 --- a/gnu/usr.sbin/isdn/itel/iteld.c +++ b/gnu/usr.sbin/isdn/itel/iteld.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: iteld.c,v 1.2 1995/01/25 13:58:28 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: iteld.c,v 1.1.1.1 1995/02/15 00:46:19 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: iteld.c,v 1.2 1995/01/25 13:58:28 jkr Exp jk * ******************************************************************************* * $Log: iteld.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:19 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/ittd/ittd.c b/gnu/usr.sbin/isdn/ittd/ittd.c index efb152a72051d..b10c5d99815bd 100644 --- a/gnu/usr.sbin/isdn/ittd/ittd.c +++ b/gnu/usr.sbin/isdn/ittd/ittd.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: ittd.c,v 1.2 1995/01/25 14:01:28 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: ittd.c,v 1.1.1.1 1995/02/15 00:46:23 jkh Exp $"; /******************************************************************************* - * II Version 0.1 - $Revision: 1.2 $ $State: Exp $ + * II Version 0.1 - $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: ittd.c,v 1.2 1995/01/25 14:01:28 jkr Exp jkr * ******************************************************************************* * $Log: ittd.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:23 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/load/load.c b/gnu/usr.sbin/isdn/load/load.c index fa9e6001e378d..fb7b1f7eed7da 100644 --- a/gnu/usr.sbin/isdn/load/load.c +++ b/gnu/usr.sbin/isdn/load/load.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: load.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: load.c,v 1.1.1.1 1995/02/15 00:46:23 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: load.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr * ******************************************************************************* * $Log: load.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:23 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/misc/stime.c b/gnu/usr.sbin/isdn/misc/stime.c index 5eb21d4eaf1a3..6d6496210acf8 100644 --- a/gnu/usr.sbin/isdn/misc/stime.c +++ b/gnu/usr.sbin/isdn/misc/stime.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: stime.c,v 1.1 1995/01/25 14:14:58 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: stime.c,v 1.1.1.1 1995/02/15 00:46:19 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: stime.c,v 1.1 1995/01/25 14:14:58 jkr Exp jk * ******************************************************************************* * $Log: stime.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:19 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/misc/tst.c b/gnu/usr.sbin/isdn/misc/tst.c index 535de1eab73e6..9e2b7d4fce15f 100644 --- a/gnu/usr.sbin/isdn/misc/tst.c +++ b/gnu/usr.sbin/isdn/misc/tst.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: tst.c,v 1.1 1995/01/25 14:14:58 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: tst.c,v 1.1.1.1 1995/02/15 00:46:19 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: tst.c,v 1.1 1995/01/25 14:14:58 jkr Exp jkr * ******************************************************************************* * $Log: tst.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:19 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/nsplit/nsplit.c b/gnu/usr.sbin/isdn/nsplit/nsplit.c index 2502a58ee91cf..210edef56407d 100644 --- a/gnu/usr.sbin/isdn/nsplit/nsplit.c +++ b/gnu/usr.sbin/isdn/nsplit/nsplit.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: nsplit.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: nsplit.c,v 1.1.1.1 1995/02/15 00:46:25 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: nsplit.c,v 1.1 1995/01/25 14:06:18 jkr Exp j * ******************************************************************************* * $Log: nsplit.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:25 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/rst/rst.c b/gnu/usr.sbin/isdn/rst/rst.c index 331bdba64e6cb..7382d1d3143da 100644 --- a/gnu/usr.sbin/isdn/rst/rst.c +++ b/gnu/usr.sbin/isdn/rst/rst.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: rst.c,v 1.1 1995/01/25 14:07:55 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: rst.c,v 1.1.1.1 1995/02/15 00:46:24 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: rst.c,v 1.1 1995/01/25 14:07:55 jkr Exp jkr * ******************************************************************************* * $Log: rst.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:24 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/isdn/rstcode/rstcode.c b/gnu/usr.sbin/isdn/rstcode/rstcode.c index 5a9970b26724b..2de9eed87e664 100644 --- a/gnu/usr.sbin/isdn/rstcode/rstcode.c +++ b/gnu/usr.sbin/isdn/rstcode/rstcode.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: rstcode.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: rstcode.c,v 1.1.1.1 1995/02/15 00:46:25 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: rstcode.c,v 1.1 1995/01/25 14:06:18 jkr Exp * ******************************************************************************* * $Log: rstcode.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:25 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ #include diff --git a/gnu/usr.sbin/isdn/spy/spy.c b/gnu/usr.sbin/isdn/spy/spy.c index 1f730c07b3502..4d8920f44cea6 100644 --- a/gnu/usr.sbin/isdn/spy/spy.c +++ b/gnu/usr.sbin/isdn/spy/spy.c @@ -1,6 +1,6 @@ -static char rcsid[] = "@(#)$Id: spy.c,v 1.2 1995/01/25 13:41:44 jkr Exp jkr $"; +static char rcsid[] = "@(#)$Id: spy.c,v 1.1.1.1 1995/02/15 00:46:24 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.1.1.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,10 @@ static char rcsid[] = "@(#)$Id: spy.c,v 1.2 1995/01/25 13:41:44 jkr Exp jkr * ******************************************************************************* * $Log: spy.c,v $ + * Revision 1.1.1.1 1995/02/15 00:46:24 jkh + * Import the ISDN userland utilities. Just about ready to start shaking + * this baby out in earnest.. + * * ******************************************************************************/ diff --git a/gnu/usr.sbin/yp_mkdb/Makefile b/gnu/usr.sbin/yp_mkdb/Makefile index 324bdf467b78d..e07e601bdd1ba 100644 --- a/gnu/usr.sbin/yp_mkdb/Makefile +++ b/gnu/usr.sbin/yp_mkdb/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/02/04 04:26:19 wpaul Exp $ PROG= yp_mkdb MAN8= yp_mkdb.8 diff --git a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c index bf648a07836b5..8c796ad2fdb6f 100644 --- a/gnu/usr.sbin/yp_mkdb/yp_mkdb.c +++ b/gnu/usr.sbin/yp_mkdb/yp_mkdb.c @@ -20,7 +20,7 @@ */ /* - * $Id: yp_mkdb.c,v 1.2 1995/03/31 19:45:13 wpaul Exp $ + * $Id: yp_mkdb.c,v 1.3 1995/05/30 05:05:26 rgrimes Exp $ */ #define BUFFERSIZE 4096 diff --git a/gnu/usr.sbin/yppasswdd/Makefile b/gnu/usr.sbin/yppasswdd/Makefile index b2109f6e229bd..2cd5a2dd40afd 100644 --- a/gnu/usr.sbin/yppasswdd/Makefile +++ b/gnu/usr.sbin/yppasswdd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/04/01 19:23:11 wpaul Exp $ +# $Id: Makefile,v 1.5.4.1 1995/08/25 11:11:17 davidg Exp $ # @(#)Makefile 8.3 (Berkeley) 4/2/94 PROG= yppasswdd diff --git a/gnu/usr.sbin/ypserv/Makefile b/gnu/usr.sbin/ypserv/Makefile index 0a1d2006a46b6..b155ae9c1f2b9 100644 --- a/gnu/usr.sbin/ypserv/Makefile +++ b/gnu/usr.sbin/ypserv/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6.4.1 1995/08/25 11:18:34 davidg Exp $ +# $Id: Makefile,v 1.6.4.2 1996/06/25 21:17:57 wpaul Exp $ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 PROG= ypserv diff --git a/gnu/usr.sbin/ypserv/Makefile.yp b/gnu/usr.sbin/ypserv/Makefile.yp index 963ce15bd44ab..01fe282c1dcb0 100644 --- a/gnu/usr.sbin/ypserv/Makefile.yp +++ b/gnu/usr.sbin/ypserv/Makefile.yp @@ -1,7 +1,7 @@ # # Makefile for the NIS databases # -# $Id: Makefile.yp,v 1.7.4.1 1995/08/25 11:18:36 davidg Exp $ +# $Id: Makefile.yp,v 1.7.4.2 1996/06/25 21:17:58 wpaul Exp $ # # This Makefile should only be run on the NIS master server of a domain. # All updated maps will be pushed to all NIS slave servers listed in the diff --git a/gnu/usr.sbin/ypserv/dnslookup.c b/gnu/usr.sbin/ypserv/dnslookup.c index 9d10ecfde76cc..df57cd48cdbca 100644 --- a/gnu/usr.sbin/ypserv/dnslookup.c +++ b/gnu/usr.sbin/ypserv/dnslookup.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dnslookup.c,v 1.1 1995/01/31 08:58:52 wpaul Exp $ + * $Id: dnslookup.c,v 1.2 1995/02/03 20:25:59 bde Exp $ */ /* diff --git a/gnu/usr.sbin/ypserv/server.c b/gnu/usr.sbin/ypserv/server.c index 9ac2e7069d2a0..ed6e43a4360fe 100644 --- a/gnu/usr.sbin/ypserv/server.c +++ b/gnu/usr.sbin/ypserv/server.c @@ -24,7 +24,7 @@ ** Ported to FreeBSD and hacked all to pieces ** by Bill Paul ** -** $Id: server.c,v 1.12 1995/09/24 17:21:52 wpaul Exp $ +** $Id: server.c,v 1.6.4.2 1995/10/05 20:02:57 davidg Exp $ ** */ diff --git a/gnu/usr.sbin/ypserv/svc_run.c b/gnu/usr.sbin/ypserv/svc_run.c index 6f4a52c0b8a64..5c16ab4266f25 100644 --- a/gnu/usr.sbin/ypserv/svc_run.c +++ b/gnu/usr.sbin/ypserv/svc_run.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_run.c,v 1.2 1995/05/30 05:41:35 rgrimes Exp $"; +static char *rcsid = "$Id: svc_run.c,v 1.2 1995/07/14 01:56:51 wpaul Exp $"; #endif /* diff --git a/gnu/usr.sbin/ypserv/system.h b/gnu/usr.sbin/ypserv/system.h index 838430a38c4e2..88663b780cad7 100644 --- a/gnu/usr.sbin/ypserv/system.h +++ b/gnu/usr.sbin/ypserv/system.h @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: system.h,v 1.1 1995/01/31 08:58:54 wpaul Exp $ */ #if (defined(__sun__) || defined(sun)) && !defined(__svr4__) diff --git a/gnu/usr.sbin/ypserv/yp.h b/gnu/usr.sbin/ypserv/yp.h index 5a3b33a9124d8..82d5555184a24 100644 --- a/gnu/usr.sbin/ypserv/yp.h +++ b/gnu/usr.sbin/ypserv/yp.h @@ -10,7 +10,7 @@ * Modification history: * 940716 pen@signum.se Change "ypreq_key" to "ypreq_nokey" for FIRST. * - * $Id: yp.h,v 1.1 1995/01/31 08:58:55 wpaul Exp $ + * $Id: yp.h,v 1.2 1995/05/30 05:05:36 rgrimes Exp $ */ #ifndef _YP_H_RPCGEN diff --git a/gnu/usr.sbin/ypserv/yp_svc.c b/gnu/usr.sbin/ypserv/yp_svc.c index ceeee2d6bc97d..9d560d91fdaa4 100644 --- a/gnu/usr.sbin/ypserv/yp_svc.c +++ b/gnu/usr.sbin/ypserv/yp_svc.c @@ -6,7 +6,7 @@ * And thus replied Lpd@NannyMUD: * Who cares? :-) /Peter Eriksson * - * $Id: yp_svc.c,v 1.3 1995/05/30 05:05:37 rgrimes Exp $ + * $Id: yp_svc.c,v 1.3.4.1 1995/08/25 11:18:41 davidg Exp $ */ #include "system.h" diff --git a/gnu/usr.sbin/ypserv/yp_xdr.c b/gnu/usr.sbin/ypserv/yp_xdr.c index 9e8864578be38..0aa8b9f2a5342 100644 --- a/gnu/usr.sbin/ypserv/yp_xdr.c +++ b/gnu/usr.sbin/ypserv/yp_xdr.c @@ -11,7 +11,7 @@ * 940616 pen@signum.se Major cleanups. * 940713 pen@signum.se Added SunOS 4 prototypes. * - * $Id: yp_xdr.c,v 1.1 1995/01/31 08:58:57 wpaul Exp $ + * $Id: yp_xdr.c,v 1.2 1995/05/30 05:05:38 rgrimes Exp $ */ #include "system.h" diff --git a/gnu/usr.sbin/ypserv/ypserv.8 b/gnu/usr.sbin/ypserv/ypserv.8 index 43ac853e97842..1eaf60afc362d 100644 --- a/gnu/usr.sbin/ypserv/ypserv.8 +++ b/gnu/usr.sbin/ypserv/ypserv.8 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ypserv.8,v 1.2 1995/02/07 05:04:51 wpaul Exp $ +.\" $Id: ypserv.8,v 1.3 1995/04/05 03:23:40 wpaul Exp $ .\" .Dd February 4, 1995 .Dt YPSERV 8 diff --git a/include/Makefile b/include/Makefile index 227127e346811..0e365494fa456 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $Id: Makefile,v 1.25.4.2 1995/08/31 21:30:59 davidg Exp $ +# $Id: Makefile,v 1.25.4.4 1996/06/05 02:44:09 jkh Exp $ # # Doing a make install builds /usr/include # diff --git a/include/link.h b/include/link.h index c71a1fcbd539c..9bccdfe8b2adc 100644 --- a/include/link.h +++ b/include/link.h @@ -27,7 +27,7 @@ * (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: link.h,v 1.4.4.1 1995/08/25 07:08:07 davidg Exp $ + * $Id: link.h,v 1.4.4.3 1996/06/05 02:44:12 jkh Exp $ */ /* diff --git a/include/netdb.h b/include/netdb.h index 4ea2f630342db..6472722d9b388 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * $Id: netdb.h,v 1.2.4.1 1995/08/30 04:06:24 davidg Exp $ + * $Id: netdb.h,v 1.2.4.3 1996/06/05 02:44:14 jkh Exp $ * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. * diff --git a/include/nl_types.h b/include/nl_types.h index ac8b43353f986..c938fa48b21c0 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,4 +1,4 @@ -/* $Id: nl_types.h,v 1.1 1995/03/30 12:47:56 jkh Exp $ */ +/* $Id: nl_types.h,v 1.2 1995/05/30 04:54:42 rgrimes Exp $ */ /*********************************************************** Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts. diff --git a/include/nlist.h b/include/nlist.h index b80c0b21f7173..48779f50c191d 100644 --- a/include/nlist.h +++ b/include/nlist.h @@ -37,7 +37,7 @@ * * @(#)nlist.h 8.2 (Berkeley) 1/21/94 * - * $Id$ + * $Id: nlist.h,v 1.2 1994/12/23 22:32:48 nate Exp $ */ #ifndef _NLIST_H_ diff --git a/include/resolv.h b/include/resolv.h index b7e24e7d02dc4..c50ba513d35b0 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -53,7 +53,7 @@ * * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp - * $Id: resolv.h,v 1.3.4.1 1995/08/30 04:06:27 davidg Exp $ + * $Id: resolv.h,v 1.3.4.3 1996/06/05 02:44:15 jkh Exp $ */ #ifndef _RESOLV_H_ diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 5ac0f61d0be1e..e88dc840a9a6a 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -28,7 +28,7 @@ * * from: @(#)auth.h 1.17 88/02/08 SMI * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC - * $Id: auth.h,v 1.3 1995/05/30 04:55:09 rgrimes Exp $ + * $Id: auth.h,v 1.3.4.2 1996/06/05 02:44:32 jkh Exp $ */ /* diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 4699ada38f9e6..541deb0eaa08e 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -28,7 +28,7 @@ * * from: @(#)auth_unix.h 1.8 88/02/08 SMI * from: @(#)auth_unix.h 2.2 88/07/29 4.0 RPCSRC - * $Id: auth_unix.h,v 1.3 1995/05/30 04:55:11 rgrimes Exp $ + * $Id: auth_unix.h,v 1.3.4.2 1996/06/05 02:44:33 jkh Exp $ */ /* diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 12b1f20d28544..65ccc1b6d19ee 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -28,7 +28,7 @@ * * from: @(#)clnt.h 1.31 88/02/08 SMI * from: @(#)clnt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: clnt.h,v 1.3 1995/05/30 04:55:14 rgrimes Exp $ + * $Id: clnt.h,v 1.3.4.2 1996/06/05 02:44:34 jkh Exp $ */ /* diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 72c9c4398e45f..645277721ec9a 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -28,7 +28,7 @@ * * from: @(#)pmap_clnt.h 1.11 88/02/08 SMI * from: @(#)pmap_clnt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_clnt.h,v 1.3 1995/05/30 04:55:16 rgrimes Exp $ + * $Id: pmap_clnt.h,v 1.3.4.2 1996/06/05 02:44:35 jkh Exp $ */ /* diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 7263a0fed84b0..6150c1c3cc72f 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -28,7 +28,7 @@ * * from: @(#)pmap_prot.h 1.14 88/02/08 SMI * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_prot.h,v 1.3 1995/05/30 04:55:18 rgrimes Exp $ + * $Id: pmap_prot.h,v 1.3.4.2 1996/06/05 02:44:36 jkh Exp $ */ /* diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index 95d1f94f85cda..b1b499665f1ac 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -28,7 +28,7 @@ * * from: @(#)pmap_rmt.h 1.2 88/02/08 SMI * from: @(#)pmap_rmt.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_rmt.h,v 1.3 1995/05/30 04:55:20 rgrimes Exp $ + * $Id: pmap_rmt.h,v 1.3.4.2 1996/06/05 02:44:36 jkh Exp $ */ /* diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 9ec14a4bec349..0812bec0aae6c 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -28,7 +28,7 @@ * * from: @(#)rpc.h 1.9 88/02/08 SMI * from: @(#)rpc.h 2.4 89/07/11 4.0 RPCSRC - * $Id: rpc.h,v 1.4 1995/05/30 04:55:23 rgrimes Exp $ + * $Id: rpc.h,v 1.4.4.2 1996/06/05 02:44:37 jkh Exp $ */ /* diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index 0e8a74fc7d4be..c60fc7d64388d 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -28,7 +28,7 @@ * * from: @(#)rpc_msg.h 1.7 86/07/16 SMI * from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC - * $Id: rpc_msg.h,v 1.4 1995/05/30 04:55:25 rgrimes Exp $ + * $Id: rpc_msg.h,v 1.4.4.2 1996/06/05 02:44:38 jkh Exp $ */ /* diff --git a/include/rpc/svc.h b/include/rpc/svc.h index c9872d4560e38..42637acf68da4 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -28,7 +28,7 @@ * * from: @(#)svc.h 1.20 88/02/08 SMI * from: @(#)svc.h 2.2 88/07/29 4.0 RPCSRC - * $Id: svc.h,v 1.4 1995/05/30 04:55:28 rgrimes Exp $ + * $Id: svc.h,v 1.4.4.2 1996/06/05 02:44:40 jkh Exp $ */ /* diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index 360e93430170b..034f261fe7d9c 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -28,7 +28,7 @@ * * from: @(#)svc_auth.h 1.6 86/07/16 SMI * from: @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC - * $Id: svc_auth.h,v 1.3 1995/05/30 04:55:32 rgrimes Exp $ + * $Id: svc_auth.h,v 1.3.4.2 1996/06/05 02:44:42 jkh Exp $ */ /* diff --git a/include/rpc/types.h b/include/rpc/types.h index 3cdaee3fcd00c..0af9bc50e46d0 100644 --- a/include/rpc/types.h +++ b/include/rpc/types.h @@ -28,7 +28,7 @@ * * from: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $Id: types.h,v 1.3 1995/05/30 04:55:35 rgrimes Exp $ + * $Id: types.h,v 1.3.4.2 1996/06/05 02:44:43 jkh Exp $ */ /* diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 87075abbe8fee..11123f54b017f 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -28,7 +28,7 @@ * * from: @(#)xdr.h 1.19 87/04/22 SMI * from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC - * $Id: xdr.h,v 1.3 1995/05/30 04:55:38 rgrimes Exp $ + * $Id: xdr.h,v 1.3.4.2 1996/06/05 02:44:44 jkh Exp $ */ /* diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index d9d24e22a20cd..0c31126b37058 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC -# $Id: Makefile,v 1.3.4.1 1995/08/30 07:24:54 davidg Exp $ +# $Id: Makefile,v 1.3.4.3 1996/06/05 02:44:50 jkh Exp $ .SUFFIXES: .x diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index 6bc4f27074c26..c84b9b2d98d94 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -40,7 +40,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: klm_prot.x,v 1.1 1993/09/14 17:42:42 jtc Exp $"; +%static char rcsid[] = "$Id: klm_prot.x,v 1.1 1994/08/04 19:01:45 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index 758b47cfbdd1f..8c38b75c10d11 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -35,7 +35,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: mount.x,v 1.1 1993/09/14 17:42:43 jtc Exp $"; +%static char rcsid[] = "$Id: mount.x,v 1.1 1994/08/04 19:01:46 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 74d46ba5300b4..819b93280ee1e 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -31,7 +31,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: nfs_prot.x,v 1.1 1993/09/14 17:42:44 jtc Exp $"; +%static char rcsid[] = "$Id: nfs_prot.x,v 1.1 1994/08/04 19:01:47 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index b0711243dc3ba..04721e28e3ff9 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -12,7 +12,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: nlm_prot.x,v 1.1 1993/09/14 17:42:45 jtc Exp $"; +%static char rcsid[] = "$Id: nlm_prot.x,v 1.1 1994/08/04 19:01:48 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 7609cc8b26f76..f027d28eef909 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -35,7 +35,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: rex.x,v 1.1 1993/09/14 17:42:46 jtc Exp $"; +%static char rcsid[] = "$Id: rex.x,v 1.1 1994/08/04 19:01:49 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 034c5c25f7ccb..bf6dafbfbe04a 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -35,7 +35,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: rnusers.x,v 1.1 1993/09/14 17:42:46 jtc Exp $"; +%static char rcsid[] = "$Id: rnusers.x,v 1.1 1994/08/04 19:01:50 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 0900c6581936a..476d76bd2be19 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -7,7 +7,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: rquota.x,v 1.1 1993/09/14 17:42:49 jtc Exp $"; +%static char rcsid[] = "$Id: rquota.x,v 1.1 1994/08/04 19:01:50 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index 2099b4f4994d8..0c55005cca17a 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -47,7 +47,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: rstat.x,v 1.3 1993/11/30 20:31:41 ats Exp $"; +%static char rcsid[] = "$Id: rstat.x,v 1.1 1994/08/04 19:01:51 wollman Exp $"; %#endif /* not lint */ #endif /* def RPC_HDR */ diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x index 08e2c98e3d6d1..7541bca4ddf47 100644 --- a/include/rpcsvc/rwall.x +++ b/include/rpcsvc/rwall.x @@ -35,7 +35,7 @@ #ifndef RPC_HDR %#ifndef lint -%static char rcsid[] = "$Id: rwall.x,v 1.1 1993/09/14 17:42:50 jtc Exp $"; +%static char rcsid[] = "$Id: rwall.x,v 1.1 1994/08/04 19:01:52 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index f66570bdd867c..49a93044f8fd9 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -37,7 +37,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)sm_inter.x 2.2 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: sm_inter.x,v 1.1 1993/09/14 17:42:51 jtc Exp $"; +%static char rcsid[] = "$Id: sm_inter.x,v 1.1 1994/08/04 19:01:53 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index d580722dec1ed..5ae7a4d1780d0 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -36,7 +36,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: spray.x,v 1.1 1993/09/14 17:42:52 jtc Exp $"; +%static char rcsid[] = "$Id: spray.x,v 1.1 1994/08/04 19:01:54 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 7e3175e1d521e..fc22ee5865046 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -34,7 +34,7 @@ #ifndef RPC_HDR %#ifndef lint %/*static char sccsid[] = "from: @(#)yp.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: yp.x,v 1.1 1994/08/04 19:01:55 wollman Exp $"; +%static char rcsid[] = "$Id: yp.x,v 1.1.6.2 1996/06/05 02:44:52 jkh Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index 7daf9a1402c72..e2e3778a083fa 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: yp_prot.h,v 1.2 1995/05/30 04:55:47 rgrimes Exp $ + * $Id: yp_prot.h,v 1.2.4.2 1996/06/05 02:44:53 jkh Exp $ */ #ifndef _YP_PROT_H_ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index 816801255125a..91b64868b1ce0 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ypclnt.h,v 1.2 1995/04/21 18:07:34 wpaul Exp $ + * $Id: ypclnt.h,v 1.3 1995/05/30 04:55:49 rgrimes Exp $ */ #ifndef _YPCLNT_H_ diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 0b9197e99bf0a..4cad50d2cfdf6 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -36,7 +36,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id: yppasswd.x,v 1.1 1993/09/14 17:42:55 jtc Exp $"; +%static char rcsid[] = "$Id: yppasswd.x,v 1.1 1994/08/04 19:01:57 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/strhash.h b/include/strhash.h index 59523da9cf793..8a55bd49e3d39 100644 --- a/include/strhash.h +++ b/include/strhash.h @@ -1,7 +1,7 @@ #ifndef _STRHASH_H_INCLUDE #define _STRHASH_H_INCLUDE -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/include/strhash.h,v 1.2 1995/05/30 04:54:49 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/include/strhash.h,v 1.2.4.1 1996/06/05 02:44:21 jkh Exp $ */ /* * diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index 145fd5e271869..fce8dbddec6d1 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.6 (Berkeley) 5/22/91 -# $Id: Makefile,v 1.15.4.1 1995/08/30 07:31:12 davidg Exp $ +# $Id: Makefile,v 1.15.4.3 1996/06/05 02:44:59 jkh Exp $ CFLAGS+= -DLIBC_SCCS -DDYNAMIC OBJS= crt0.o gcrt0.o c++rt0.o diff --git a/lib/csu/i386/c++rt0.c b/lib/csu/i386/c++rt0.c index 99bfffb84e0d4..ab79faaa6e82c 100644 --- a/lib/csu/i386/c++rt0.c +++ b/lib/csu/i386/c++rt0.c @@ -27,7 +27,7 @@ * (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: c++rt0.c,v 1.2.4.1 1995/08/25 07:08:32 davidg Exp $ + * $Id: c++rt0.c,v 1.2.4.3 1996/06/05 02:45:00 jkh Exp $ */ /* diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c index 1773bfc368785..8087ecf50e4ab 100644 --- a/lib/csu/i386/crt0.c +++ b/lib/csu/i386/crt0.c @@ -27,7 +27,7 @@ * (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: crt0.c,v 1.16.4.4 1996/06/05 02:45:01 jkh Exp $ + * $Id: crt0.c,v 1.16.4.5 1997/02/05 12:04:41 davidg Exp $ */ diff --git a/lib/libc/db/doc/hash.usenix.ps b/lib/libc/db/doc/hash.usenix.ps index 03a01cbf0e906..f143437e7baa0 100644 --- a/lib/libc/db/doc/hash.usenix.ps +++ b/lib/libc/db/doc/hash.usenix.ps @@ -7,7 +7,7 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libc/db/doc/Attic/hash.usenix.ps,v 1.2 1994/08/05 01:17:43 wollman Exp $ +% RCSID: $Header: /home/ncvs/src/lib/libc/db/doc/Attic/hash.usenix.ps,v 1.2.6.1 1996/06/05 02:46:06 jkh Exp $ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. diff --git a/lib/libc/db/doc/libtp.usenix.ps b/lib/libc/db/doc/libtp.usenix.ps index ebe73cdfc1026..74209ace35bf8 100644 --- a/lib/libc/db/doc/libtp.usenix.ps +++ b/lib/libc/db/doc/libtp.usenix.ps @@ -7,7 +7,7 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libc/db/doc/Attic/libtp.usenix.ps,v 1.2 1994/08/05 01:17:46 wollman Exp $ +% RCSID: $Header: /home/ncvs/src/lib/libc/db/doc/Attic/libtp.usenix.ps,v 1.2.6.1 1996/06/05 02:46:08 jkh Exp $ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 47eef6b02e738..d9f5d79e2e5f8 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,5 +1,5 @@ # From: @(#)Makefile.inc 8.3 (Berkeley) 4/16/94 -# $Id: Makefile.inc,v 1.16.4.3 1996/06/27 05:31:42 gpalmer Exp $ +# $Id: Makefile.inc,v 1.16.4.4 1996/06/28 23:22:54 gpalmer Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE}/gen ${.CURDIR}/gen diff --git a/lib/libc/gen/config.c b/lib/libc/gen/config.c index ffe276697990f..a86e864e42fee 100644 --- a/lib/libc/gen/config.c +++ b/lib/libc/gen/config.c @@ -6,12 +6,12 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: config.c,v 1.1 1994/11/13 20:47:43 phk Exp $ + * $Id: config.c,v 1.2 1995/05/30 05:40:09 rgrimes Exp $ * */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id: config.c,v 1.1 1994/11/13 20:47:43 phk Exp $"; +static char rcsid[] = "$Id: config.c,v 1.2 1995/05/30 05:40:09 rgrimes Exp $"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/lib/libc/gen/config_open.3 b/lib/libc/gen/config_open.3 index 7b7e36ca3a4e2..77cc11bc12345 100644 --- a/lib/libc/gen/config_open.3 +++ b/lib/libc/gen/config_open.3 @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $Id: config_open.3,v 1.1 1994/11/13 20:47:44 phk Exp $ +.\" $Id: config_open.3,v 1.1.4.1 1996/01/30 16:44:43 mpp Exp $ .\" .Dd November 13, 1994 .Dt config_open 3 diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c index 59cb92008dbed..67414626e81b5 100644 --- a/lib/libc/gen/crypt.c +++ b/lib/libc/gen/crypt.c @@ -36,7 +36,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /* from static char sccsid[] = "@(#)crypt.c 5.11 (Berkeley) 6/25/91"; */ -static char rcsid[] = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libc/gen/crypt.c,v 1.3 1995/05/30 05:40:10 rgrimes Exp $"; +static char rcsid[] = "$Header: /home/ncvs/src/lib/libc/gen/crypt.c,v 1.3.4.2 1996/06/05 02:46:45 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3 index f89cf7f3e6825..ab9e6fbd8c022 100644 --- a/lib/libc/gen/err.3 +++ b/lib/libc/gen/err.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $Id: err.3,v 1.3 1996/02/11 22:33:27 mpp Exp $ +.\" $Id: err.3,v 1.2.4.1 1996/05/01 22:43:42 mpp Exp $ .\" .Dd April 13, 1995 .Dt ERR 3 diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3 index 8c22b46e6bdc2..965c95f04017a 100644 --- a/lib/libc/gen/getbootfile.3 +++ b/lib/libc/gen/getbootfile.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostname.3 8.1 (Berkeley) 6/4/93 -.\" $Id: getbootfile.3,v 1.2 1996/02/11 22:33:31 mpp Exp $ +.\" $Id: getbootfile.3,v 1.1.6.1 1996/05/01 22:43:48 mpp Exp $ .\" .Dd September 23, 1994 .Dt GETBOOTFILE 3 diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c index 3d038514051e5..cd42924b4a137 100644 --- a/lib/libc/gen/getbootfile.c +++ b/lib/libc/gen/getbootfile.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char sccsid[] = "From: @(#)gethostname.c 8.1 (Berkeley) 6/4/93";*/ static const char rcsid[] = - "$Id: getbootfile.c,v 1.1 1994/09/23 20:22:01 wollman Exp $"; + "$Id: getbootfile.c,v 1.2 1994/09/24 00:10:13 wollman Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3 index 27b8903b231ac..d8b3acc944ec4 100644 --- a/lib/libc/gen/getdomainname.3 +++ b/lib/libc/gen/getdomainname.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)getdomainname.2 6.7 (Berkeley) 3/10/91 -.\" $Id: getdomainname.3,v 1.2 1996/02/11 22:33:32 mpp Exp $ +.\" $Id: getdomainname.3,v 1.1.4.1 1996/05/01 22:43:49 mpp Exp $ .\" .Dd March 10, 1991 .Dt GETDOMAINNAME 3 diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c index 990d9f32bf40b..a1c0b03384592 100644 --- a/lib/libc/gen/getdomainname.c +++ b/lib/libc/gen/getdomainname.c @@ -36,7 +36,7 @@ static char sccsid[] = "From: @(#)gethostname.c 8.1 (Berkeley) 6/4/93"; */ static const char rcsid[] = - "$Id$"; + "$Id: getdomainname.c,v 1.1 1994/08/08 00:40:23 wollman Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3 index 321b1d37b4ec3..dd2408cb47815 100644 --- a/lib/libc/gen/getgrent.3 +++ b/lib/libc/gen/getgrent.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getgrent.3 8.2 (Berkeley) 4/19/94 -.\" $Id: getgrent.3,v 1.2.6.3 1996/06/05 02:46:53 jkh Exp $ +.\" $Id: getgrent.3,v 1.2.6.4 1996/06/22 23:51:51 gpalmer Exp $ .\" .Dd September 29, 1994 .Dt GETGRENT 3 diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c index 808e16b56e705..24ca543057212 100644 --- a/lib/libc/gen/getosreldate.c +++ b/lib/libc/gen/getosreldate.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)gethostid.c 8.1 (Berkeley) 6/2/93"; */ static const char rcsid[] = - "$Id$"; + "$Id: getosreldate.c,v 1.1 1994/08/10 06:27:35 wollman Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/getvfsent.3 b/lib/libc/gen/getvfsent.3 index ed6396d5ee930..5e247d7b97867 100644 --- a/lib/libc/gen/getvfsent.3 +++ b/lib/libc/gen/getvfsent.3 @@ -1,4 +1,4 @@ -.\" $Id: getvfsent.3,v 1.3 1996/05/01 01:40:04 bde Exp $ +.\" $Id: getvfsent.3,v 1.1.6.1 1996/05/01 22:43:57 mpp Exp $ .\" Written by Garrett A. Wollman, September 1994. .\" This manual page is in the public domain. .\" diff --git a/lib/libc/gen/ntp_gettime.c b/lib/libc/gen/ntp_gettime.c index feae846fbc2ea..4f832b98f888c 100644 --- a/lib/libc/gen/ntp_gettime.c +++ b/lib/libc/gen/ntp_gettime.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char rcsid[] = - "$Id: ntp_gettime.c,v 1.1 1994/09/18 20:29:46 wollman Exp $"; + "$Id: ntp_gettime.c,v 1.2 1994/09/19 22:04:28 ache Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c index 6471762f4abee..72f8da4b689b4 100644 --- a/lib/libc/gen/setdomainname.c +++ b/lib/libc/gen/setdomainname.c @@ -36,7 +36,7 @@ static char sccsid[] = "From: @(#)sethostname.c 8.1 (Berkeley) 6/4/93"; */ static const char rcsid[] = - "$Id$"; + "$Id: setdomainname.c,v 1.1 1994/08/08 00:40:24 wollman Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/shmat.c b/lib/libc/gen/shmat.c index b38a6a5e09381..0b3ae765f4392 100644 --- a/lib/libc/gen/shmat.c +++ b/lib/libc/gen/shmat.c @@ -1,5 +1,5 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id: shmat.c,v 1.2 1993/10/10 12:01:26 rgrimes Exp $"; +static char *rcsid = "$Id: shmat.c,v 1.1 1994/09/13 14:52:28 dfr Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/shmctl.c b/lib/libc/gen/shmctl.c index 1bb384cff063d..2e43c666632ba 100644 --- a/lib/libc/gen/shmctl.c +++ b/lib/libc/gen/shmctl.c @@ -1,5 +1,5 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id: shmctl.c,v 1.2 1993/10/10 12:01:28 rgrimes Exp $"; +static char *rcsid = "$Id: shmctl.c,v 1.1 1994/09/13 14:52:30 dfr Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/shmdt.c b/lib/libc/gen/shmdt.c index fde6078704e7e..989a52401491c 100644 --- a/lib/libc/gen/shmdt.c +++ b/lib/libc/gen/shmdt.c @@ -1,5 +1,5 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id: shmdt.c,v 1.2 1993/10/10 12:01:29 rgrimes Exp $"; +static char *rcsid = "$Id: shmdt.c,v 1.1 1994/09/13 14:52:31 dfr Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/shmget.c b/lib/libc/gen/shmget.c index 455ea888a8696..dc4c40ddc89ba 100644 --- a/lib/libc/gen/shmget.c +++ b/lib/libc/gen/shmget.c @@ -1,5 +1,5 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id: shmget.c,v 1.1 1993/09/27 00:57:49 rgrimes Exp $"; +static char *rcsid = "$Id: shmget.c,v 1.1 1994/09/13 14:52:32 dfr Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3 index 77082cd849997..400124bc5da8e 100644 --- a/lib/libc/gen/ualarm.3 +++ b/lib/libc/gen/ualarm.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94 -.\" $Id$ +.\" $Id: ualarm.3,v 1.1.1.1.6.1 1996/03/19 14:06:55 bde Exp $ .\" .Dd April 19, 1994 .Dt UALARM 3 diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c index 93f659e578430..bd8f053acf2b7 100644 --- a/lib/libc/gen/uname.c +++ b/lib/libc/gen/uname.c @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/ static const char rcsid[] = - "$Id: uname.c,v 1.3 1995/05/30 05:40:29 rgrimes Exp $"; + "$Id: uname.c,v 1.3.4.1 1995/08/25 11:35:37 davidg Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h index 27240d7df76c6..5426ce9274063 100644 --- a/lib/libc/i386/DEFS.h +++ b/lib/libc/i386/DEFS.h @@ -35,7 +35,7 @@ * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 * - * $Id: DEFS.h,v 1.2 1994/08/05 01:17:56 wollman Exp $ + * $Id: DEFS.h,v 1.2.6.2 1996/06/05 02:47:24 jkh Exp $ */ /* XXX should use align 4,0x90 for -m486. */ diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h index bbd2a1d95eb65..4c46ced61e6da 100644 --- a/lib/libc/i386/SYS.h +++ b/lib/libc/i386/SYS.h @@ -35,7 +35,7 @@ * * from: @(#)SYS.h 5.5 (Berkeley) 5/7/91 * - * $Id: SYS.h,v 1.2 1994/08/05 01:17:57 wollman Exp $ + * $Id: SYS.h,v 1.2.6.2 1996/06/05 02:47:26 jkh Exp $ */ #include diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc index 87873af521c9d..5e98e2a639ba7 100644 --- a/lib/libc/i386/gen/Makefile.inc +++ b/lib/libc/i386/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id: Makefile.inc,v 1.5 1995/01/23 01:26:39 davidg Exp $ +# $Id: Makefile.inc,v 1.5.4.2 1996/06/05 02:47:28 jkh Exp $ SRCS+= isinf.c infinity.c SRCS+= _setjmp.S alloca.S fabs.S ldexp.c modf.S setjmp.S sigsetjmp.S diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S index 876f3c0aadf89..9df7768a58d8a 100644 --- a/lib/libc/i386/gen/_setjmp.S +++ b/lib/libc/i386/gen/_setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _setjmp.S,v 1.3 1995/01/23 01:26:41 davidg Exp $ + * $Id: _setjmp.S,v 1.3.4.2 1996/06/05 02:47:29 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: _setjmp.S,v 1.3 1995/01/23 01:26:41 davidg Exp $" + .asciz "$Id: _setjmp.S,v 1.3.4.2 1996/06/05 02:47:29 jkh Exp $" #endif /* LIBC_RCS and not lint */ /* diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S index f76b37bc1a15d..ce9cb1901ee1b 100644 --- a/lib/libc/i386/gen/alloca.S +++ b/lib/libc/i386/gen/alloca.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: alloca.S,v 1.2 1995/01/23 01:26:44 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: alloca.S,v 1.2 1995/01/23 01:26:44 davidg Exp $" #endif /* LIBC_RCS and not lint */ /* like alloc, but automatic automatic free in return */ diff --git a/lib/libc/i386/gen/divsi3.S b/lib/libc/i386/gen/divsi3.S index 3b09580d24789..68918c0a7fb70 100644 --- a/lib/libc/i386/gen/divsi3.S +++ b/lib/libc/i386/gen/divsi3.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: divsi3.S,v 1.2 1995/01/23 01:26:46 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: divsi3.S,v 1.2 1995/01/23 01:26:46 davidg Exp $" #endif /* LIBC_RCS and not lint */ .globl ___divsi3 diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S index 5ae53705ffa63..dc7c470db9125 100644 --- a/lib/libc/i386/gen/fabs.S +++ b/lib/libc/i386/gen/fabs.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: fabs.S,v 1.2 1995/01/23 01:26:48 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: fabs.S,v 1.2 1995/01/23 01:26:48 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/gen/fixdfsi.S b/lib/libc/i386/gen/fixdfsi.S index 398506c6c832a..f54084b171388 100644 --- a/lib/libc/i386/gen/fixdfsi.S +++ b/lib/libc/i386/gen/fixdfsi.S @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: fixdfsi.S,v 1.2 1995/01/23 01:26:50 davidg Exp $ */ .file "__fixdfsi.s" diff --git a/lib/libc/i386/gen/fixunsdfsi.S b/lib/libc/i386/gen/fixunsdfsi.S index eb576ba5baaef..021bd703ec437 100644 --- a/lib/libc/i386/gen/fixunsdfsi.S +++ b/lib/libc/i386/gen/fixunsdfsi.S @@ -34,12 +34,12 @@ * SUCH DAMAGE. * * from: @(#)fixunsdfsi.s 5.1 12/17/90 - * $Id: fixunsdfsi.S,v 1.2 1994/12/27 13:37:38 bde Exp $ + * $Id: fixunsdfsi.S,v 1.3 1995/01/23 01:26:52 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: fixunsdfsi.S,v 1.2 1994/12/27 13:37:38 bde Exp $" + .asciz "$Id: fixunsdfsi.S,v 1.3 1995/01/23 01:26:52 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/gen/frexp.c b/lib/libc/i386/gen/frexp.c index aba48025ff5a9..1d703c29df07d 100644 --- a/lib/libc/i386/gen/frexp.c +++ b/lib/libc/i386/gen/frexp.c @@ -30,11 +30,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: frexp.c,v 1.2 1995/01/23 01:26:55 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: frexp.c,v 1.2 1995/01/23 01:26:55 davidg Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c index e46f676a3f6df..11929ba9ce250 100644 --- a/lib/libc/i386/gen/infinity.c +++ b/lib/libc/i386/gen/infinity.c @@ -1,6 +1,6 @@ /* * infinity.c - * $Id$ + * $Id: infinity.c,v 1.2 1995/01/23 01:26:57 davidg Exp $ */ #include diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c index c32844933fbe5..d7ecde4e6f2aa 100644 --- a/lib/libc/i386/gen/isinf.c +++ b/lib/libc/i386/gen/isinf.c @@ -30,11 +30,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: isinf.c,v 1.2 1995/01/23 01:27:00 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: isinf.c,v 1.2 1995/01/23 01:27:00 davidg Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c index 8b63f528dc8c2..9c10f9b46a599 100644 --- a/lib/libc/i386/gen/ldexp.c +++ b/lib/libc/i386/gen/ldexp.c @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ldexp.c,v 1.3 1995/01/23 01:27:02 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ldexp.c,v 1.3 1995/01/23 01:27:02 davidg Exp $"; #endif /* LIBC_RCS and not lint */ /* diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S index bce5a3519ed1a..879c6284e54fb 100644 --- a/lib/libc/i386/gen/modf.S +++ b/lib/libc/i386/gen/modf.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: modf.S,v 1.2 1995/01/23 01:27:05 davidg Exp $ + * $Id: modf.S,v 1.2.4.2 1996/06/05 02:47:29 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: modf.S,v 1.2 1995/01/23 01:27:05 davidg Exp $" + .asciz "$Id: modf.S,v 1.2.4.2 1996/06/05 02:47:29 jkh Exp $" #endif /* LIBC_RCS and not lint */ /* diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S index 449ea3747fdee..1b706a7220037 100644 --- a/lib/libc/i386/gen/setjmp.S +++ b/lib/libc/i386/gen/setjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: setjmp.S,v 1.3 1995/01/23 01:27:08 davidg Exp $ + * $Id: setjmp.S,v 1.3.4.2 1996/06/05 02:47:30 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: setjmp.S,v 1.3 1995/01/23 01:27:08 davidg Exp $" + .asciz "$Id: setjmp.S,v 1.3.4.2 1996/06/05 02:47:30 jkh Exp $" #endif /* LIBC_RCS and not lint */ /* diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S index 4ec4538f3453c..bf90822be2a2e 100644 --- a/lib/libc/i386/gen/sigsetjmp.S +++ b/lib/libc/i386/gen/sigsetjmp.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigsetjmp.S,v 1.4 1995/01/23 01:27:10 davidg Exp $ + * $Id: sigsetjmp.S,v 1.4.4.2 1996/06/05 02:47:31 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigsetjmp.S,v 1.4 1995/01/23 01:27:10 davidg Exp $" + .asciz "$Id: sigsetjmp.S,v 1.4.4.2 1996/06/05 02:47:31 jkh Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/gen/udivsi3.S b/lib/libc/i386/gen/udivsi3.S index 55a326bea9742..54fe27aed3931 100644 --- a/lib/libc/i386/gen/udivsi3.S +++ b/lib/libc/i386/gen/udivsi3.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: udivsi3.S,v 1.2 1995/01/23 01:27:12 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: udivsi3.S,v 1.2 1995/01/23 01:27:12 davidg Exp $" #endif /* LIBC_RCS and not lint */ .globl ___udivsi3 diff --git a/lib/libc/i386/net/Makefile.inc b/lib/libc/i386/net/Makefile.inc index dff7fd1066b7a..c53f780add9d2 100644 --- a/lib/libc/i386/net/Makefile.inc +++ b/lib/libc/i386/net/Makefile.inc @@ -1,4 +1,4 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id$ +# $Id: Makefile.inc,v 1.3 1995/01/23 01:27:57 davidg Exp $ SRCS+= htonl.S htons.S ntohl.S ntohs.S diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S index 095c40a6fa731..226d3b5dc4d29 100644 --- a/lib/libc/i386/net/htonl.S +++ b/lib/libc/i386/net/htonl.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: htonl.S,v 1.2 1995/01/23 01:28:00 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: htonl.S,v 1.2 1995/01/23 01:28:00 davidg Exp $" #endif /* LIBC_RCS and not lint */ /* netorder = htonl(hostorder) */ diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S index 238dfc24d36b0..832b9e6495c9b 100644 --- a/lib/libc/i386/net/htons.S +++ b/lib/libc/i386/net/htons.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: htons.S,v 1.2 1995/01/23 01:28:03 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: htons.S,v 1.2 1995/01/23 01:28:03 davidg Exp $" #endif /* LIBC_RCS and not lint */ /* netorder = htons(hostorder) */ diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S index 5af5008c437bd..76a3bb95825c9 100644 --- a/lib/libc/i386/net/ntohl.S +++ b/lib/libc/i386/net/ntohl.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ntohl.S,v 1.2 1995/01/23 01:28:05 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: ntohl.S,v 1.2 1995/01/23 01:28:05 davidg Exp $" #endif /* LIBC_RCS and not lint */ /* hostorder = ntohl(netorder) */ diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S index 4bed4a2c19c8f..b63bd87c6bfe0 100644 --- a/lib/libc/i386/net/ntohs.S +++ b/lib/libc/i386/net/ntohs.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ntohs.S,v 1.2 1995/01/23 01:28:09 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: ntohs.S,v 1.2 1995/01/23 01:28:09 davidg Exp $" #endif /* LIBC_RCS and not lint */ /* hostorder = ntohs(netorder) */ diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc index 65ce3481497f7..8b544afb20e49 100644 --- a/lib/libc/i386/stdlib/Makefile.inc +++ b/lib/libc/i386/stdlib/Makefile.inc @@ -1,4 +1,4 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id$ +# $Id: Makefile.inc,v 1.3 1995/01/23 01:28:28 davidg Exp $ SRCS+= abs.S diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S index 4915d16641b59..35139c89bc817 100644 --- a/lib/libc/i386/stdlib/abs.S +++ b/lib/libc/i386/stdlib/abs.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: abs.S,v 1.3 1995/01/23 01:28:31 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: abs.S,v 1.3 1995/01/23 01:28:31 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S index b4f89d280955a..394e79dd196f5 100644 --- a/lib/libc/i386/stdlib/div.S +++ b/lib/libc/i386/stdlib/div.S @@ -27,12 +27,12 @@ * (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: div.S,v 1.1 1993/12/04 21:46:15 ats Exp $ + * $Id: div.S,v 1.1 1994/08/05 01:18:19 wollman Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: div.S,v 1.1 1993/12/04 21:46:15 ats Exp $" + .asciz "$Id: div.S,v 1.1 1994/08/05 01:18:19 wollman Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S index 5c5afe142bbcd..ea86cf3532e2b 100644 --- a/lib/libc/i386/stdlib/labs.S +++ b/lib/libc/i386/stdlib/labs.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: labs.S,v 1.3 1995/01/23 01:28:33 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: labs.S,v 1.3 1995/01/23 01:28:33 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S index de7bb948ab4ce..2fd7b1735787f 100644 --- a/lib/libc/i386/stdlib/ldiv.S +++ b/lib/libc/i386/stdlib/ldiv.S @@ -27,12 +27,12 @@ * (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: ldiv.S,v 1.1 1993/12/04 21:46:17 ats Exp $ + * $Id: ldiv.S,v 1.1 1994/08/05 01:18:21 wollman Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: ldiv.S,v 1.1 1993/12/04 21:46:17 ats Exp $" + .asciz "$Id: ldiv.S,v 1.1 1994/08/05 01:18:21 wollman Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc index be5827f0e4cf5..df9bf9855ea2b 100644 --- a/lib/libc/i386/string/Makefile.inc +++ b/lib/libc/i386/string/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id$ +# $Id: Makefile.inc,v 1.4 1995/01/23 01:28:45 davidg Exp $ SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \ memmove.S memset.S \ diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S index c15975a3b685d..8452fdf8728af 100644 --- a/lib/libc/i386/string/bcmp.S +++ b/lib/libc/i386/string/bcmp.S @@ -27,12 +27,12 @@ * (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: bcmp.S,v 1.1 1994/08/05 01:18:23 wollman Exp $ + * $Id: bcmp.S,v 1.2 1995/01/23 01:28:47 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: bcmp.S,v 1.1 1994/08/05 01:18:23 wollman Exp $" + .asciz "$Id: bcmp.S,v 1.2 1995/01/23 01:28:47 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S index facfc3a962318..dd51ef2d8f674 100644 --- a/lib/libc/i386/string/bcopy.S +++ b/lib/libc/i386/string/bcopy.S @@ -32,12 +32,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bcopy.S,v 1.2 1995/01/23 01:28:49 davidg Exp $ + * $Id: bcopy.S,v 1.2.4.2 1996/06/05 02:47:34 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: bcopy.S,v 1.2 1995/01/23 01:28:49 davidg Exp $" + .asciz "$Id: bcopy.S,v 1.2.4.2 1996/06/05 02:47:34 jkh Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S index 74a1d03c46eef..1fe7299449c4d 100644 --- a/lib/libc/i386/string/bzero.S +++ b/lib/libc/i386/string/bzero.S @@ -27,12 +27,12 @@ * (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: bzero.S,v 1.1 1994/08/05 01:18:25 wollman Exp $ + * $Id: bzero.S,v 1.2 1995/01/23 01:28:52 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: bzero.S,v 1.1 1994/08/05 01:18:25 wollman Exp $" + .asciz "$Id: bzero.S,v 1.2 1995/01/23 01:28:52 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S index 69ef90e17ec66..e42c8a1b74c4b 100644 --- a/lib/libc/i386/string/ffs.S +++ b/lib/libc/i386/string/ffs.S @@ -27,12 +27,12 @@ * (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: ffs.S,v 1.1 1994/08/05 01:18:26 wollman Exp $ + * $Id: ffs.S,v 1.2 1995/01/23 01:28:54 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: ffs.S,v 1.1 1994/08/05 01:18:26 wollman Exp $" + .asciz "$Id: ffs.S,v 1.2 1995/01/23 01:28:54 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S index f7b0d8d53e858..a9984f6f79d22 100644 --- a/lib/libc/i386/string/index.S +++ b/lib/libc/i386/string/index.S @@ -27,12 +27,12 @@ * (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: index.S,v 1.1 1994/08/05 01:18:27 wollman Exp $ + * $Id: index.S,v 1.2 1995/01/23 01:28:56 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: index.S,v 1.1 1994/08/05 01:18:27 wollman Exp $" + .asciz "$Id: index.S,v 1.2 1995/01/23 01:28:56 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S index dd989d4c01f05..236f7d8f12ec7 100644 --- a/lib/libc/i386/string/memchr.S +++ b/lib/libc/i386/string/memchr.S @@ -27,12 +27,12 @@ * (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: memchr.S,v 1.4 1994/11/25 08:58:53 davidg Exp $ + * $Id: memchr.S,v 1.5 1995/01/23 01:28:58 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: memchr.S,v 1.4 1994/11/25 08:58:53 davidg Exp $" + .asciz "$Id: memchr.S,v 1.5 1995/01/23 01:28:58 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S index f43329d8e724f..919632f0d634f 100644 --- a/lib/libc/i386/string/memcmp.S +++ b/lib/libc/i386/string/memcmp.S @@ -27,12 +27,12 @@ * (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: memcmp.S,v 1.1 1994/08/05 01:18:29 wollman Exp $ + * $Id: memcmp.S,v 1.2 1995/01/23 01:29:00 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: memcmp.S,v 1.1 1994/08/05 01:18:29 wollman Exp $" + .asciz "$Id: memcmp.S,v 1.2 1995/01/23 01:29:00 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S index 27d6d3178bf0e..e80ba63cc8ee5 100644 --- a/lib/libc/i386/string/memmove.S +++ b/lib/libc/i386/string/memmove.S @@ -32,12 +32,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: memmove.S,v 1.2 1995/01/23 01:29:02 davidg Exp $ + * $Id: memmove.S,v 1.2.4.2 1996/06/05 02:47:35 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: memmove.S,v 1.2 1995/01/23 01:29:02 davidg Exp $" + .asciz "$Id: memmove.S,v 1.2.4.2 1996/06/05 02:47:35 jkh Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S index 412bcbb2cca91..3b84777b4b9de 100644 --- a/lib/libc/i386/string/memset.S +++ b/lib/libc/i386/string/memset.S @@ -27,12 +27,12 @@ * (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: memset.S,v 1.1 1994/08/05 01:18:30 wollman Exp $ + * $Id: memset.S,v 1.2 1995/01/23 01:29:04 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: memset.S,v 1.1 1994/08/05 01:18:30 wollman Exp $" + .asciz "$Id: memset.S,v 1.2 1995/01/23 01:29:04 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S index 53af042ab1856..5d7718ae2a1bb 100644 --- a/lib/libc/i386/string/rindex.S +++ b/lib/libc/i386/string/rindex.S @@ -27,12 +27,12 @@ * (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: rindex.S,v 1.1 1994/08/05 01:18:31 wollman Exp $ + * $Id: rindex.S,v 1.2 1995/01/23 01:29:06 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: rindex.S,v 1.1 1994/08/05 01:18:31 wollman Exp $" + .asciz "$Id: rindex.S,v 1.2 1995/01/23 01:29:06 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S index 9d5e119cb56be..f5166a5e68b0a 100644 --- a/lib/libc/i386/string/strcat.S +++ b/lib/libc/i386/string/strcat.S @@ -27,12 +27,12 @@ * (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: strcat.S,v 1.1 1994/08/05 01:18:32 wollman Exp $ + * $Id: strcat.S,v 1.2 1995/01/23 01:29:09 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strcat.S,v 1.1 1994/08/05 01:18:32 wollman Exp $" + .asciz "$Id: strcat.S,v 1.2 1995/01/23 01:29:09 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S index dd2e680545a22..97ed471e42dea 100644 --- a/lib/libc/i386/string/strchr.S +++ b/lib/libc/i386/string/strchr.S @@ -27,12 +27,12 @@ * (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: strchr.S,v 1.1 1994/08/05 01:18:33 wollman Exp $ + * $Id: strchr.S,v 1.2 1995/01/23 01:29:12 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strchr.S,v 1.1 1994/08/05 01:18:33 wollman Exp $" + .asciz "$Id: strchr.S,v 1.2 1995/01/23 01:29:12 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S index ef076c51dd282..434a0aed91c39 100644 --- a/lib/libc/i386/string/strcmp.S +++ b/lib/libc/i386/string/strcmp.S @@ -27,12 +27,12 @@ * (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: strcmp.S,v 1.1 1994/08/05 01:18:34 wollman Exp $ + * $Id: strcmp.S,v 1.2 1995/01/23 01:29:14 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strcmp.S,v 1.1 1994/08/05 01:18:34 wollman Exp $" + .asciz "$Id: strcmp.S,v 1.2 1995/01/23 01:29:14 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S index 2d93e46455266..c74651cfbb066 100644 --- a/lib/libc/i386/string/strcpy.S +++ b/lib/libc/i386/string/strcpy.S @@ -27,12 +27,12 @@ * (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: strcpy.S,v 1.1 1994/08/05 01:18:34 wollman Exp $ + * $Id: strcpy.S,v 1.2 1995/01/23 01:29:17 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strcpy.S,v 1.1 1994/08/05 01:18:34 wollman Exp $" + .asciz "$Id: strcpy.S,v 1.2 1995/01/23 01:29:17 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S index 16eee1aba4560..00da10187875a 100644 --- a/lib/libc/i386/string/strlen.S +++ b/lib/libc/i386/string/strlen.S @@ -27,12 +27,12 @@ * (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: strlen.S,v 1.1 1994/08/05 01:18:35 wollman Exp $ + * $Id: strlen.S,v 1.2 1995/01/23 01:29:19 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strlen.S,v 1.1 1994/08/05 01:18:35 wollman Exp $" + .asciz "$Id: strlen.S,v 1.2 1995/01/23 01:29:19 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S index 20788bd9eadc5..adea7752dd54c 100644 --- a/lib/libc/i386/string/strncmp.S +++ b/lib/libc/i386/string/strncmp.S @@ -27,12 +27,12 @@ * (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: strncmp.S,v 1.2 1994/12/27 13:12:34 bde Exp $ + * $Id: strncmp.S,v 1.3 1995/01/23 01:29:21 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strncmp.S,v 1.2 1994/12/27 13:12:34 bde Exp $" + .asciz "$Id: strncmp.S,v 1.3 1995/01/23 01:29:21 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S index 28f063795ad12..8ee670d8c974f 100644 --- a/lib/libc/i386/string/strrchr.S +++ b/lib/libc/i386/string/strrchr.S @@ -27,12 +27,12 @@ * (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: strrchr.S,v 1.1 1994/08/05 01:18:37 wollman Exp $ + * $Id: strrchr.S,v 1.2 1995/01/23 01:29:23 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: strrchr.S,v 1.1 1994/08/05 01:18:37 wollman Exp $" + .asciz "$Id: strrchr.S,v 1.2 1995/01/23 01:29:23 davidg Exp $" #endif /* LIBC_RCS and not lint */ #include "DEFS.h" diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S index 87deded2443b6..6e062449521db 100644 --- a/lib/libc/i386/string/swab.S +++ b/lib/libc/i386/string/swab.S @@ -27,12 +27,12 @@ * (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: swab.S,v 1.1 1995/01/22 21:36:15 davidg Exp $ + * $Id: swab.S,v 1.2 1995/01/23 01:29:25 davidg Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: swab.S,v 1.1 1995/01/22 21:36:15 davidg Exp $" + .asciz "$Id: swab.S,v 1.2 1995/01/23 01:29:25 davidg Exp $" #endif #include "DEFS.h" diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc index 6774dd3425a95..4bbec8b7a7b67 100644 --- a/lib/libc/i386/sys/Makefile.inc +++ b/lib/libc/i386/sys/Makefile.inc @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $Id$ +# $Id: Makefile.inc,v 1.2 1994/02/21 05:19:06 rgrimes Exp $ .PATH: ${.CURDIR}/${MACHINE}/sys diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S index a941be2d71820..bbe84c5c3632f 100644 --- a/lib/libc/i386/sys/Ovfork.S +++ b/lib/libc/i386/sys/Ovfork.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Ovfork.S,v 1.2 1995/01/23 01:29:37 davidg Exp $ + * $Id: Ovfork.S,v 1.2.4.2 1996/06/05 02:47:37 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: Ovfork.S,v 1.2 1995/01/23 01:29:37 davidg Exp $" + .asciz "$Id: Ovfork.S,v 1.2.4.2 1996/06/05 02:47:37 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S index a76d22b3fd165..eab506377d251 100644 --- a/lib/libc/i386/sys/brk.S +++ b/lib/libc/i386/sys/brk.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: brk.S,v 1.2.4.2 1996/06/05 02:47:37 jkh Exp $ + * $Id: brk.S,v 1.2.4.3 1996/06/25 18:57:44 bde Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: brk.S,v 1.2.4.2 1996/06/05 02:47:37 jkh Exp $" + .asciz "$Id: brk.S,v 1.2.4.3 1996/06/25 18:57:44 bde Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S index 8c49bd4aeab47..a726d5cbb7984 100644 --- a/lib/libc/i386/sys/cerror.S +++ b/lib/libc/i386/sys/cerror.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cerror.S,v 1.3 1995/01/23 01:29:43 davidg Exp $ + * $Id: cerror.S,v 1.3.4.2 1996/06/05 02:47:38 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: cerror.S,v 1.3 1995/01/23 01:29:43 davidg Exp $" + .asciz "$Id: cerror.S,v 1.3.4.2 1996/06/05 02:47:38 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S index 9fe53d21bc570..893a3688a40aa 100644 --- a/lib/libc/i386/sys/exect.S +++ b/lib/libc/i386/sys/exect.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exect.S,v 1.2 1995/01/23 01:29:46 davidg Exp $ + * $Id: exect.S,v 1.2.4.2 1996/06/05 02:47:39 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: exect.S,v 1.2 1995/01/23 01:29:46 davidg Exp $" + .asciz "$Id: exect.S,v 1.2.4.2 1996/06/05 02:47:39 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/fork.S b/lib/libc/i386/sys/fork.S index 8b85077113391..a8a823863e132 100644 --- a/lib/libc/i386/sys/fork.S +++ b/lib/libc/i386/sys/fork.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: fork.S,v 1.2 1995/01/23 01:29:48 davidg Exp $ + * $Id: fork.S,v 1.2.4.2 1996/06/05 02:47:40 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: fork.S,v 1.2 1995/01/23 01:29:48 davidg Exp $" + .asciz "$Id: fork.S,v 1.2.4.2 1996/06/05 02:47:40 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2 index ade7e10b139f3..8d131c9628a3f 100644 --- a/lib/libc/i386/sys/i386_get_ldt.2 +++ b/lib/libc/i386/sys/i386_get_ldt.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91 -.\" $Id: i386_get_ldt.2,v 1.2 1993/10/09 00:59:10 cgd Exp $ +.\" $Id: i386_get_ldt.2,v 1.1 1994/01/31 12:05:30 davidg Exp $ .\" .Dd September 20, 1993 .Dt I386_GET_LDT 2 diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c index 8c4e5d221a064..5267839ec0efa 100644 --- a/lib/libc/i386/sys/i386_get_ldt.c +++ b/lib/libc/i386/sys/i386_get_ldt.c @@ -25,11 +25,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: i386_get_ldt.c,v 1.2 1995/01/23 01:29:50 davidg Exp $ + * $Id: i386_get_ldt.c,v 1.3 1995/05/30 05:40:37 rgrimes Exp $ */ #if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = "$Id: i386_get_ldt.c,v 1.2 1995/01/23 01:29:50 davidg Exp $"; +static const char rcsid[] = "$Id: i386_get_ldt.c,v 1.3 1995/05/30 05:40:37 rgrimes Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c index 8754fd12344ed..3c81a2cf36fd7 100644 --- a/lib/libc/i386/sys/i386_set_ldt.c +++ b/lib/libc/i386/sys/i386_set_ldt.c @@ -25,11 +25,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: i386_set_ldt.c,v 1.2 1995/01/23 01:29:53 davidg Exp $ + * $Id: i386_set_ldt.c,v 1.3 1995/05/30 05:40:38 rgrimes Exp $ */ #if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = "$Id: i386_set_ldt.c,v 1.2 1995/01/23 01:29:53 davidg Exp $"; +static const char rcsid[] = "$Id: i386_set_ldt.c,v 1.3 1995/05/30 05:40:38 rgrimes Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/i386/sys/mount.S b/lib/libc/i386/sys/mount.S index 3fbcd637db8c2..a28af7a081848 100644 --- a/lib/libc/i386/sys/mount.S +++ b/lib/libc/i386/sys/mount.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mount.S,v 1.1 1994/08/05 01:18:45 wollman Exp $ + * $Id: mount.S,v 1.2 1995/01/23 01:29:55 davidg Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: mount.S,v 1.2 1995/01/23 01:29:55 davidg Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S index 1741cd24e7d1d..40c74d5f1d047 100644 --- a/lib/libc/i386/sys/pipe.S +++ b/lib/libc/i386/sys/pipe.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pipe.S,v 1.2 1995/01/23 01:29:57 davidg Exp $ + * $Id: pipe.S,v 1.2.4.2 1996/06/05 02:47:40 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: pipe.S,v 1.2 1995/01/23 01:29:57 davidg Exp $" + .asciz "$Id: pipe.S,v 1.2.4.2 1996/06/05 02:47:40 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S index d18dd0a193a49..341dc7bd7ff08 100644 --- a/lib/libc/i386/sys/ptrace.S +++ b/lib/libc/i386/sys/ptrace.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ptrace.S,v 1.2 1995/01/23 01:29:59 davidg Exp $ + * $Id: ptrace.S,v 1.2.4.2 1996/06/05 02:47:41 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: ptrace.S,v 1.2 1995/01/23 01:29:59 davidg Exp $" + .asciz "$Id: ptrace.S,v 1.2.4.2 1996/06/05 02:47:41 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S index f90cca00cb41d..5bfd77ea97598 100644 --- a/lib/libc/i386/sys/reboot.S +++ b/lib/libc/i386/sys/reboot.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: reboot.S,v 1.1 1994/08/05 01:18:48 wollman Exp $ + * $Id: reboot.S,v 1.2 1995/01/23 01:30:02 davidg Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id$" + .asciz "$Id: reboot.S,v 1.2 1995/01/23 01:30:02 davidg Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S index 90729f651ca67..a1107fa146da4 100644 --- a/lib/libc/i386/sys/sbrk.S +++ b/lib/libc/i386/sys/sbrk.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sbrk.S,v 1.2 1995/01/23 01:30:04 davidg Exp $ + * $Id: sbrk.S,v 1.2.4.2 1996/06/05 02:47:42 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sbrk.S,v 1.2 1995/01/23 01:30:04 davidg Exp $" + .asciz "$Id: sbrk.S,v 1.2.4.2 1996/06/05 02:47:42 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S index 27e23a74ca3b9..68c2e69dac5c8 100644 --- a/lib/libc/i386/sys/setlogin.S +++ b/lib/libc/i386/sys/setlogin.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: setlogin.S,v 1.2 1995/01/23 01:30:06 davidg Exp $ + * $Id: setlogin.S,v 1.2.4.2 1996/06/05 02:47:42 jkh Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$Id: setlogin.S,v 1.2 1995/01/23 01:30:06 davidg Exp $" + .asciz "$Id: setlogin.S,v 1.2.4.2 1996/06/05 02:47:42 jkh Exp $" #endif /* LIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigpending.S b/lib/libc/i386/sys/sigpending.S index d42a765dbf321..a7e958f5ac687 100644 --- a/lib/libc/i386/sys/sigpending.S +++ b/lib/libc/i386/sys/sigpending.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigpending.S,v 1.2 1995/01/23 01:30:08 davidg Exp $ + * $Id: sigpending.S,v 1.2.4.2 1996/06/05 02:47:43 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigpending.S,v 1.2 1995/01/23 01:30:08 davidg Exp $" + .asciz "$Id: sigpending.S,v 1.2.4.2 1996/06/05 02:47:43 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigprocmask.S b/lib/libc/i386/sys/sigprocmask.S index a433522a1aa51..73d65a216dd13 100644 --- a/lib/libc/i386/sys/sigprocmask.S +++ b/lib/libc/i386/sys/sigprocmask.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigprocmask.S,v 1.2 1995/01/23 01:30:11 davidg Exp $ + * $Id: sigprocmask.S,v 1.2.4.2 1996/06/05 02:47:44 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigprocmask.S,v 1.2 1995/01/23 01:30:11 davidg Exp $" + .asciz "$Id: sigprocmask.S,v 1.2.4.2 1996/06/05 02:47:44 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S index 884fb1ebc58ef..4dfe870daf891 100644 --- a/lib/libc/i386/sys/sigreturn.S +++ b/lib/libc/i386/sys/sigreturn.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigreturn.S,v 1.2 1995/01/23 01:30:16 davidg Exp $ + * $Id: sigreturn.S,v 1.2.4.2 1996/06/05 02:47:44 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigreturn.S,v 1.2 1995/01/23 01:30:16 davidg Exp $" + .asciz "$Id: sigreturn.S,v 1.2.4.2 1996/06/05 02:47:44 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/sigsuspend.S b/lib/libc/i386/sys/sigsuspend.S index 823204187886d..5643a7a3dc964 100644 --- a/lib/libc/i386/sys/sigsuspend.S +++ b/lib/libc/i386/sys/sigsuspend.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sigsuspend.S,v 1.2 1995/01/23 01:30:20 davidg Exp $ + * $Id: sigsuspend.S,v 1.2.4.2 1996/06/05 02:47:45 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: sigsuspend.S,v 1.2 1995/01/23 01:30:20 davidg Exp $" + .asciz "$Id: sigsuspend.S,v 1.2.4.2 1996/06/05 02:47:45 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S index 89e91e9c6d50d..c9517e4c067a8 100644 --- a/lib/libc/i386/sys/syscall.S +++ b/lib/libc/i386/sys/syscall.S @@ -33,12 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscall.S,v 1.2 1995/01/23 01:30:24 davidg Exp $ + * $Id: syscall.S,v 1.2.4.2 1996/06/05 02:47:46 jkh Exp $ */ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$Id: syscall.S,v 1.2 1995/01/23 01:30:24 davidg Exp $" + .asciz "$Id: syscall.S,v 1.2.4.2 1996/06/05 02:47:46 jkh Exp $" #endif /* SYSLIBC_RCS and not lint */ #include "SYS.h" diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index e261d3fd4d374..a2beb42429d65 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: collate.c,v 1.4.4.2 1996/06/05 02:47:55 jkh Exp $ + * $Id: collate.c,v 1.4.4.3 1997/02/05 10:03:59 davidg Exp $ */ #include diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h index c7c0b6d668b68..80b60ea20a0a9 100644 --- a/lib/libc/locale/collate.h +++ b/lib/libc/locale/collate.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: collate.h,v 1.4 1995/01/27 12:51:06 alex Exp alex $ + * $Id: collate.h,v 1.1 1995/02/16 04:24:32 ache Exp $ */ #ifndef COLLATE_H_INCLUDED diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c index eeab30c319ac6..fc4f4fd1d17de 100644 --- a/lib/libc/net/ether_addr.c +++ b/lib/libc/net/ether_addr.c @@ -35,7 +35,7 @@ * Center for Telecommunications Research * Columbia University, New York City * - * $Id: ether_addr.c,v 1.1.4.3 1996/06/05 02:48:19 jkh Exp $ + * $Id: ether_addr.c,v 1.1.4.4 1996/06/25 21:02:18 wpaul Exp $ */ diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3 index 32bb73c565682..65d08bd1f0a11 100644 --- a/lib/libc/net/ethers.3 +++ b/lib/libc/net/ethers.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ethers.3,v 1.1.4.2 1996/06/05 02:48:20 jkh Exp $ +.\" $Id: ethers.3,v 1.1.4.3 1996/06/27 05:31:46 gpalmer Exp $ .\" .Dd April 12, 1995 .Dt ETHERS 3 diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c index 00a0aa5454e10..3ee4c6e7c66dc 100644 --- a/lib/libc/net/gethostbydns.c +++ b/lib/libc/net/gethostbydns.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: gethostbydns.c,v 1.4.4.5 1996/11/20 18:36:37 pst Exp $"; +static char rcsid[] = "$Id: gethostbydns.c,v 1.4.4.6 1996/11/22 18:07:52 fenner Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c index 97f8d1f484f14..62c688f06a6a2 100644 --- a/lib/libc/net/gethostbyht.c +++ b/lib/libc/net/gethostbyht.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: gethostbyht.c,v 1.2 1995/05/30 05:40:44 rgrimes Exp $"; +static char rcsid[] = "$Id: gethostbyht.c,v 1.2.4.2 1996/06/05 02:48:22 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c index 7d0960673c38f..4a8ffc7f25834 100644 --- a/lib/libc/net/gethostbynis.c +++ b/lib/libc/net/gethostbynis.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id: gethostbynis.c,v 1.2 1996/03/16 21:25:58 wpaul Exp $"; -static char rcsid[] = "$Id: gethostbynis.c,v 1.2 1996/03/16 21:25:58 wpaul Exp $"; +static char sccsid[] = "@(#)$Id: gethostbynis.c,v 1.1.6.3 1996/06/25 03:22:19 wpaul Exp $"; +static char rcsid[] = "$Id: gethostbynis.c,v 1.1.6.3 1996/06/25 03:22:19 wpaul Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c index 54f78d01fa82b..e1f4627bd033d 100644 --- a/lib/libc/net/gethostnamadr.c +++ b/lib/libc/net/gethostnamadr.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id: gethostnamadr.c,v 1.6 1995/03/24 15:38:54 ache Exp $"; -static char rcsid[] = "$Id: gethostnamadr.c,v 1.6 1995/03/24 15:38:54 ache Exp $"; +static char sccsid[] = "@(#)$Id: gethostnamadr.c,v 1.7 1995/05/30 05:40:45 rgrimes Exp $"; +static char rcsid[] = "$Id: gethostnamadr.c,v 1.7 1995/05/30 05:40:45 rgrimes Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c index 6b3eb44a3011b..ec705807fe1ff 100644 --- a/lib/libc/net/getnetbydns.c +++ b/lib/libc/net/getnetbydns.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: getnetbydns.c,v 1.3 1995/05/30 05:40:46 rgrimes Exp $"; +static char rcsid[] = "$Id: getnetbydns.c,v 1.3.4.2 1996/06/05 02:48:24 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c index 013b08aba2792..6ddfbccef808c 100644 --- a/lib/libc/net/getnetbynis.c +++ b/lib/libc/net/getnetbynis.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id: getnetbynis.c,v 1.5 1996/03/23 22:16:22 wpaul Exp $"; -static char rcsid[] = "$Id: getnetbynis.c,v 1.5 1996/03/23 22:16:22 wpaul Exp $"; +static char sccsid[] = "@(#)$Id: getnetbynis.c,v 1.3.4.3 1996/06/25 03:22:21 wpaul Exp $"; +static char rcsid[] = "$Id: getnetbynis.c,v 1.3.4.3 1996/06/25 03:22:21 wpaul Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c index 5d99c8f9c9d86..550776149e6e4 100644 --- a/lib/libc/net/getnetnamadr.c +++ b/lib/libc/net/getnetnamadr.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id: getnetnamadr.c,v 1.3 1995/03/24 15:51:30 ache Exp $"; -static char rcsid[] = "$Id: getnetnamadr.c,v 1.3 1995/03/24 15:51:30 ache Exp $"; +static char sccsid[] = "@(#)$Id: getnetnamadr.c,v 1.4 1995/05/30 05:40:48 rgrimes Exp $"; +static char rcsid[] = "$Id: getnetnamadr.c,v 1.4 1995/05/30 05:40:48 rgrimes Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c index 207445358c619..ab7796d0961de 100644 --- a/lib/libc/net/herror.c +++ b/lib/libc/net/herror.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: herror.c,v 1.2.4.1 1995/08/30 04:06:46 davidg Exp $"; +static char rcsid[] = "$Id: herror.c,v 1.2.4.3 1996/06/05 02:48:27 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c index 58b26deada88e..283a0edf96c61 100644 --- a/lib/libc/net/res_comp.c +++ b/lib/libc/net/res_comp.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_comp.c,v 1.3 1995/05/30 05:40:54 rgrimes Exp $"; +static char rcsid[] = "$Id: res_comp.c,v 1.3.4.2 1996/06/05 02:48:31 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c index 74aef85b538f0..051844da34022 100644 --- a/lib/libc/net/res_debug.c +++ b/lib/libc/net/res_debug.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_debug.c,v 1.3.4.1 1995/08/30 04:06:48 davidg Exp $"; +static char rcsid[] = "$Id: res_debug.c,v 1.3.4.3 1996/06/05 02:48:34 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index 2e5e396aab747..45a1f40414c6a 100644 --- a/lib/libc/net/res_init.c +++ b/lib/libc/net/res_init.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static char rcsid[] = "$Id: res_init.c,v 1.4.4.1 1995/08/30 04:06:52 davidg Exp $"; +static char rcsid[] = "$Id: res_init.c,v 1.4.4.3 1996/06/05 02:48:36 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c index c942a2e3a62e3..1dc5315704d62 100644 --- a/lib/libc/net/res_mkquery.c +++ b/lib/libc/net/res_mkquery.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_mkquery.c,v 1.4.4.1 1995/08/30 04:06:54 davidg Exp $"; +static char rcsid[] = "$Id: res_mkquery.c,v 1.4.4.3 1996/06/05 02:48:37 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c index 2a1ce53a1329b..731d9f55c4741 100644 --- a/lib/libc/net/res_query.c +++ b/lib/libc/net/res_query.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_query.c,v 1.4.4.1 1995/08/30 04:06:57 davidg Exp $"; +static char rcsid[] = "$Id: res_query.c,v 1.4.4.3 1996/06/05 02:48:38 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index b3ea98c4b3907..f3c13bf15aebc 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id: res_send.c,v 1.4.4.1 1995/08/30 04:06:59 davidg Exp $"; +static char rcsid[] = "$Id: res_send.c,v 1.4.4.3 1996/06/05 02:48:39 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ /* change this to "0" diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3 index f9803ffcaff7b..8b46e0977fada 100644 --- a/lib/libc/nls/catclose.3 +++ b/lib/libc/nls/catclose.3 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: catclose.3,v 1.1 1995/03/30 12:47:20 jkh Exp $ .\" .\" Copyright (c) 1994 Winning Strategies, Inc. .\" All rights reserved. diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c index 341f6643aa808..501269292f6ca 100644 --- a/lib/libc/nls/catclose.c +++ b/lib/libc/nls/catclose.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: catclose.c,v 1.1 1995/03/30 12:47:21 jkh Exp $ */ /* * Written by J.T. Conklin, 10/05/94 diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3 index f644130f343ae..ecc1c0c38c8e9 100644 --- a/lib/libc/nls/catgets.3 +++ b/lib/libc/nls/catgets.3 @@ -1,4 +1,4 @@ -.\" $Id: catgets.3,v 1.1 1995/03/30 12:47:23 jkh Exp $ +.\" $Id: catgets.3,v 1.1.4.2 1996/06/05 02:48:45 jkh Exp $ .\" .\" Copyright (c) 1994 Winning Strategies, Inc. .\" All rights reserved. diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c index c29cf64684142..f2792787e96ed 100644 --- a/lib/libc/nls/catgets.c +++ b/lib/libc/nls/catgets.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: catgets.c,v 1.1 1995/03/30 12:47:23 jkh Exp $ */ /* * Written by J.T. Conklin, 10/05/94 diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3 index 109829f0ddf33..ed3160abc2e11 100644 --- a/lib/libc/nls/catopen.3 +++ b/lib/libc/nls/catopen.3 @@ -1,4 +1,4 @@ -.\" $Id: catopen.3,v 1.1 1995/03/30 12:47:24 jkh Exp $ +.\" $Id: catopen.3,v 1.1.4.1 1996/01/30 16:45:41 mpp Exp $ .\" .\" Copyright (c) 1994 Winning Strategies, Inc. .\" All rights reserved. diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c index 5dfb727c5812b..217c9c8ec63ab 100644 --- a/lib/libc/nls/catopen.c +++ b/lib/libc/nls/catopen.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: catopen.c,v 1.1 1995/03/30 12:47:25 jkh Exp $ */ /* * Written by J.T. Conklin, 10/05/94 diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c index 5bf3947ddd5f6..e454fa40fd2bc 100644 --- a/lib/libc/nls/msgcat.c +++ b/lib/libc/nls/msgcat.c @@ -1,4 +1,4 @@ -/* $Id: msgcat.c,v 1.2.4.1 1995/08/28 05:06:51 davidg Exp $ */ +/* $Id: msgcat.c,v 1.2.4.3 1996/06/05 02:48:46 jkh Exp $ */ /*********************************************************** Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts. diff --git a/lib/libc/nls/msgcat.h b/lib/libc/nls/msgcat.h index 4fabb591529b4..e2636e01a2203 100644 --- a/lib/libc/nls/msgcat.h +++ b/lib/libc/nls/msgcat.h @@ -1,4 +1,4 @@ -/* $Id: msgcat.h,v 1.1 1995/03/30 12:47:27 jkh Exp $ */ +/* $Id: msgcat.h,v 1.2 1995/05/30 05:41:00 rgrimes Exp $ */ /* -*-c++-*- */ diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c index 9993392bdff68..13bdf76faac9d 100644 --- a/lib/libc/rpc/auth_none.c +++ b/lib/libc/rpc/auth_none.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: auth_none.c,v 1.2 1995/05/30 05:41:11 rgrimes Exp $"; +static char *rcsid = "$Id: auth_none.c,v 1.2.4.2 1996/06/05 02:48:55 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c index 777f42182371d..410287c9f7298 100644 --- a/lib/libc/rpc/auth_unix.c +++ b/lib/libc/rpc/auth_unix.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)auth_unix.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: auth_unix.c,v 1.4 1995/05/30 05:41:12 rgrimes Exp $"; +static char *rcsid = "$Id: auth_unix.c,v 1.4.4.2 1996/06/05 02:48:56 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c index 5a8c2a465ed7c..c818ba0de77c9 100644 --- a/lib/libc/rpc/authunix_prot.c +++ b/lib/libc/rpc/authunix_prot.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)authunix_prot.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: authunix_prot.c,v 1.1 1994/08/07 18:35:40 wollman Exp $"; +static char *rcsid = "$Id: authunix_prot.c,v 1.2 1995/05/30 05:41:12 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c index e7cfe8bc91b9f..ba178d5168e58 100644 --- a/lib/libc/rpc/bindresvport.c +++ b/lib/libc/rpc/bindresvport.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/ /*static char *sccsid = "from: @(#)bindresvport.c 2.2 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: bindresvport.c,v 1.2 1995/05/30 05:41:13 rgrimes Exp $"; +static char *rcsid = "$Id: bindresvport.c,v 1.2.4.2 1996/06/05 02:48:58 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c index 96f4c3de726ac..75580fe8695da 100644 --- a/lib/libc/rpc/clnt_generic.c +++ b/lib/libc/rpc/clnt_generic.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";*/ /*static char *sccsid = "from: @(#)clnt_generic.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_generic.c,v 1.2 1995/05/30 05:41:14 rgrimes Exp $"; +static char *rcsid = "$Id: clnt_generic.c,v 1.2.4.2 1996/06/05 02:48:58 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c index f7ef47fbde09c..23ebc482d0d27 100644 --- a/lib/libc/rpc/clnt_perror.c +++ b/lib/libc/rpc/clnt_perror.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)clnt_perror.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_perror.c,v 1.2 1995/05/30 05:41:15 rgrimes Exp $"; +static char *rcsid = "$Id: clnt_perror.c,v 1.2.4.2 1996/06/05 02:48:59 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c index 8f8a3d8d5f9ae..ca9483ee0d6f7 100644 --- a/lib/libc/rpc/clnt_raw.c +++ b/lib/libc/rpc/clnt_raw.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)clnt_raw.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_raw.c,v 1.2 1995/05/30 05:41:16 rgrimes Exp $"; +static char *rcsid = "$Id: clnt_raw.c,v 1.2.4.2 1996/06/05 02:49:00 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c index df7fbf8df2419..d1238ca821b6f 100644 --- a/lib/libc/rpc/clnt_simple.c +++ b/lib/libc/rpc/clnt_simple.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)clnt_simple.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_simple.c,v 1.2 1995/05/30 05:41:17 rgrimes Exp $"; +static char *rcsid = "$Id: clnt_simple.c,v 1.2.4.2 1996/06/05 02:49:01 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c index 493049066dc97..0f1810c639f13 100644 --- a/lib/libc/rpc/clnt_tcp.c +++ b/lib/libc/rpc/clnt_tcp.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_tcp.c,v 1.2.4.2 1996/06/05 02:49:02 jkh Exp $"; +static char *rcsid = "$Id: clnt_tcp.c,v 1.2.4.3 1996/06/10 20:22:10 jraynard Exp $"; #endif /* diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c index 4a9117c9dec9c..600088143ded8 100644 --- a/lib/libc/rpc/clnt_udp.c +++ b/lib/libc/rpc/clnt_udp.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)clnt_udp.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: clnt_udp.c,v 1.3.4.3 1996/06/05 02:49:03 jkh Exp $"; +static char *rcsid = "$Id: clnt_udp.c,v 1.3.4.4 1996/06/10 20:22:12 jraynard Exp $"; #endif /* diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c index 04399c4c57d3a..1e9d3e34d81ba 100644 --- a/lib/libc/rpc/get_myaddress.c +++ b/lib/libc/rpc/get_myaddress.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)get_myaddress.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: get_myaddress.c,v 1.2 1995/05/30 05:41:20 rgrimes Exp $"; +static char *rcsid = "$Id: get_myaddress.c,v 1.2.4.2 1996/06/05 02:49:05 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c index 824a81eb39e04..44511ae0b1fe6 100644 --- a/lib/libc/rpc/getrpcent.c +++ b/lib/libc/rpc/getrpcent.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";*/ -static char *rcsid = "$Id: getrpcent.c,v 1.2 1995/05/30 05:41:21 rgrimes Exp $"; +static char *rcsid = "$Id: getrpcent.c,v 1.2.4.2 1996/06/05 02:49:07 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c index a081dd8771b8f..4ce03488ad003 100644 --- a/lib/libc/rpc/getrpcport.c +++ b/lib/libc/rpc/getrpcport.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)getrpcport.c 1.3 87/08/11 SMI";*/ /*static char *sccsid = "from: @(#)getrpcport.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: getrpcport.c,v 1.2 1995/05/30 05:41:22 rgrimes Exp $"; +static char *rcsid = "$Id: getrpcport.c,v 1.2.4.2 1996/06/05 02:49:07 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c index 8048e9bcd6631..0d83bd2411f14 100644 --- a/lib/libc/rpc/pmap_clnt.c +++ b/lib/libc/rpc/pmap_clnt.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_clnt.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_clnt.c,v 1.2 1995/05/30 05:41:22 rgrimes Exp $"; +static char *rcsid = "$Id: pmap_clnt.c,v 1.2.4.2 1996/06/05 02:49:08 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c index a5379c521182d..db2b129f6a5d0 100644 --- a/lib/libc/rpc/pmap_getmaps.c +++ b/lib/libc/rpc/pmap_getmaps.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_getmaps.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_getmaps.c,v 1.2 1995/05/30 05:41:23 rgrimes Exp $"; +static char *rcsid = "$Id: pmap_getmaps.c,v 1.2.4.2 1996/06/05 02:49:09 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c index c1cc9c6f24e92..728cf560580a7 100644 --- a/lib/libc/rpc/pmap_getport.c +++ b/lib/libc/rpc/pmap_getport.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_getport.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_getport.c,v 1.2 1995/05/30 05:41:24 rgrimes Exp $"; +static char *rcsid = "$Id: pmap_getport.c,v 1.2.4.2 1996/06/05 02:49:10 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c index 07b5acd5b2af8..fcb9c99971572 100644 --- a/lib/libc/rpc/pmap_prot.c +++ b/lib/libc/rpc/pmap_prot.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_prot.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_prot.c,v 1.1 1994/08/07 18:35:56 wollman Exp $"; +static char *rcsid = "$Id: pmap_prot.c,v 1.2 1995/05/30 05:41:25 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c index 5e937ed7114e1..d365080d72520 100644 --- a/lib/libc/rpc/pmap_prot2.c +++ b/lib/libc/rpc/pmap_prot2.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_prot2.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_prot2.c,v 1.1 1994/08/07 18:35:57 wollman Exp $"; +static char *rcsid = "$Id: pmap_prot2.c,v 1.2 1995/05/30 05:41:26 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c index 2a467bd56dae1..403a6e1764dd8 100644 --- a/lib/libc/rpc/pmap_rmt.c +++ b/lib/libc/rpc/pmap_rmt.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: pmap_rmt.c,v 1.2 1995/05/30 05:41:27 rgrimes Exp $"; +static char *rcsid = "$Id: pmap_rmt.c,v 1.2.4.2 1996/06/05 02:49:10 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c index 7077ea40fd0bc..e7cea30afa60c 100644 --- a/lib/libc/rpc/rpc_callmsg.c +++ b/lib/libc/rpc/rpc_callmsg.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)rpc_callmsg.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: rpc_callmsg.c,v 1.2 1995/05/30 05:41:28 rgrimes Exp $"; +static char *rcsid = "$Id: rpc_callmsg.c,v 1.2.4.2 1996/06/05 02:49:14 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c index aa095265b086c..8437b7982a9a6 100644 --- a/lib/libc/rpc/rpc_commondata.c +++ b/lib/libc/rpc/rpc_commondata.c @@ -29,7 +29,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)rpc_commondata.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: rpc_commondata.c,v 1.1 1994/08/07 18:36:01 wollman Exp $"; +static char *rcsid = "$Id: rpc_commondata.c,v 1.2 1995/05/30 05:41:29 rgrimes Exp $"; #endif #include diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c index 1693b6730c838..56e4e9a455bf2 100644 --- a/lib/libc/rpc/rpc_prot.c +++ b/lib/libc/rpc/rpc_prot.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";*/ -static char *rcsid = "$Id: rpc_prot.c,v 1.1 1994/08/07 18:36:03 wollman Exp $"; +static char *rcsid = "$Id: rpc_prot.c,v 1.2 1995/05/30 05:41:31 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c index 8c8354b19c0e3..41efdc79dd8be 100644 --- a/lib/libc/rpc/svc.c +++ b/lib/libc/rpc/svc.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc.c 2.4 88/08/11 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc.c,v 1.2 1995/05/30 05:41:31 rgrimes Exp $"; +static char *rcsid = "$Id: svc.c,v 1.2.4.2 1996/06/05 02:49:16 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c index 6c1e560c2be1c..7680786f7d508 100644 --- a/lib/libc/rpc/svc_auth.c +++ b/lib/libc/rpc/svc_auth.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_auth.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_auth.c 2.1 88/08/07 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_auth.c,v 1.1 1994/08/07 18:36:07 wollman Exp $"; +static char *rcsid = "$Id: svc_auth.c,v 1.2 1995/05/30 05:41:32 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c index 7a5d24be0d4ff..1e67a77ba0c87 100644 --- a/lib/libc/rpc/svc_auth_unix.c +++ b/lib/libc/rpc/svc_auth_unix.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_auth_unix.c 2.3 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_auth_unix.c,v 1.2 1995/05/30 05:41:33 rgrimes Exp $"; +static char *rcsid = "$Id: svc_auth_unix.c,v 1.2.4.2 1996/06/05 02:49:17 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c index 80aa9a126f93a..b8264d4cdb650 100644 --- a/lib/libc/rpc/svc_raw.c +++ b/lib/libc/rpc/svc_raw.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_raw.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_raw.c,v 1.2 1995/05/30 05:41:34 rgrimes Exp $"; +static char *rcsid = "$Id: svc_raw.c,v 1.2.4.2 1996/06/05 02:49:18 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c index 730acd3f19074..64dc8bc877ec6 100644 --- a/lib/libc/rpc/svc_run.c +++ b/lib/libc/rpc/svc_run.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_run.c,v 1.1 1994/08/07 18:36:09 wollman Exp $"; +static char *rcsid = "$Id: svc_run.c,v 1.2 1995/05/30 05:41:35 rgrimes Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c index 4b93a331dc829..532a2226d7674 100644 --- a/lib/libc/rpc/svc_simple.c +++ b/lib/libc/rpc/svc_simple.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_simple.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_simple.c,v 1.2 1995/05/30 05:41:37 rgrimes Exp $"; +static char *rcsid = "$Id: svc_simple.c,v 1.2.4.2 1996/06/05 02:49:19 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c index 94b5ea1dcb383..eb4ffb26546c1 100644 --- a/lib/libc/rpc/svc_tcp.c +++ b/lib/libc/rpc/svc_tcp.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_tcp.c,v 1.2 1995/05/30 05:41:38 rgrimes Exp $"; +static char *rcsid = "$Id: svc_tcp.c,v 1.2.4.2 1996/06/05 02:49:20 jkh Exp $"; #endif /* diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c index 1491a582aa4fd..171cf9f237f1a 100644 --- a/lib/libc/rpc/svc_udp.c +++ b/lib/libc/rpc/svc_udp.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)svc_udp.c 2.2 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: svc_udp.c,v 1.3 1995/05/30 05:41:39 rgrimes Exp $"; +static char *rcsid = "$Id: svc_udp.c,v 1.3.4.2 1996/06/05 02:49:21 jkh Exp $"; #endif /* diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 9c9d8ca6f68af..2d76f525c2331 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $Id: Makefile.inc,v 1.6 1996/05/29 05:00:12 jkh Exp $ +# $Id: Makefile.inc,v 1.3.4.4 1996/10/17 16:11:46 jkh Exp $ # stdio sources .PATH: ${.CURDIR}/stdio diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c index 9b4d05b4397b9..63be28cc559f5 100644 --- a/lib/libc/stdio/asprintf.c +++ b/lib/libc/stdio/asprintf.c @@ -24,7 +24,7 @@ */ #if defined(LIBC_RCS) && !defined(lint) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: asprintf.c,v 1.1 1996/05/27 10:49:42 peter Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c index 6b728e5ff8fc1..19a68b2c8c7e7 100644 --- a/lib/libc/stdio/vasprintf.c +++ b/lib/libc/stdio/vasprintf.c @@ -24,7 +24,7 @@ */ #if defined(LIBC_RCS) && !defined(lint) -static char rcsid[] = "$Id: vasprintf.c,v 1.2 1996/06/22 10:34:01 jraynard Exp $"; +static char rcsid[] = "$Id: vasprintf.c,v 1.3 1996/07/28 16:16:11 peter Exp $"; #endif /* LIBC_RCS and not lint */ #include diff --git a/lib/libc/stdlib/strhash.c b/lib/libc/stdlib/strhash.c index 860d52a5212e7..f90c2ad256589 100644 --- a/lib/libc/stdlib/strhash.c +++ b/lib/libc/stdlib/strhash.c @@ -1,5 +1,5 @@ #ifndef lint -static char *rcsid = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libc/stdlib/strhash.c,v 1.4.4.1 1996/02/11 09:05:56 jkh Exp $"; +static char *rcsid = "$Header: /home/ncvs/src/lib/libc/stdlib/strhash.c,v 1.4.4.3 1996/06/05 02:50:21 jkh Exp $"; #endif /* @@ -37,6 +37,10 @@ static char *rcsid = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libc/stdlib/strh /* * $Log: strhash.c,v $ + * Revision 1.4.4.3 1996/06/05 02:50:21 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.4.4.1 1996/02/11 09:05:56 jkh * Sync with HEAD * diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc index 4d93c365ada81..2f953ad688b4c 100644 --- a/lib/libc/stdtime/Makefile.inc +++ b/lib/libc/stdtime/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp $ +# $Id: Makefile.inc,v 1.2.6.2 1996/06/05 02:50:23 jkh Exp $ .PATH: ${.CURDIR}/stdtime diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index b0e82a7d639e0..476a1b5111e34 100644 --- a/lib/libc/stdtime/strftime.c +++ b/lib/libc/stdtime/strftime.c @@ -17,7 +17,7 @@ #ifdef LIBC_RCS static const char rcsid[] = - "$Id: strftime.c,v 1.2.4.1 1995/08/28 05:07:03 davidg Exp $"; + "$Id: strftime.c,v 1.2.4.3 1996/06/05 02:50:26 jkh Exp $"; #endif #ifndef lint diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index 915e649dbd6d9..f379822e51762 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: strcoll.c,v 1.3 1995/02/18 01:38:58 ache Exp $ + * $Id: strcoll.c,v 1.4 1995/04/16 22:43:45 ache Exp $ */ #include diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index eb02c137c0d2d..6031674e2034b 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: strxfrm.c,v 1.3 1995/02/18 01:39:00 ache Exp $ + * $Id: strxfrm.c,v 1.4 1995/02/18 11:36:33 ache Exp $ */ #include diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index f9cf5d106206e..49d36cfc14a3c 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -1,4 +1,4 @@ -.\" $Id: ptrace.2,v 1.2 1996/01/20 17:56:06 nate Exp $ +.\" $Id: ptrace.2,v 1.2.2.2 1996/06/05 02:51:35 jkh Exp $ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2 index 15c969114c18b..ccd97c8369c4d 100644 --- a/lib/libc/sys/rtprio.2 +++ b/lib/libc/sys/rtprio.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rtprio.2,v 1.2.6.3 1996/06/05 02:51:39 jkh Exp $ +.\" $Id: rtprio.2,v 1.2.6.4 1996/06/27 05:31:52 gpalmer Exp $ .\" .Dd July 23, 1994 .Dt RTPRIO 2 diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2 index 6519f12da1787..a3b9f3ecf661e 100644 --- a/lib/libc/sys/semctl.2 +++ b/lib/libc/sys/semctl.2 @@ -23,7 +23,7 @@ .\" (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: semctl.2,v 1.1 1995/10/03 19:17:17 joerg Exp $ +.\" $Id: semctl.2,v 1.1.2.1 1996/01/30 16:46:54 mpp Exp $ .\" .Dd September 12, 1995 .Dt SEMCTL 2 diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2 index 323aef47043df..2729309a57333 100644 --- a/lib/libc/sys/semget.2 +++ b/lib/libc/sys/semget.2 @@ -23,7 +23,7 @@ .\" (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$ +.\" $Id: semget.2,v 1.1 1995/10/03 19:17:18 joerg Exp $ .\" .Dd September 12, 1995 .Dt SEMGET 2 diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2 index 70e643a7c5b4a..e2134771d481e 100644 --- a/lib/libc/sys/semop.2 +++ b/lib/libc/sys/semop.2 @@ -23,7 +23,7 @@ .\" (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: semop.2,v 1.1 1995/10/03 19:17:19 joerg Exp $ +.\" $Id: semop.2,v 1.1.2.1 1996/01/30 16:46:57 mpp Exp $ .\" .Dd September 22, 1995 .Dt SEMOP 2 diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2 index 77e2ed88df250..f8c9aa5095f22 100644 --- a/lib/libc/sys/send.2 +++ b/lib/libc/sys/send.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $Id$ +.\" $Id: send.2,v 1.2 1995/02/15 22:53:02 wollman Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2 index 52fc9a266d0b9..9180983cab549 100644 --- a/lib/libc/sys/shmat.2 +++ b/lib/libc/sys/shmat.2 @@ -23,7 +23,7 @@ .\" (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: shmat.2,v 1.1 1995/10/03 19:17:20 joerg Exp $ +.\" $Id: shmat.2,v 1.1.2.1 1996/01/30 16:46:59 mpp Exp $ .\" .Dd August 2, 1995 .Dt SHMAT 2 diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2 index 59036f20dc6a5..494f5e758193f 100644 --- a/lib/libc/sys/shmctl.2 +++ b/lib/libc/sys/shmctl.2 @@ -23,7 +23,7 @@ .\" (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: shmctl.2,v 1.1 1995/10/03 19:17:21 joerg Exp $ +.\" $Id: shmctl.2,v 1.1.2.1 1996/01/30 16:47:01 mpp Exp $ .\" .Dd July 17, 1995 .Dt SHMCTL 2 diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2 index 1734f03d2baf4..c27b5c3999867 100644 --- a/lib/libc/sys/shmget.2 +++ b/lib/libc/sys/shmget.2 @@ -23,7 +23,7 @@ .\" (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: shmget.2,v 1.1 1995/10/03 19:17:21 joerg Exp $ +.\" $Id: shmget.2,v 1.1.2.1 1996/01/30 16:47:03 mpp Exp $ .\" .Dd July 3, 1995 .Dt SHMGET 2 diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2 index e048b4674173c..8f0f67f4cd555 100644 --- a/lib/libc/sys/socket.2 +++ b/lib/libc/sys/socket.2 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)socket.2 8.1 (Berkeley) 6/4/93 -.\" $Id$ +.\" $Id: socket.2,v 1.2 1995/02/15 22:53:04 wollman Exp $ .\" .Dd February 15, 1995 .Dt SOCKET 2 diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index f4530869a7092..5e810fade725a 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/ /*static char *sccsid = "from: @(#)xdr.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr.c,v 1.2 1995/05/30 05:42:03 rgrimes Exp $"; +static char *rcsid = "$Id: xdr.c,v 1.2.4.2 1996/06/05 02:52:02 jkh Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c index 57b5189ba820f..e677ca2e823ae 100644 --- a/lib/libc/xdr/xdr_array.c +++ b/lib/libc/xdr/xdr_array.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_array.c,v 1.2 1995/05/30 05:42:04 rgrimes Exp $"; +static char *rcsid = "$Id: xdr_array.c,v 1.2.4.2 1996/06/05 02:52:03 jkh Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c index 105ca43bbfad1..e76f5439849cf 100644 --- a/lib/libc/xdr/xdr_float.c +++ b/lib/libc/xdr/xdr_float.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_float.c,v 1.1 1994/08/07 18:39:32 wollman Exp $"; +static char *rcsid = "$Id: xdr_float.c,v 1.2 1995/05/30 05:42:04 rgrimes Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c index 05e01224e9575..408b695899e6c 100644 --- a/lib/libc/xdr/xdr_mem.c +++ b/lib/libc/xdr/xdr_mem.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_mem.c,v 1.2 1995/05/30 05:42:06 rgrimes Exp $"; +static char *rcsid = "$Id: xdr_mem.c,v 1.2.4.2 1996/06/05 02:52:04 jkh Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index dbd7d03803609..a9a105d48edcf 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -29,7 +29,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_rec.c,v 1.3 1995/05/30 05:42:09 rgrimes Exp $"; +static char *rcsid = "$Id: xdr_rec.c,v 1.3.4.2 1996/06/05 02:52:05 jkh Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c index b65c8497068bf..5e1880363b685 100644 --- a/lib/libc/xdr/xdr_reference.c +++ b/lib/libc/xdr/xdr_reference.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_reference.c 1.11 87/08/11 SMI";*/ /*static char *sccsid = "from: @(#)xdr_reference.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_reference.c,v 1.2 1995/05/30 05:42:12 rgrimes Exp $"; +static char *rcsid = "$Id: xdr_reference.c,v 1.2.4.2 1996/06/05 02:52:06 jkh Exp $"; #endif /* diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c index 5cfdf205a619d..ecf6e44488721 100644 --- a/lib/libc/xdr/xdr_stdio.c +++ b/lib/libc/xdr/xdr_stdio.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_stdio.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id: xdr_stdio.c,v 1.1 1994/08/07 18:39:35 wollman Exp $"; +static char *rcsid = "$Id: xdr_stdio.c,v 1.2 1995/05/30 05:42:12 rgrimes Exp $"; #endif /* diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc index 9f87465d38874..e24d59fc81252 100644 --- a/lib/libc/yp/Makefile.inc +++ b/lib/libc/yp/Makefile.inc @@ -1,5 +1,5 @@ # from: @(#)Makefile.inc 5.3 (Berkeley) 2/20/91 -# $Id: Makefile.inc,v 1.1 1994/08/07 23:04:53 wollman Exp $ +# $Id: Makefile.inc,v 1.1.6.3 1996/06/05 02:52:08 jkh Exp $ # yp sources .PATH: ${.CURDIR}/yp diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c index daf9874b8e9da..c21bb50358e52 100644 --- a/lib/libc/yp/xdryp.c +++ b/lib/libc/yp/xdryp.c @@ -28,7 +28,7 @@ */ #ifndef LINT -static char *rcsid = "$Id: xdryp.c,v 1.3 1995/04/02 19:58:29 wpaul Exp $"; +static char *rcsid = "$Id: xdryp.c,v 1.3.4.3 1996/06/05 02:52:09 jkh Exp $"; #endif #include diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c index 5f66986656a52..426f5faa826d7 100644 --- a/lib/libc/yp/yplib.c +++ b/lib/libc/yp/yplib.c @@ -28,7 +28,7 @@ */ #ifndef LINT -static char *rcsid = "$Id: yplib.c,v 1.10.4.6 1996/06/25 17:53:33 wpaul Exp $"; +static char *rcsid = "$Id: yplib.c,v 1.10.4.7 1996/11/08 02:06:30 wpaul Exp $"; #endif #include diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 2fee22d86f59a..cad2a055d1f84 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ +# $Id: Makefile,v 1.1.1.1.4.2 1996/06/05 02:52:14 jkh Exp $ LIB= com_err SRCS= com_err.c error_message.c et_name.c init_et.c diff --git a/lib/libcom_err/com_err.3 b/lib/libcom_err/com_err.3 index a002e7fa52420..60e21986f71a2 100644 --- a/lib/libcom_err/com_err.3 +++ b/lib/libcom_err/com_err.3 @@ -1,7 +1,7 @@ .\" Copyright (c) 1988 Massachusetts Institute of Technology, .\" Student Information Processing Board. All rights reserved. .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/com_err.3,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ +.\" $Header: /home/ncvs/src/lib/libcom_err/com_err.3,v 1.1.1.1.4.1 1996/06/05 02:52:17 jkh Exp $ .\" .TH COM_ERR 3 "22 Nov 1988" SIPB .SH NAME diff --git a/lib/libcom_err/com_err.c b/lib/libcom_err/com_err.c index 71b520b19f520..a64ab66064ec4 100644 --- a/lib/libcom_err/com_err.c +++ b/lib/libcom_err/com_err.c @@ -15,7 +15,7 @@ #if ! lint static const char rcsid[] = - "$Id: /a/ncvs/src/lib/libcom_err/com_err.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $"; + "$Id: com_err.c,v 1.2 1995/01/23 22:53:12 wollman Exp $"; #endif /* ! lint */ static void diff --git a/lib/libcom_err/doc/Makefile b/lib/libcom_err/doc/Makefile index 7ac02619267eb..d4c43b36ac10c 100644 --- a/lib/libcom_err/doc/Makefile +++ b/lib/libcom_err/doc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ INFO= com_err diff --git a/lib/libcom_err/doc/com_err.texinfo b/lib/libcom_err/doc/com_err.texinfo index 51732f473ffb9..2e904f7acebf4 100644 --- a/lib/libcom_err/doc/com_err.texinfo +++ b/lib/libcom_err/doc/com_err.texinfo @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- -@c $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/doc/com_err.texinfo,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ -@c $Source: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/doc/com_err.texinfo,v $ +@c $Header: /home/ncvs/src/lib/libcom_err/doc/com_err.texinfo,v 1.1.1.1.4.1 1996/06/05 02:52:21 jkh Exp $ +@c $Source: /home/ncvs/src/lib/libcom_err/doc/com_err.texinfo,v $ @c $Locker: $ @c Note that although this source file is in texinfo format (more diff --git a/lib/libcom_err/error_message.c b/lib/libcom_err/error_message.c index 5fb26e71aeb46..e8e70ca91a6fe 100644 --- a/lib/libcom_err/error_message.c +++ b/lib/libcom_err/error_message.c @@ -1,6 +1,6 @@ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/error_message.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/error_message.c,v $ + * $Header: /home/ncvs/src/lib/libcom_err/error_message.c,v 1.1.1.1.4.1 1996/06/05 02:52:18 jkh Exp $ + * $Source: /home/ncvs/src/lib/libcom_err/error_message.c,v $ * $Locker: $ * * Copyright 1987 by the Student Information Processing Board @@ -15,7 +15,7 @@ #include "internal.h" static const char rcsid[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/error_message.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $"; + "$Header: /home/ncvs/src/lib/libcom_err/error_message.c,v 1.1.1.1.4.1 1996/06/05 02:52:18 jkh Exp $"; static const char copyright[] = "Copyright 1986, 1987, 1988 by the Student Information Processing Board\nand the department of Information Systems\nof the Massachusetts Institute of Technology"; diff --git a/lib/libcom_err/et_name.c b/lib/libcom_err/et_name.c index 2ddd11fa9528f..1ab0b263f270d 100644 --- a/lib/libcom_err/et_name.c +++ b/lib/libcom_err/et_name.c @@ -12,7 +12,7 @@ static const char copyright[] = "Copyright 1987,1988 by Student Information Processing Board, Massachusetts Institute of Technology"; static const char rcsid_et_name_c[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/et_name.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $"; + "$Header: /home/ncvs/src/lib/libcom_err/et_name.c,v 1.1.1.1.4.1 1996/06/05 02:52:19 jkh Exp $"; #endif static const char char_set[] = diff --git a/lib/libcom_err/init_et.c b/lib/libcom_err/init_et.c index 6ee579b51a6d5..02cda96d397a1 100644 --- a/lib/libcom_err/init_et.c +++ b/lib/libcom_err/init_et.c @@ -1,6 +1,6 @@ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/init_et.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/init_et.c,v $ + * $Header: /home/ncvs/src/lib/libcom_err/init_et.c,v 1.1.1.1.4.1 1996/06/05 02:52:19 jkh Exp $ + * $Source: /home/ncvs/src/lib/libcom_err/init_et.c,v $ * $Locker: $ * * Copyright 1986, 1987, 1988 by MIT Information Systems and @@ -19,7 +19,7 @@ #ifndef lint static const char rcsid_init_et_c[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcom_err/init_et.c,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $"; + "$Header: /home/ncvs/src/lib/libcom_err/init_et.c,v 1.1.1.1.4.1 1996/06/05 02:52:19 jkh Exp $"; #endif extern char *malloc(), *realloc(); diff --git a/lib/libcompat/4.1/ascftime.c b/lib/libcompat/4.1/ascftime.c index e842b6e820813..ac3ad8c77530d 100644 --- a/lib/libcompat/4.1/ascftime.c +++ b/lib/libcompat/4.1/ascftime.c @@ -31,7 +31,7 @@ * (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$ + * $Id: ascftime.c,v 1.1 1995/04/10 18:47:51 joerg Exp $ */ #include diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3 index 5c760a9d5c311..18fa13d30a6bb 100644 --- a/lib/libcompat/4.1/cftime.3 +++ b/lib/libcompat/4.1/cftime.3 @@ -32,7 +32,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.\" $Id$ +.\" $Id: cftime.3,v 1.1 1995/04/10 18:47:52 joerg Exp $ .\" .Dd June 15, 1993 .Os diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c index 2e3a34bc71c87..03df0b3cd831e 100644 --- a/lib/libcompat/4.1/cftime.c +++ b/lib/libcompat/4.1/cftime.c @@ -31,7 +31,7 @@ * (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$ + * $Id: cftime.c,v 1.1 1995/04/10 18:47:53 joerg Exp $ */ #include diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c index ccd3a64beea7b..1f1928ee98b54 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libcompat/4.1/ftime.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ftime.c,v 1.3 1994/05/06 06:42:21 cgd Exp $"; +static char rcsid[] = "$Id: ftime.c,v 1.1.1.1 1994/05/27 10:33:22 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/lib/libcompat/4.1/getpw.c b/lib/libcompat/4.1/getpw.c index 5ea696af7bdcc..4bd48724e59bf 100644 --- a/lib/libcompat/4.1/getpw.c +++ b/lib/libcompat/4.1/getpw.c @@ -29,7 +29,7 @@ * (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: getpw.c,v 1.1 1995/04/10 18:47:55 joerg Exp $ + * $Id: getpw.c,v 1.2 1995/05/30 05:42:17 rgrimes Exp $ */ #include diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c index 7875399a3fd2c..d562e9a0eab7b 100644 --- a/lib/libcompat/4.1/gtty.c +++ b/lib/libcompat/4.1/gtty.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: gtty.c,v 1.1.1.1 1994/05/27 10:33:22 rgrimes Exp $"; +static char rcsid[] = "$Id: gtty.c,v 1.2 1995/04/10 18:47:56 joerg Exp $"; #endif /* not lint */ #include diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c index 91d241bce3e67..0fc157cfad183 100644 --- a/lib/libcompat/4.1/stty.c +++ b/lib/libcompat/4.1/stty.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: stty.c,v 1.1.1.1 1994/05/27 10:33:22 rgrimes Exp $"; +static char rcsid[] = "$Id: stty.c,v 1.2 1995/04/10 18:47:57 joerg Exp $"; #endif /* not lint */ #include diff --git a/lib/libcompat/4.3/cfree.3 b/lib/libcompat/4.3/cfree.3 index 0f5afb277ddfb..2f465800ba226 100644 --- a/lib/libcompat/4.3/cfree.3 +++ b/lib/libcompat/4.3/cfree.3 @@ -23,7 +23,7 @@ .\" (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$ +.\" $Id: cfree.3,v 1.1 1995/11/24 08:36:51 joerg Exp $ .\" " <- this is for hilit19 :) .Dd November 23, 1995 .Dt CFREE 3 diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3 index cc5e7a96aa496..9dcef9303ccf4 100644 --- a/lib/libcompat/4.4/cuserid.3 +++ b/lib/libcompat/4.4/cuserid.3 @@ -29,7 +29,7 @@ .\" (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: cuserid.3,v 1.2 1996/02/11 22:35:00 mpp Exp $ +.\" $Id: cuserid.3,v 1.1.4.1 1996/06/27 05:31:59 gpalmer Exp $ .\" .Dd April 10, 1995 .Os diff --git a/lib/libcompat/SysV/ftok.3 b/lib/libcompat/SysV/ftok.3 index 7873bdf37e4c3..a93feb4f11433 100644 --- a/lib/libcompat/SysV/ftok.3 +++ b/lib/libcompat/SysV/ftok.3 @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: ftok.3,v 1.1.4.1 1996/01/30 18:16:04 mpp Exp $ +.\" $Id: ftok.3,v 1.1.4.2 1996/06/03 10:45:13 joerg Exp $ .Dd June 24, 1994 .Os .Dt ftok 3 diff --git a/lib/libcompat/SysV/ftok.c b/lib/libcompat/SysV/ftok.c index 8861509a541e4..08b77318d37e3 100644 --- a/lib/libcompat/SysV/ftok.c +++ b/lib/libcompat/SysV/ftok.c @@ -26,7 +26,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id: ftok.c,v 1.2 1994/06/26 16:27:34 jtc Exp $"; +static char *rcsid = "$Id: ftok.c,v 1.1 1995/05/01 08:53:21 joerg Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index d4d5057297d24..0ac5a24c32e06 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.6 1994/11/14 06:44:45 bde Exp $ +# $Id: Makefile,v 1.7 1995/05/30 05:42:21 rgrimes Exp $ # LCRYPTBASE= libcrypt diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index 023796e158a0a..2043b05fc732d 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -6,12 +6,12 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: crypt.c,v 1.3 1995/05/30 05:42:22 rgrimes Exp $ + * $Id: crypt.c,v 1.3.4.1 1996/06/05 02:52:23 jkh Exp $ * */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libcrypt/crypt.c,v 1.3 1995/05/30 05:42:22 rgrimes Exp $"; +static char rcsid[] = "$Header: /home/ncvs/src/lib/libcrypt/crypt.c,v 1.3.4.1 1996/06/05 02:52:23 jkh Exp $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile index fd2e711b8e0a5..434c5f4e9382d 100644 --- a/lib/libcurses/Makefile +++ b/lib/libcurses/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 1/2/94 -# $Id: Makefile,v 1.5 1995/03/19 21:47:42 nate Exp $ +# $Id: Makefile,v 1.5.4.2 1996/06/05 02:52:25 jkh Exp $ CFLAGS+=#-DTFILE=\"/dev/ttyp0\" CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR} diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index a2ac1be063e9d..c2e374f31e43c 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11.4.7 1996/07/09 12:18:58 jkh Exp $ +# $Id: Makefile,v 1.11.4.8 1997/02/07 03:24:09 jkh Exp $ LIB= disk SRCS= blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \ diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c index e3dca8a0eece1..0e80ada224df7 100644 --- a/lib/libdisk/blocks.c +++ b/lib/libdisk/blocks.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: blocks.c,v 1.3 1995/04/30 06:09:24 phk Exp $ + * $Id: blocks.c,v 1.3.4.1 1996/07/09 12:18:59 jkh Exp $ * */ diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c index b75225d124e9d..dcd229c3944e4 100644 --- a/lib/libdisk/change.c +++ b/lib/libdisk/change.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: change.c,v 1.9.2.2 1996/05/28 22:51:09 jkh Exp $ + * $Id: change.c,v 1.9.2.3 1997/02/07 03:24:10 jkh Exp $ * */ diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c index 3671652a6fe50..17ea4af71da6a 100644 --- a/lib/libdisk/chunk.c +++ b/lib/libdisk/chunk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: chunk.c,v 1.16 1996/03/24 18:55:36 joerg Exp $ + * $Id: chunk.c,v 1.15.2.2 1996/05/28 22:51:10 jkh Exp $ * */ diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 063f9079da020..3fa933f5e7726 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: create_chunk.c,v 1.21.2.8 1996/05/28 22:51:12 jkh Exp $ + * $Id: create_chunk.c,v 1.21.2.9 1997/02/07 03:24:11 jkh Exp $ * */ diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index 3dab99c1aa3e3..6889af2ad97ef 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: disk.c,v 1.20.2.2 1996/05/28 22:51:14 jkh Exp $ + * $Id: disk.c,v 1.20.2.3 1997/02/07 03:24:12 jkh Exp $ * */ diff --git a/lib/libdisk/disklabel.c b/lib/libdisk/disklabel.c index 9714e6c28f2e4..f2d94187bbba1 100644 --- a/lib/libdisk/disklabel.c +++ b/lib/libdisk/disklabel.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: disklabel.c,v 1.2 1995/04/29 01:55:22 phk Exp $ * */ diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3 index f942edc95f398..43c07da942968 100644 --- a/lib/libdisk/libdisk.3 +++ b/lib/libdisk/libdisk.3 @@ -25,7 +25,7 @@ .\" (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: libdisk.3,v 1.1.2.2 1996/05/28 22:51:15 jkh Exp $ +.\" $Id: libdisk.3,v 1.1.2.3 1997/02/07 03:24:12 jkh Exp $ .\" " .Dd March 15, 1996 .Dt LIBDISK 3 diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h index eecac4de05ab9..c5af666dc66fc 100644 --- a/lib/libdisk/libdisk.h +++ b/lib/libdisk/libdisk.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $Id: libdisk.h,v 1.19.2.4 1996/05/28 22:51:17 jkh Exp $ +* $Id: libdisk.h,v 1.19.2.5 1997/02/07 03:24:13 jkh Exp $ * */ diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c index 1ea9ca85b162e..70eda4533e545 100644 --- a/lib/libdisk/rules.c +++ b/lib/libdisk/rules.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: rules.c,v 1.10.2.1 1995/06/03 08:40:33 jkh Exp $ + * $Id: rules.c,v 1.11 1995/06/11 19:29:36 rgrimes Exp $ * */ diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c index 29dcf750e0e93..b7c2075e4ea03 100644 --- a/lib/libdisk/tst01.c +++ b/lib/libdisk/tst01.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: tst01.c,v 1.15.2.4 1996/07/09 12:19:03 jkh Exp $ + * $Id: tst01.c,v 1.15.2.5 1997/02/07 03:24:14 jkh Exp $ * */ diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c index fc348b3787324..63ca994f20b6c 100644 --- a/lib/libdisk/write_disk.c +++ b/lib/libdisk/write_disk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: write_disk.c,v 1.14.2.3 1996/05/28 22:51:19 jkh Exp $ + * $Id: write_disk.c,v 1.14.2.4 1997/02/07 03:24:15 jkh Exp $ * */ diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3 index 292423e683a5d..4b6748615efc6 100644 --- a/lib/libftpio/ftpio.3 +++ b/lib/libftpio/ftpio.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: ftpio.3,v 1.4.2.4 1997/02/07 02:51:32 jkh Exp $ .\" .Dd June 17, 1996 .Dt ftpio 3 diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c index f38e107cc2dd9..1c365df51c42c 100644 --- a/lib/libftpio/ftpio.c +++ b/lib/libftpio/ftpio.c @@ -14,7 +14,7 @@ * Turned inside out. Now returns xfers as new file ids, not as a special * `state' of FTP_t * - * $Id: ftpio.c,v 1.4.2.3 1996/07/04 05:47:30 jkh Exp $ + * $Id: ftpio.c,v 1.4.2.4 1997/02/07 02:51:32 jkh Exp $ * */ diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3 index 244b991cb7285..fa6a71dce60f2 100644 --- a/lib/libkvm/kvm_getprocs.3 +++ b/lib/libkvm/kvm_getprocs.3 @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 -.\" $Id: kvm_getprocs.3,v 1.3 1995/06/25 03:35:49 bde Exp $ +.\" $Id: kvm_getprocs.3,v 1.1.1.1.6.1 1995/07/07 07:15:10 rgrimes Exp $ .\" .Dd June 4, 1993 .Dt KVM_GETPROCS 3 diff --git a/lib/libm/Makefile b/lib/libm/Makefile index d832963270e5d..11fa1f5e1833a 100644 --- a/lib/libm/Makefile +++ b/lib/libm/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $Id$ +# $Id: Makefile,v 1.2 1994/08/05 01:52:05 wollman Exp $ # # ieee - for most IEEE machines, we hope. # mc68881 - the, ahem, mc68881. diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c index db0703e54f82e..550483f936200 100644 --- a/lib/libmd/mdXhl.c +++ b/lib/libmd/mdXhl.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: mdXhl.c,v 1.6 1995/07/12 09:13:47 phk Exp $ + * $Id: mdXhl.c,v 1.5.4.1 1995/09/06 14:18:34 davidg Exp $ * */ diff --git a/lib/libmytinfo/Makefile b/lib/libmytinfo/Makefile index a5593c206a53f..4f2f8ef44a86a 100644 --- a/lib/libmytinfo/Makefile +++ b/lib/libmytinfo/Makefile @@ -1,7 +1,7 @@ # Makefile for libmytinfo # Use 'make update_term_h' manually after changing internal # mytinfo structures -# $Id: Makefile,v 1.8 1994/11/16 11:54:09 ache Exp $ +# $Id: Makefile,v 1.8.4.1 1995/08/31 21:41:18 davidg Exp $ LIB= mytinfo SRCS= addstr.c binorder.c buildpath.c caplist.c capsort.c compar.c\ diff --git a/lib/libmytinfo/TESTS/Makefile b/lib/libmytinfo/TESTS/Makefile index eeaa6d2411725..b21a4e9ddac53 100644 --- a/lib/libmytinfo/TESTS/Makefile +++ b/lib/libmytinfo/TESTS/Makefile @@ -1,5 +1,5 @@ # Makefile for libmytinfo tests -# $Id$ +# $Id: Makefile,v 1.1 1994/10/09 16:37:30 ache Exp $ LIB= mytinfo diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index 90fdfd799b3b5..a01d0e5b70424 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -1,5 +1,5 @@ # Makefile for ncurses -# $Id: Makefile,v 1.13 1995/05/08 16:08:49 ache Exp $ +# $Id: Makefile,v 1.13.4.1 1995/08/31 21:50:02 davidg Exp $ LIB= ncurses SHLIB_MAJOR= 3 diff --git a/lib/libncurses/TESTS/newdemo.c b/lib/libncurses/TESTS/newdemo.c index 2e924b61b2220..5482236ed3074 100644 --- a/lib/libncurses/TESTS/newdemo.c +++ b/lib/libncurses/TESTS/newdemo.c @@ -1,4 +1,4 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libncurses/TESTS/newdemo.c,v 1.2 1995/05/30 05:47:07 rgrimes Exp $ +/* $Header: /home/ncvs/src/lib/libncurses/TESTS/newdemo.c,v 1.2.4.1 1996/06/05 02:52:40 jkh Exp $ * * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 50d6c928b604e..bfb6a2c32debf 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,5 +1,5 @@ # Makefile for libpcap -# $Id: Makefile,v 1.3 1995/02/23 18:47:06 ache Exp $ +# $Id: Makefile,v 1.3.4.1 1995/08/31 21:50:13 davidg Exp $ LIB= pcap diff --git a/lib/libpcap/bpf_filter.c b/lib/libpcap/bpf_filter.c index 3991161209aca..93360c90c0764 100644 --- a/lib/libpcap/bpf_filter.c +++ b/lib/libpcap/bpf_filter.c @@ -38,11 +38,11 @@ * @(#)bpf.c 7.5 (Berkeley) 7/15/91 * * static char rcsid[] = - * "$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/bpf_filter.c,v 1.2 1995/05/30 05:47:18 rgrimes Exp $"; + * "$Header: /home/ncvs/src/lib/libpcap/Attic/bpf_filter.c,v 1.2.4.1 1996/06/05 02:52:41 jkh Exp $"; */ #if !(defined(lint) || defined(KERNEL)) static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/bpf_filter.c,v 1.2 1995/05/30 05:47:18 rgrimes Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/bpf_filter.c,v 1.2.4.1 1996/06/05 02:52:41 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/bpf_image.c b/lib/libpcap/bpf_image.c index 7a6598f91ed2d..843eb1857c453 100644 --- a/lib/libpcap/bpf_image.c +++ b/lib/libpcap/bpf_image.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/bpf_image.c,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/bpf_image.c,v 1.1.1.1.4.1 1996/06/05 02:52:42 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/etherent.c b/lib/libpcap/etherent.c index 68ce3628eef06..d1d77345c813d 100644 --- a/lib/libpcap/etherent.c +++ b/lib/libpcap/etherent.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/etherent.c,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/etherent.c,v 1.1.1.1.4.1 1996/06/05 02:52:43 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/ethertype.h b/lib/libpcap/ethertype.h index 10bee47ec0d48..e7acc6069d170 100644 --- a/lib/libpcap/ethertype.h +++ b/lib/libpcap/ethertype.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/ethertype.h,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/ethertype.h,v 1.1.1.1.4.1 1996/06/05 02:52:44 jkh Exp $ (LBL) */ /* Map between Ethernet protocol types and names */ diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c index 6675ddb6ea729..28def741647e4 100644 --- a/lib/libpcap/gencode.c +++ b/lib/libpcap/gencode.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/gencode.c,v 1.1.1.1.4.1 1995/08/30 08:51:45 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/gencode.c,v 1.1.1.1.4.2 1996/06/05 02:52:44 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/gencode.h b/lib/libpcap/gencode.h index f3346268af668..cf854b693a5cf 100644 --- a/lib/libpcap/gencode.h +++ b/lib/libpcap/gencode.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/gencode.h,v 1.2 1995/05/30 05:47:20 rgrimes Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/gencode.h,v 1.2.4.1 1996/06/05 02:52:45 jkh Exp $ (LBL) */ /* diff --git a/lib/libpcap/grammar.y b/lib/libpcap/grammar.y index c0cacf1451a6a..c98040affcb83 100644 --- a/lib/libpcap/grammar.y +++ b/lib/libpcap/grammar.y @@ -22,7 +22,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/grammar.y,v 1.2 1995/02/21 10:46:34 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/grammar.y,v 1.2.4.1 1996/06/05 02:52:46 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/inet.c b/lib/libpcap/inet.c index 543df7d86c3bb..e2fc056d34348 100644 --- a/lib/libpcap/inet.c +++ b/lib/libpcap/inet.c @@ -33,7 +33,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/inet.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/inet.c,v 1.1.1.1.4.1 1996/06/05 02:52:49 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/nametoaddr.c b/lib/libpcap/nametoaddr.c index fb70bd5e225d8..0c437a1b2fd00 100644 --- a/lib/libpcap/nametoaddr.c +++ b/lib/libpcap/nametoaddr.c @@ -24,7 +24,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/nametoaddr.c,v 1.2 1995/05/30 05:47:21 rgrimes Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/nametoaddr.c,v 1.2.4.1 1996/06/05 02:52:50 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/optimize.c b/lib/libpcap/optimize.c index f2f6de6a9c89c..947a71b195d23 100644 --- a/lib/libpcap/optimize.c +++ b/lib/libpcap/optimize.c @@ -22,7 +22,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/optimize.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/optimize.c,v 1.1.1.1.4.1 1996/06/05 02:52:51 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/pcap-bpf.c b/lib/libpcap/pcap-bpf.c index fce51c329d669..d773f6f3aabd4 100644 --- a/lib/libpcap/pcap-bpf.c +++ b/lib/libpcap/pcap-bpf.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-bpf.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-bpf.c,v 1.1.1.1.4.1 1996/06/05 02:52:52 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/pcap-dlpi.c b/lib/libpcap/pcap-dlpi.c index d02bd80125a09..18e3df18c422e 100644 --- a/lib/libpcap/pcap-dlpi.c +++ b/lib/libpcap/pcap-dlpi.c @@ -23,7 +23,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-dlpi.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-dlpi.c,v 1.1.1.1.4.1 1996/06/05 02:52:53 jkh Exp $ (LBL)"; #endif /* diff --git a/lib/libpcap/pcap-int.h b/lib/libpcap/pcap-int.h index 11bc60417a1f8..25720d8b8ffc7 100644 --- a/lib/libpcap/pcap-int.h +++ b/lib/libpcap/pcap-int.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-int.h,v 1.2 1995/05/30 05:47:23 rgrimes Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap-int.h,v 1.2.4.1 1996/06/05 02:52:54 jkh Exp $ (LBL) */ #ifndef pcap_int_h diff --git a/lib/libpcap/pcap-namedb.h b/lib/libpcap/pcap-namedb.h index 2a63936b6020c..1e43368941ca1 100644 --- a/lib/libpcap/pcap-namedb.h +++ b/lib/libpcap/pcap-namedb.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-namedb.h,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap-namedb.h,v 1.1.1.1.4.1 1996/06/05 02:52:55 jkh Exp $ (LBL) */ #ifndef lib_pcap_ethers_h diff --git a/lib/libpcap/pcap-nit.c b/lib/libpcap/pcap-nit.c index ee03553bec27f..a9f20fdb4c552 100644 --- a/lib/libpcap/pcap-nit.c +++ b/lib/libpcap/pcap-nit.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-nit.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-nit.c,v 1.1.1.1.4.1 1996/06/05 02:52:56 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/pcap-nit.h b/lib/libpcap/pcap-nit.h index 03e2e186ff8f0..eec2fb8e8e452 100644 --- a/lib/libpcap/pcap-nit.h +++ b/lib/libpcap/pcap-nit.h @@ -15,5 +15,5 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-nit.h,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap-nit.h,v 1.1.1.1.4.1 1996/06/05 02:52:57 jkh Exp $ (LBL) */ diff --git a/lib/libpcap/pcap-pf.c b/lib/libpcap/pcap-pf.c index 86a86a1ff3f97..c8c5f384b76fe 100644 --- a/lib/libpcap/pcap-pf.c +++ b/lib/libpcap/pcap-pf.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-pf.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-pf.c,v 1.1.1.1.4.1 1996/06/05 02:52:57 jkh Exp $ (LBL)"; #endif /* diff --git a/lib/libpcap/pcap-pf.h b/lib/libpcap/pcap-pf.h index 1ba83dce546fb..46e92fa4bf8a3 100644 --- a/lib/libpcap/pcap-pf.h +++ b/lib/libpcap/pcap-pf.h @@ -15,5 +15,5 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-pf.h,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap-pf.h,v 1.1.1.1.4.1 1996/06/05 02:52:58 jkh Exp $ (LBL) */ diff --git a/lib/libpcap/pcap-snit.c b/lib/libpcap/pcap-snit.c index 3b8aff529932c..2eb2a2a3f47a5 100644 --- a/lib/libpcap/pcap-snit.c +++ b/lib/libpcap/pcap-snit.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-snit.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-snit.c,v 1.1.1.1.4.1 1996/06/05 02:52:59 jkh Exp $ (LBL)"; #endif /* diff --git a/lib/libpcap/pcap-snoop.c b/lib/libpcap/pcap-snoop.c index 687f7f919d881..5404b5e563cc1 100644 --- a/lib/libpcap/pcap-snoop.c +++ b/lib/libpcap/pcap-snoop.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap-snoop.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/pcap-snoop.c,v 1.1.1.1.4.1 1996/06/05 02:52:59 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/pcap.c b/lib/libpcap/pcap.c index aa90a5b652441..bdd6124973533 100644 --- a/lib/libpcap/pcap.c +++ b/lib/libpcap/pcap.c @@ -33,7 +33,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap.c,v 1.3 1995/05/30 05:47:24 rgrimes Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap.c,v 1.3.4.1 1996/06/05 02:53:00 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/libpcap/pcap.h b/lib/libpcap/pcap.h index a3de75b773a1b..1ec24632c744d 100644 --- a/lib/libpcap/pcap.h +++ b/lib/libpcap/pcap.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/pcap.h,v 1.1.1.1 1995/01/20 04:13:05 jkh Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/lib/libpcap/Attic/pcap.h,v 1.1.1.1.4.1 1996/06/05 02:53:01 jkh Exp $ (LBL) */ #ifndef lib_pcap_h diff --git a/lib/libpcap/savefile.c b/lib/libpcap/savefile.c index 41e6a130e5c72..587983a704394 100644 --- a/lib/libpcap/savefile.c +++ b/lib/libpcap/savefile.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/savefile.c,v 1.1.1.1 1995/01/20 04:13:03 jkh Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/lib/libpcap/Attic/savefile.c,v 1.1.1.1.4.1 1996/06/05 02:53:01 jkh Exp $ (LBL)"; #endif /* diff --git a/lib/libpcap/scanner.l b/lib/libpcap/scanner.l index 54d78eac840b0..ec013a6f3e6d0 100644 --- a/lib/libpcap/scanner.l +++ b/lib/libpcap/scanner.l @@ -22,7 +22,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/lib/libpcap/scanner.l,v 1.1.1.1 1995/01/20 04:13:06 jkh Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/Attic/scanner.l,v 1.1.1.1.4.1 1996/06/05 02:53:02 jkh Exp $ (LBL)"; #endif #include diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 11779f7cc5dd0..aeb6e6fa65102 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 -# $Id: Makefile,v 1.3 1994/08/28 17:48:43 bde Exp $ +# $Id: Makefile,v 1.4 1995/03/04 17:39:24 nate Exp $ .PATH: ${DESTDIR}/usr/include/rpcsvc diff --git a/lib/libscsi/scsi.c b/lib/libscsi/scsi.c index 29051718fa9f7..04b3bbd8c994c 100644 --- a/lib/libscsi/scsi.c +++ b/lib/libscsi/scsi.c @@ -30,7 +30,7 @@ * 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: scsi.c,v 1.5 1995/05/05 20:40:02 dufault Exp $ + * $Id: scsi.c,v 1.6 1995/05/30 05:47:26 rgrimes Exp $ */ #include #include diff --git a/lib/libskey/pathnames.h b/lib/libskey/pathnames.h index 87c8a2356dfae..137da80d105f9 100644 --- a/lib/libskey/pathnames.h +++ b/lib/libskey/pathnames.h @@ -1,4 +1,4 @@ -/* $Id: pathnames.h,v 1.1 1994/05/27 07:50:08 pst Exp $ (FreeBSD) */ +/* $Id: pathnames.h,v 1.2 1994/10/19 00:03:14 pst Exp $ (FreeBSD) */ #include diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 2f9fa091dbb45..290d1f3e851cf 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1995/05/30 05:47:36 rgrimes Exp $ +# $Id: Makefile,v 1.8.4.1 1995/08/31 21:50:18 davidg Exp $ LIB= ss SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 5ab752297aa4d..d215434c37c55 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id: Makefile,v 1.3 1994/08/12 22:41:25 csgr Exp $ +# $Id: Makefile,v 1.4 1995/05/30 05:47:41 rgrimes Exp $ LIB= telnet SRCS= genget.c getent.c misc.c diff --git a/lib/libtermcap/termcap.h b/lib/libtermcap/termcap.h index 26ac71c58a6d1..afdc8f38580e2 100644 --- a/lib/libtermcap/termcap.h +++ b/lib/libtermcap/termcap.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $Id: termcap.h,v 1.6 1995/08/05 21:21:54 ache Exp $ */ +/* $Id: termcap.h,v 1.4.4.1 1995/09/02 17:42:14 davidg Exp $ */ #ifndef _TERMCAP_H_ #define _TERMCAP_H_ diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h index 3f32d7ac0c06d..6336b7c8f4728 100644 --- a/lib/libutil/libutil.h +++ b/lib/libutil/libutil.h @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file providing the above * conditions are met. * - * $Id$ + * $Id: libutil.h,v 1.1 1996/01/01 08:27:37 peter Exp $ */ #ifndef _LIBUTIL_H_ diff --git a/lib/libutil/setproctitle.3 b/lib/libutil/setproctitle.3 index dc3a47f7643fb..14a2f5cc6e5aa 100644 --- a/lib/libutil/setproctitle.3 +++ b/lib/libutil/setproctitle.3 @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $Id: setproctitle.3,v 1.2 1996/01/01 08:27:41 peter Exp $ +.\" $Id: setproctitle.3,v 1.3 1996/01/30 18:13:11 mpp Exp $ .\" .\" The following requests are required for all man pages. .Dd December 16, 1995 diff --git a/lib/libutil/setproctitle.c b/lib/libutil/setproctitle.c index 804b7eb991b89..88a4452502179 100644 --- a/lib/libutil/setproctitle.c +++ b/lib/libutil/setproctitle.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file providing the above * conditions are met. * - * $Id: setproctitle.c,v 1.1 1995/12/26 22:50:08 peter Exp $ + * $Id: setproctitle.c,v 1.1.2.2 1996/06/05 02:53:08 jkh Exp $ */ #include diff --git a/lib/libz/Makefile b/lib/libz/Makefile index afebefa4576db..97150db0b41ab 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1996/08/18 23:52:20 peter Exp $ +# $Id: Makefile,v 1.3 1996/08/19 01:21:46 peter Exp $ # MAINTAINER=peter@FreeBSD.org diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 1b57524ba79e2..99a8d58402133 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $Id: Makefile,v 1.5.4.1 1997/02/15 05:38:02 bde Exp $ +# $Id: Makefile,v 1.5.4.2 1997/02/15 14:30:02 bde Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. diff --git a/lib/msun/i387/e_acos.S b/lib/msun/i387/e_acos.S index 8e6f8637316ca..854c6bc8af600 100644 --- a/lib/msun/i387/e_acos.S +++ b/lib/msun/i387/e_acos.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_acos.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: e_acos.S,v 1.2 1994/08/19 11:12:52 jkh Exp $") /* acos = atan (sqrt(1 - x^2) / x) */ ENTRY(__ieee754_acos) diff --git a/lib/msun/i387/e_asin.S b/lib/msun/i387/e_asin.S index 93e62f53da5aa..78c4f1d4a73c3 100644 --- a/lib/msun/i387/e_asin.S +++ b/lib/msun/i387/e_asin.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_asin.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: e_asin.S,v 1.2 1994/08/19 11:14:12 jkh Exp $") /* asin = atan (x / sqrt(1 - x^2)) */ ENTRY(__ieee754_asin) diff --git a/lib/msun/i387/e_atan2.S b/lib/msun/i387/e_atan2.S index cd16476ede3c1..98d37f56a996c 100644 --- a/lib/msun/i387/e_atan2.S +++ b/lib/msun/i387/e_atan2.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_atan2.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: e_atan2.S,v 1.2 1994/08/19 11:14:13 jkh Exp $") ENTRY(__ieee754_atan2) fldl 4(%esp) diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S index fc498e04a32d7..6251d79201adf 100644 --- a/lib/msun/i387/e_exp.S +++ b/lib/msun/i387/e_exp.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_exp.S,v 1.2.6.2 1996/06/05 02:53:09 jkh Exp $") +RCSID("$Id: e_exp.S,v 1.2.6.3 1996/06/08 08:25:28 bde Exp $") /* e^x = 2^(x * log2(e)) */ ENTRY(__ieee754_exp) diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S index bacb4d8527dc2..6897c831ef7cf 100644 --- a/lib/msun/i387/e_fmod.S +++ b/lib/msun/i387/e_fmod.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_fmod.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: e_fmod.S,v 1.2 1994/08/19 11:14:15 jkh Exp $") ENTRY(__ieee754_fmod) fldl 12(%esp) diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S index 28ed68612772a..490694a167be1 100644 --- a/lib/msun/i387/e_log.S +++ b/lib/msun/i387/e_log.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_log.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: e_log.S,v 1.2 1994/08/19 11:14:15 jkh Exp $") ENTRY(__ieee754_log) fldln2 diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S index 612a374995e00..44ce987943f2e 100644 --- a/lib/msun/i387/e_log10.S +++ b/lib/msun/i387/e_log10.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_log10.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: e_log10.S,v 1.2 1994/08/19 11:14:16 jkh Exp $") ENTRY(__ieee754_log10) fldlg2 diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S index c67f6ab7492a2..ae8aafb616ba1 100644 --- a/lib/msun/i387/e_remainder.S +++ b/lib/msun/i387/e_remainder.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_remainder.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: e_remainder.S,v 1.2 1994/08/19 11:14:18 jkh Exp $") ENTRY(__ieee754_remainder) fldl 12(%esp) diff --git a/lib/msun/i387/e_scalb.S b/lib/msun/i387/e_scalb.S index 28806751e527b..e082aefc01979 100644 --- a/lib/msun/i387/e_scalb.S +++ b/lib/msun/i387/e_scalb.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_scalb.S,v 1.2 1994/08/19 11:14:19 jkh Exp $") +RCSID("$Id: e_scalb.S,v 1.2.6.1 1996/12/15 15:15:43 bde Exp $") ENTRY(__ieee754_scalb) fldl 12(%esp) diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S index 7625e7b91ec3c..5207e33081750 100644 --- a/lib/msun/i387/e_sqrt.S +++ b/lib/msun/i387/e_sqrt.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: e_sqrt.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: e_sqrt.S,v 1.2 1994/08/19 11:14:20 jkh Exp $") ENTRY(__ieee754_sqrt) fldl 4(%esp) diff --git a/lib/msun/i387/s_atan.S b/lib/msun/i387/s_atan.S index 266f80ac4572d..ef3fa81772502 100644 --- a/lib/msun/i387/s_atan.S +++ b/lib/msun/i387/s_atan.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_atan.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: s_atan.S,v 1.2 1994/08/19 11:14:20 jkh Exp $") ENTRY(atan) fldl 4(%esp) diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S index 84a1b7a8c1517..e9c9c37177a61 100644 --- a/lib/msun/i387/s_ceil.S +++ b/lib/msun/i387/s_ceil.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_ceil.S,v 1.2 1994/08/19 11:14:21 jkh Exp $") +RCSID("$Id: s_ceil.S,v 1.2.6.1 1996/12/15 15:23:16 bde Exp $") ENTRY(ceil) pushl %ebp diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S index 1733af5428f46..3df8d625012c9 100644 --- a/lib/msun/i387/s_copysign.S +++ b/lib/msun/i387/s_copysign.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_copysign.S,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $") +RCSID("$Id: s_copysign.S,v 1.2 1994/08/19 11:14:22 jkh Exp $") ENTRY(copysign) movl 16(%esp),%edx diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S index e1a122ff90561..74d1567c92b00 100644 --- a/lib/msun/i387/s_cos.S +++ b/lib/msun/i387/s_cos.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_cos.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_cos.S,v 1.2 1994/08/19 11:14:23 jkh Exp $") ENTRY(cos) fldl 4(%esp) diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S index d80bba6f828f2..4e9b6b3cd2ff1 100644 --- a/lib/msun/i387/s_finite.S +++ b/lib/msun/i387/s_finite.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_finite.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_finite.S,v 1.2 1994/08/19 11:14:24 jkh Exp $") ENTRY(finite) movl 8(%esp),%eax diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S index 7abc424c7bcef..a6095ad00c50c 100644 --- a/lib/msun/i387/s_floor.S +++ b/lib/msun/i387/s_floor.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_floor.S,v 1.2 1994/08/19 11:14:25 jkh Exp $") +RCSID("$Id: s_floor.S,v 1.2.6.1 1996/12/15 15:23:17 bde Exp $") ENTRY(floor) pushl %ebp diff --git a/lib/msun/i387/s_ilogb.S b/lib/msun/i387/s_ilogb.S index 26e664b542457..4cf270125ca82 100644 --- a/lib/msun/i387/s_ilogb.S +++ b/lib/msun/i387/s_ilogb.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_ilogb.S,v 1.2 1994/08/19 11:14:26 jkh Exp $") +RCSID("$Id: s_ilogb.S,v 1.2.6.1 1996/02/25 20:34:46 bde Exp $") ENTRY(ilogb) pushl %ebp diff --git a/lib/msun/i387/s_log1p.S b/lib/msun/i387/s_log1p.S index ad511bee358ad..58637694807b1 100644 --- a/lib/msun/i387/s_log1p.S +++ b/lib/msun/i387/s_log1p.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_log1p.S,v 1.4 1994/08/19 03:55:57 jtc Exp $") +RCSID("$Id: s_log1p.S,v 1.3 1994/08/19 23:52:29 jkh Exp $") /* * The fyl2xp1 instruction has such a limited range: diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S index 6992459c939db..d39b4488188c3 100644 --- a/lib/msun/i387/s_logb.S +++ b/lib/msun/i387/s_logb.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_logb.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_logb.S,v 1.2 1994/08/19 11:14:28 jkh Exp $") ENTRY(logb) fldl 4(%esp) diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S index 54888078dd991..e3254437f92b1 100644 --- a/lib/msun/i387/s_rint.S +++ b/lib/msun/i387/s_rint.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_rint.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_rint.S,v 1.2 1994/08/19 11:14:29 jkh Exp $") ENTRY(rint) fldl 4(%esp) diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S index e9f17d29b9eeb..f0e129c590432 100644 --- a/lib/msun/i387/s_scalbn.S +++ b/lib/msun/i387/s_scalbn.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_scalbn.S,v 1.2 1994/08/19 11:14:30 jkh Exp $") +RCSID("$Id: s_scalbn.S,v 1.2.6.1 1996/12/15 15:15:45 bde Exp $") ENTRY(scalbn) fildl 12(%esp) diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S index f980dd60a43a3..414211fdce02c 100644 --- a/lib/msun/i387/s_significand.S +++ b/lib/msun/i387/s_significand.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_significand.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_significand.S,v 1.2 1994/08/19 11:14:30 jkh Exp $") ENTRY(significand) fldl 4(%esp) diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S index 56d7a7a872437..3b605bb026dad 100644 --- a/lib/msun/i387/s_sin.S +++ b/lib/msun/i387/s_sin.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_sin.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_sin.S,v 1.2 1994/08/19 11:14:31 jkh Exp $") ENTRY(sin) fldl 4(%esp) diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S index a124457229e12..bbd26643aef75 100644 --- a/lib/msun/i387/s_tan.S +++ b/lib/msun/i387/s_tan.S @@ -35,7 +35,7 @@ #include -RCSID("$Id: s_tan.S,v 1.1.1.1 1994/08/19 09:40:01 jkh Exp $") +RCSID("$Id: s_tan.S,v 1.2 1994/08/19 11:14:32 jkh Exp $") ENTRY(tan) fldl 4(%esp) diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3 index d7e75c6a1dcd8..70504c6e5f058 100644 --- a/lib/msun/man/acos.3 +++ b/lib/msun/man/acos.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)acos.3 5.1 (Berkeley) 5/2/91 -.\" $Id: acos.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: acos.3,v 1.2 1995/03/01 05:05:16 jkh Exp $ .\" .Dd May 2, 1991 .Dt ACOS 3 diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3 index f72478dc85451..c15fa3fe7eee0 100644 --- a/lib/msun/man/acosh.3 +++ b/lib/msun/man/acosh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)acosh.3 5.2 (Berkeley) 5/6/91 -.\" $Id: acosh.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: acosh.3,v 1.2 1995/03/01 05:05:19 jkh Exp $ .\" .Dd May 6, 1991 .Dt ACOSH 3 diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3 index ebbdd0f3b3033..ab7ebc6246313 100644 --- a/lib/msun/man/asin.3 +++ b/lib/msun/man/asin.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)asin.3 5.1 (Berkeley) 5/2/91 -.\" $Id: asin.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: asin.3,v 1.2 1995/03/01 05:05:23 jkh Exp $ .\" .Dd May 2, 1991 .Dt ASIN 3 diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3 index f24a60c59dd64..9a11df4b4eb97 100644 --- a/lib/msun/man/asinh.3 +++ b/lib/msun/man/asinh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)asinh.3 6.4 (Berkeley) 5/6/91 -.\" $Id: asinh.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: asinh.3,v 1.2 1995/03/01 05:05:27 jkh Exp $ .\" .Dd May 6, 1991 .Dt ASINH 3 diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3 index c795351487e0d..e6dddb683e86a 100644 --- a/lib/msun/man/atan.3 +++ b/lib/msun/man/atan.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)atan.3 5.1 (Berkeley) 5/2/91 -.\" $Id: atan.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: atan.3,v 1.2 1995/03/01 05:05:30 jkh Exp $ .\" .Dd May 2, 1991 .Dt ATAN 3 diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3 index 72c358835befe..f23dbd19b46f2 100644 --- a/lib/msun/man/atan2.3 +++ b/lib/msun/man/atan2.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)atan2.3 5.1 (Berkeley) 5/2/91 -.\" $Id: atan2.3,v 1.1.1.1 1994/08/19 09:39:41 jkh Exp $ +.\" $Id: atan2.3,v 1.2 1995/03/01 05:05:34 jkh Exp $ .\" .Dd May 2, 1991 .Dt ATAN2 3 diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3 index 8b62d6bb8492e..3dda59b0d938a 100644 --- a/lib/msun/man/atanh.3 +++ b/lib/msun/man/atanh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)atanh.3 5.2 (Berkeley) 5/6/91 -.\" $Id: atanh.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: atanh.3,v 1.2 1995/03/01 05:05:37 jkh Exp $ .\" .Dd May 6, 1991 .Dt ATANH 3 diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3 index c8a1f02d335d1..d60ed03b124cd 100644 --- a/lib/msun/man/ceil.3 +++ b/lib/msun/man/ceil.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ceil.3 5.1 (Berkeley) 5/2/91 -.\" $Id: ceil.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: ceil.3,v 1.2 1995/03/01 05:05:41 jkh Exp $ .\" .Dd March 10, 1994 .Dt CEIL 3 diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3 index e44960004415a..a5f9c0441008d 100644 --- a/lib/msun/man/cos.3 +++ b/lib/msun/man/cos.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)cos.3 5.1 (Berkeley) 5/2/91 -.\" $Id: cos.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: cos.3,v 1.2 1995/03/01 05:05:45 jkh Exp $ .\" .Dd May 2, 1991 .Dt COS 3 diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3 index 8944381afd5a7..f3f96da4bdf61 100644 --- a/lib/msun/man/cosh.3 +++ b/lib/msun/man/cosh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)cosh.3 5.1 (Berkeley) 5/2/91 -.\" $Id: cosh.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: cosh.3,v 1.2 1995/03/01 05:05:48 jkh Exp $ .\" .Dd May 2, 1991 .Dt COSH 3 diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3 index 030ca6ace5451..c307e8fca1b6c 100644 --- a/lib/msun/man/erf.3 +++ b/lib/msun/man/erf.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)erf.3 6.4 (Berkeley) 4/20/91 -.\" $Id: erf.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: erf.3,v 1.2 1995/03/01 05:05:52 jkh Exp $ .\" .Dd April 20, 1991 .Dt ERF 3 diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3 index 8a25ff253e223..783f82346c0d3 100644 --- a/lib/msun/man/exp.3 +++ b/lib/msun/man/exp.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)exp.3 6.12 (Berkeley) 7/31/91 -.\" $Id: exp.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: exp.3,v 1.2 1995/03/01 05:05:55 jkh Exp $ .\" .Dd July 31, 1991 .Dt EXP 3 diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3 index 9c8b00b66928d..276a45f90022d 100644 --- a/lib/msun/man/fabs.3 +++ b/lib/msun/man/fabs.3 @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fabs.3 5.1 (Berkeley) 5/2/91 -.\" $Id: fabs.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: fabs.3,v 1.2 1995/03/01 05:05:59 jkh Exp $ .\" .Dd May 2, 1991 .Dt FABS 3 diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3 index 480862af0bdec..e304e456264f9 100644 --- a/lib/msun/man/floor.3 +++ b/lib/msun/man/floor.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)floor.3 6.5 (Berkeley) 4/19/91 -.\" $Id: floor.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: floor.3,v 1.2 1995/03/01 05:06:02 jkh Exp $ .\" .Dd March 10, 1994 .Dt FLOOR 3 diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3 index 60a8489023885..5fb2aafadb49d 100644 --- a/lib/msun/man/fmod.3 +++ b/lib/msun/man/fmod.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fmod.3 5.1 (Berkeley) 5/2/91 -.\" $Id: fmod.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: fmod.3,v 1.2 1995/03/01 05:06:06 jkh Exp $ .\" .Dd May 2, 1991 .Dt FMOD 3 diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3 index 09d0da06a714d..052aaf2b7b44b 100644 --- a/lib/msun/man/hypot.3 +++ b/lib/msun/man/hypot.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)hypot.3 6.7 (Berkeley) 5/6/91 -.\" $Id: hypot.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: hypot.3,v 1.2 1995/03/01 05:06:09 jkh Exp $ .\" .Dd May 6, 1991 .Dt HYPOT 3 diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3 index bdd23cd4b9a35..07853894ed42f 100644 --- a/lib/msun/man/ieee.3 +++ b/lib/msun/man/ieee.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $Id: ieee.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: ieee.3,v 1.2 1995/03/01 05:06:12 jkh Exp $ .\" .Dd Feb 25, 1994 .Dt IEEE 3 diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3 index cdd79a3a48ea0..8070cca9f3d36 100644 --- a/lib/msun/man/ieee_test.3 +++ b/lib/msun/man/ieee_test.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $Id: ieee_test.3,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $ +.\" $Id: ieee_test.3,v 1.2 1995/03/01 05:06:16 jkh Exp $ .\" .Dd March 10, 1994 .Dt IEEE_TEST 3 diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3 index 3095be2f734aa..e49a2272e97ac 100644 --- a/lib/msun/man/j0.3 +++ b/lib/msun/man/j0.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)j0.3 6.7 (Berkeley) 4/19/91 -.\" $Id: j0.3,v 1.2 1995/03/01 05:06:20 jkh Exp $ +.\" $Id: j0.3,v 1.2.4.1 1996/07/02 15:25:11 bde Exp $ .\" .Dd April 19, 1991 .Dt J0 3 diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3 index 09aaeffa3acc2..ab23ac9368002 100644 --- a/lib/msun/man/lgamma.3 +++ b/lib/msun/man/lgamma.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)lgamma.3 6.6 (Berkeley) 12/3/92 -.\" $Id: lgamma.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: lgamma.3,v 1.2 1995/03/01 05:06:23 jkh Exp $ .\" .Dd December 3, 1992 .Dt LGAMMA 3 diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3 index 8e7e52fcaec09..5a683d8afdfed 100644 --- a/lib/msun/man/math.3 +++ b/lib/msun/man/math.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)math.3 6.10 (Berkeley) 5/6/91 -.\" $Id: math.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: math.3,v 1.2 1995/03/01 05:06:27 jkh Exp $ .\" .TH MATH 3M "May 6, 1991" .UC 4 diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3 index 6b29d74154b5f..d94025e50107f 100644 --- a/lib/msun/man/rint.3 +++ b/lib/msun/man/rint.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)rint.3 5.1 (Berkeley) 5/2/91 -.\" $Id: rint.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: rint.3,v 1.2 1995/03/01 05:06:31 jkh Exp $ .\" .Dd March 10, 1994 .Dt RINT 3 diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3 index 96e35a3a787ff..30607e85243ee 100644 --- a/lib/msun/man/sin.3 +++ b/lib/msun/man/sin.3 @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sin.3 6.7 (Berkeley) 4/19/91 -.\" $Id: sin.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: sin.3,v 1.2 1995/03/01 05:06:34 jkh Exp $ .\" .Dd April 19, 1991 .Dt SIN 3 diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3 index ded4f1fe3c756..40c35595c967d 100644 --- a/lib/msun/man/sinh.3 +++ b/lib/msun/man/sinh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sinh.3 6.6 (Berkeley) 4/19/91 -.\" $Id: sinh.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: sinh.3,v 1.2 1995/03/01 05:06:38 jkh Exp $ .Dd April 19, 1991 .Dt SINH 3 .Os diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3 index b1e3c2d33cd27..08f2e6de7ffa3 100644 --- a/lib/msun/man/sqrt.3 +++ b/lib/msun/man/sqrt.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sqrt.3 6.4 (Berkeley) 5/6/91 -.\" $Id: sqrt.3,v 1.1.1.1 1994/08/19 09:39:42 jkh Exp $ +.\" $Id: sqrt.3,v 1.2 1995/03/01 05:06:41 jkh Exp $ .\" .Dd May 6, 1991 .Dt SQRT 3 diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3 index 9a0a8e32b3b99..0945496f2170e 100644 --- a/lib/msun/man/tan.3 +++ b/lib/msun/man/tan.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)tan.3 5.1 (Berkeley) 5/2/91 -.\" $Id: tan.3,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $ +.\" $Id: tan.3,v 1.2 1995/03/01 05:06:45 jkh Exp $ .\" .Dd May 2, 1991 .Dt TAN 3 diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3 index 7a27ceec0b26f..e9a675b5d3a42 100644 --- a/lib/msun/man/tanh.3 +++ b/lib/msun/man/tanh.3 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)tanh.3 5.1 (Berkeley) 5/2/91 -.\" $Id: tanh.3,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $ +.\" $Id: tanh.3,v 1.2 1995/03/01 05:06:48 jkh Exp $ .\" .Dd May 2, 1991 .Dt TANH 3 diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c index 5f09e63d1e623..c4373a9e8fcb8 100644 --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_acos.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_acos.c,v 1.2 1995/05/30 05:47:51 rgrimes Exp $"; #endif /* __ieee754_acos(x) diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c index e220a72e20a13..3b981bdbf2a61 100644 --- a/lib/msun/src/e_acosf.c +++ b/lib/msun/src/e_acosf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_acosf.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_acosf.c,v 1.2 1995/05/30 05:47:52 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c index efaefea51a0af..e6d5928807020 100644 --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_acosh.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_acosh.c,v 1.2 1995/05/30 05:47:53 rgrimes Exp $"; #endif /* __ieee754_acosh(x) diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c index 53080e9485dfe..812046165fc05 100644 --- a/lib/msun/src/e_acoshf.c +++ b/lib/msun/src/e_acoshf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_acoshf.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_acoshf.c,v 1.2 1995/05/30 05:47:54 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c index 390ea5f4c3de0..0d01562055248 100644 --- a/lib/msun/src/e_asin.c +++ b/lib/msun/src/e_asin.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_asin.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_asin.c,v 1.2 1995/05/30 05:47:55 rgrimes Exp $"; #endif /* __ieee754_asin(x) diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c index 1f075796392ad..76fd063d7802c 100644 --- a/lib/msun/src/e_asinf.c +++ b/lib/msun/src/e_asinf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_asinf.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_asinf.c,v 1.2 1995/05/30 05:47:56 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c index 233d8b67e2da3..8b833afa3a1f4 100644 --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_atan2.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_atan2.c,v 1.2 1995/05/30 05:47:57 rgrimes Exp $"; #endif /* __ieee754_atan2(y,x) diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c index 39aa779eeef9e..5eaefe425b899 100644 --- a/lib/msun/src/e_atan2f.c +++ b/lib/msun/src/e_atan2f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_atan2f.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_atan2f.c,v 1.2 1995/05/30 05:47:59 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c index aeb8a75444faf..3bc134d95cb6a 100644 --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_atanh.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_atanh.c,v 1.2 1995/05/30 05:48:01 rgrimes Exp $"; #endif /* __ieee754_atanh(x) diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c index 1c2cc6450fcaa..c75915674e5e7 100644 --- a/lib/msun/src/e_atanhf.c +++ b/lib/msun/src/e_atanhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_atanhf.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_atanhf.c,v 1.2 1995/05/30 05:48:04 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c index 2153e69799007..be6f9bec43a82 100644 --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_cosh.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_cosh.c,v 1.2 1995/05/30 05:48:07 rgrimes Exp $"; #endif /* __ieee754_cosh(x) diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c index 25bb9e30aa199..00364368d8154 100644 --- a/lib/msun/src/e_coshf.c +++ b/lib/msun/src/e_coshf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_coshf.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_coshf.c,v 1.2 1995/05/30 05:48:07 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c index 9b833be6894a1..5fb570a012404 100644 --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_exp.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_exp.c,v 1.2 1995/05/30 05:48:08 rgrimes Exp $"; #endif /* __ieee754_exp(x) diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c index 19ff4ac2388fe..91782a8864b66 100644 --- a/lib/msun/src/e_expf.c +++ b/lib/msun/src/e_expf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_expf.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_expf.c,v 1.2 1995/05/30 05:48:09 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index d784c6848bace..e059a8a4d5935 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_fmod.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_fmod.c,v 1.2 1995/05/30 05:48:10 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 4a54d1818b084..c96947e52d034 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_fmodf.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_fmodf.c,v 1.2 1995/05/30 05:48:11 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c index 699dc54acad66..fe1cd8622c5a2 100644 --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_gamma.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_gamma.c,v 1.2 1995/05/30 05:48:12 rgrimes Exp $"; #endif /* __ieee754_gamma(x) diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c index 699af100b1710..f571c963741f3 100644 --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_gamma_r.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_gamma_r.c,v 1.2 1995/05/30 05:48:13 rgrimes Exp $"; #endif /* __ieee754_gamma_r(x, signgamp) diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c index 039c25784e361..f994b286c342e 100644 --- a/lib/msun/src/e_gammaf.c +++ b/lib/msun/src/e_gammaf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_gammaf.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_gammaf.c,v 1.2 1995/05/30 05:48:14 rgrimes Exp $"; #endif /* __ieee754_gammaf(x) diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c index 93f17fb825b47..0e01afe1d62b6 100644 --- a/lib/msun/src/e_gammaf_r.c +++ b/lib/msun/src/e_gammaf_r.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_gammaf_r.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: e_gammaf_r.c,v 1.2 1995/05/30 05:48:15 rgrimes Exp $"; #endif /* __ieee754_gammaf_r(x, signgamp) diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c index 2f6e30ff44bfc..342acb220c5a3 100644 --- a/lib/msun/src/e_hypot.c +++ b/lib/msun/src/e_hypot.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_hypot.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_hypot.c,v 1.2 1995/05/30 05:48:16 rgrimes Exp $"; #endif /* __ieee754_hypot(x,y) diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c index 66b9e17004d9e..1a7e484bc02df 100644 --- a/lib/msun/src/e_hypotf.c +++ b/lib/msun/src/e_hypotf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_hypotf.c,v 1.1.1.1 1994/08/19 09:39:55 jkh Exp $"; +static char rcsid[] = "$Id: e_hypotf.c,v 1.2 1995/05/30 05:48:17 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c index 3a11397a3262f..16d2d9d05ed80 100644 --- a/lib/msun/src/e_j0.c +++ b/lib/msun/src/e_j0.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_j0.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $"; +static char rcsid[] = "$Id: e_j0.c,v 1.2 1995/05/30 05:48:18 rgrimes Exp $"; #endif /* __ieee754_j0(x), __ieee754_y0(x) diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c index ce416fab70e82..cb54e47e862f8 100644 --- a/lib/msun/src/e_j0f.c +++ b/lib/msun/src/e_j0f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_j0f.c,v 1.1.1.1 1994/08/19 09:39:55 jkh Exp $"; +static char rcsid[] = "$Id: e_j0f.c,v 1.2 1995/05/30 05:48:19 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c index f577368048ed4..4012d4a9d6564 100644 --- a/lib/msun/src/e_j1.c +++ b/lib/msun/src/e_j1.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_j1.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_j1.c,v 1.2 1995/05/30 05:48:20 rgrimes Exp $"; #endif /* __ieee754_j1(x), __ieee754_y1(x) diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c index f06b30006f2db..1897cb4459221 100644 --- a/lib/msun/src/e_j1f.c +++ b/lib/msun/src/e_j1f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_j1f.c,v 1.1.1.1 1994/08/19 09:39:55 jkh Exp $"; +static char rcsid[] = "$Id: e_j1f.c,v 1.2 1995/05/30 05:48:23 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c index ae309f0e6b74f..9175826d4e938 100644 --- a/lib/msun/src/e_jn.c +++ b/lib/msun/src/e_jn.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_jn.c,v 1.2 1995/04/07 23:13:42 bde Exp $"; +static char rcsid[] = "$Id: e_jn.c,v 1.3 1995/05/30 05:48:24 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c index 6393f83df5c1f..eeb145ac21308 100644 --- a/lib/msun/src/e_jnf.c +++ b/lib/msun/src/e_jnf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_jnf.c,v 1.2 1995/04/07 23:13:43 bde Exp $"; +static char rcsid[] = "$Id: e_jnf.c,v 1.3 1995/05/30 05:48:25 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c index 39de847aa1753..b11a5d9ad0df1 100644 --- a/lib/msun/src/e_lgamma.c +++ b/lib/msun/src/e_lgamma.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_lgamma.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_lgamma.c,v 1.2 1995/05/30 05:48:26 rgrimes Exp $"; #endif /* __ieee754_lgamma(x) diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c index 57b24d414de4d..3ee6368e369a3 100644 --- a/lib/msun/src/e_lgamma_r.c +++ b/lib/msun/src/e_lgamma_r.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_lgamma_r.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_lgamma_r.c,v 1.2 1995/05/30 05:48:27 rgrimes Exp $"; #endif /* __ieee754_lgamma_r(x, signgamp) diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c index 1d90cdd692a93..6293ffd609caa 100644 --- a/lib/msun/src/e_lgammaf.c +++ b/lib/msun/src/e_lgammaf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_lgammaf.c,v 1.1.1.1 1994/08/19 09:39:55 jkh Exp $"; +static char rcsid[] = "$Id: e_lgammaf.c,v 1.2 1995/05/30 05:48:28 rgrimes Exp $"; #endif /* __ieee754_lgammaf(x) diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c index 2cd8ec8ca9c41..419d80785a508 100644 --- a/lib/msun/src/e_lgammaf_r.c +++ b/lib/msun/src/e_lgammaf_r.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_lgammaf_r.c,v 1.1.1.1 1994/08/19 09:39:55 jkh Exp $"; +static char rcsid[] = "$Id: e_lgammaf_r.c,v 1.2 1995/05/30 05:48:29 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c index 67e2d216b7fa7..86a1cec0cf23d 100644 --- a/lib/msun/src/e_log.c +++ b/lib/msun/src/e_log.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_log.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_log.c,v 1.2 1995/05/30 05:48:30 rgrimes Exp $"; #endif /* __ieee754_log(x) diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c index 4f4ed28933fd4..2c482088b7cb3 100644 --- a/lib/msun/src/e_log10.c +++ b/lib/msun/src/e_log10.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_log10.c,v 1.2 1995/04/07 23:23:23 bde Exp $"; +static char rcsid[] = "$Id: e_log10.c,v 1.3 1995/05/30 05:48:30 rgrimes Exp $"; #endif /* __ieee754_log10(x) diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c index 3caa25abba356..266100a62969f 100644 --- a/lib/msun/src/e_log10f.c +++ b/lib/msun/src/e_log10f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_log10f.c,v 1.2 1995/04/07 23:23:23 bde Exp $"; +static char rcsid[] = "$Id: e_log10f.c,v 1.3 1995/05/30 05:48:31 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c index 1baef0470b730..1585de78e5e87 100644 --- a/lib/msun/src/e_logf.c +++ b/lib/msun/src/e_logf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_logf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_logf.c,v 1.2 1995/05/30 05:48:32 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c index 8bdc8a862e5fa..51ddba94abce2 100644 --- a/lib/msun/src/e_pow.c +++ b/lib/msun/src/e_pow.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_pow.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_pow.c,v 1.2 1995/05/30 05:48:34 rgrimes Exp $"; #endif /* __ieee754_pow(x,y) return x**y diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c index 7b268d36fe239..e5c05d8f762e9 100644 --- a/lib/msun/src/e_powf.c +++ b/lib/msun/src/e_powf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_powf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_powf.c,v 1.2 1995/05/30 05:48:36 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c index 5b1c3bf264030..f9533744f1d4e 100644 --- a/lib/msun/src/e_rem_pio2.c +++ b/lib/msun/src/e_rem_pio2.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_rem_pio2.c,v 1.2 1995/04/07 23:23:24 bde Exp $"; +static char rcsid[] = "$Id: e_rem_pio2.c,v 1.3 1995/05/30 05:48:37 rgrimes Exp $"; #endif /* __ieee754_rem_pio2(x,y) diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c index 98c305fd9f13d..1602501951c39 100644 --- a/lib/msun/src/e_rem_pio2f.c +++ b/lib/msun/src/e_rem_pio2f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_rem_pio2f.c,v 1.2 1995/04/07 23:23:25 bde Exp $"; +static char rcsid[] = "$Id: e_rem_pio2f.c,v 1.3 1995/05/30 05:48:38 rgrimes Exp $"; #endif /* __ieee754_rem_pio2f(x,y) diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c index 430418d2ea2fe..046b0e15f1dc6 100644 --- a/lib/msun/src/e_remainder.c +++ b/lib/msun/src/e_remainder.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_remainder.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_remainder.c,v 1.2 1995/05/30 05:48:39 rgrimes Exp $"; #endif /* __ieee754_remainder(x,p) diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c index cc66ba454aec9..df3a52ced4a59 100644 --- a/lib/msun/src/e_remainderf.c +++ b/lib/msun/src/e_remainderf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_remainderf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_remainderf.c,v 1.2 1995/05/30 05:48:40 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c index 1000bc7e1de06..b0902aceecf1e 100644 --- a/lib/msun/src/e_scalb.c +++ b/lib/msun/src/e_scalb.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_scalb.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_scalb.c,v 1.2 1995/05/30 05:48:43 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c index 0dff855c37c2c..8a6e4abf37d65 100644 --- a/lib/msun/src/e_scalbf.c +++ b/lib/msun/src/e_scalbf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_scalbf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_scalbf.c,v 1.2 1995/05/30 05:48:45 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c index 9f68f4365d0b4..0b9ae0f88b09b 100644 --- a/lib/msun/src/e_sinh.c +++ b/lib/msun/src/e_sinh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_sinh.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_sinh.c,v 1.2 1995/05/30 05:48:48 rgrimes Exp $"; #endif /* __ieee754_sinh(x) diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c index 9c6e45bed155b..f6e3a8f2cc723 100644 --- a/lib/msun/src/e_sinhf.c +++ b/lib/msun/src/e_sinhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_sinhf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_sinhf.c,v 1.2 1995/05/30 05:48:49 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c index d805e33ab8675..a0f611341d556 100644 --- a/lib/msun/src/e_sqrt.c +++ b/lib/msun/src/e_sqrt.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_sqrt.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: e_sqrt.c,v 1.2 1995/05/30 05:48:50 rgrimes Exp $"; #endif /* __ieee754_sqrt(x) diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c index a4cb172e1bdc7..da3c2216e693a 100644 --- a/lib/msun/src/e_sqrtf.c +++ b/lib/msun/src/e_sqrtf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: e_sqrtf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: e_sqrtf.c,v 1.2 1995/05/30 05:48:52 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c index 57ebe6219613b..be536d89a3f94 100644 --- a/lib/msun/src/k_cos.c +++ b/lib/msun/src/k_cos.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_cos.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $"; +static char rcsid[] = "$Id: k_cos.c,v 1.2 1995/05/30 05:48:53 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c index 09e2ff72cc2ef..f1746d19ad92f 100644 --- a/lib/msun/src/k_cosf.c +++ b/lib/msun/src/k_cosf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_cosf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: k_cosf.c,v 1.2 1995/05/30 05:48:55 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c index 25faf35f40ea2..2edb6c50ef150 100644 --- a/lib/msun/src/k_rem_pio2.c +++ b/lib/msun/src/k_rem_pio2.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_rem_pio2.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: k_rem_pio2.c,v 1.2 1995/05/30 05:48:57 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c index 10615386eb815..d44f40bf35612 100644 --- a/lib/msun/src/k_rem_pio2f.c +++ b/lib/msun/src/k_rem_pio2f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_rem_pio2f.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: k_rem_pio2f.c,v 1.2 1995/05/30 05:49:00 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c index 394df92768117..7e4bed6fb6546 100644 --- a/lib/msun/src/k_sin.c +++ b/lib/msun/src/k_sin.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_sin.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: k_sin.c,v 1.2 1995/05/30 05:49:05 rgrimes Exp $"; #endif /* __kernel_sin( x, y, iy) diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c index b7c3db935ddeb..faf57de58d199 100644 --- a/lib/msun/src/k_sinf.c +++ b/lib/msun/src/k_sinf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_sinf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: k_sinf.c,v 1.2 1995/05/30 05:49:10 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/k_standard.c b/lib/msun/src/k_standard.c index d32362e386b84..bfc9001db7d9f 100644 --- a/lib/msun/src/k_standard.c +++ b/lib/msun/src/k_standard.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_standard.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: k_standard.c,v 1.2 1995/05/30 05:49:13 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c index d5851cf2f0f8d..7418b653c20c0 100644 --- a/lib/msun/src/k_tan.c +++ b/lib/msun/src/k_tan.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_tan.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: k_tan.c,v 1.2 1995/05/30 05:49:14 rgrimes Exp $"; #endif /* __kernel_tan( x, y, k ) diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c index 9be8d378ade63..ec087d3a5e6f4 100644 --- a/lib/msun/src/k_tanf.c +++ b/lib/msun/src/k_tanf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: k_tanf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: k_tanf.c,v 1.2 1995/05/30 05:49:15 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 74b021ff06a73..7623c942de63e 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $Id: math.h,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $ + * $Id: math.h,v 1.2 1995/05/30 05:49:16 rgrimes Exp $ */ #ifndef _MATH_H_ diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 232f65b8712fa..897e32372eb16 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $Id: math_private.h,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $ + * $Id: math_private.h,v 1.2 1995/05/30 05:49:17 rgrimes Exp $ */ #ifndef _MATH_PRIVATE_H_ diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c index 64de8defe96f1..a33b2d9c400a7 100644 --- a/lib/msun/src/s_asinh.c +++ b/lib/msun/src/s_asinh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_asinh.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: s_asinh.c,v 1.2 1995/05/30 05:49:18 rgrimes Exp $"; #endif /* asinh(x) diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c index e96704fc9bf22..8363c8791afc0 100644 --- a/lib/msun/src/s_asinhf.c +++ b/lib/msun/src/s_asinhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_asinhf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: s_asinhf.c,v 1.2 1995/05/30 05:49:19 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c index f53462bb38957..45cee93441b5a 100644 --- a/lib/msun/src/s_atan.c +++ b/lib/msun/src/s_atan.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_atan.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $"; +static char rcsid[] = "$Id: s_atan.c,v 1.2 1995/05/30 05:49:20 rgrimes Exp $"; #endif /* atan(x) diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c index 52beebfcf5ec2..3fd85906be407 100644 --- a/lib/msun/src/s_atanf.c +++ b/lib/msun/src/s_atanf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_atanf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: s_atanf.c,v 1.2 1995/05/30 05:49:22 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c index a3fcc0215b47b..c494ab9dcfb1a 100644 --- a/lib/msun/src/s_cbrt.c +++ b/lib/msun/src/s_cbrt.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_cbrt.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_cbrt.c,v 1.2 1995/05/30 05:49:22 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c index 8bee2beb4a571..c86453f451fd6 100644 --- a/lib/msun/src/s_cbrtf.c +++ b/lib/msun/src/s_cbrtf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_cbrtf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: s_cbrtf.c,v 1.2 1995/05/30 05:49:23 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c index 749bc606bb9a9..bfa42d9baefad 100644 --- a/lib/msun/src/s_ceil.c +++ b/lib/msun/src/s_ceil.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ceil.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_ceil.c,v 1.2 1995/05/30 05:49:25 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c index b30f5ba8e816a..2b5f42d2e0882 100644 --- a/lib/msun/src/s_ceilf.c +++ b/lib/msun/src/s_ceilf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ceilf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: s_ceilf.c,v 1.2 1995/05/30 05:49:26 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c index 30fea0e6a314a..4272815594db2 100644 --- a/lib/msun/src/s_copysign.c +++ b/lib/msun/src/s_copysign.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_copysign.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_copysign.c,v 1.2 1995/05/30 05:49:27 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c index 07b1a530ab140..3192193cf0c3b 100644 --- a/lib/msun/src/s_copysignf.c +++ b/lib/msun/src/s_copysignf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_copysignf.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: s_copysignf.c,v 1.2 1995/05/30 05:49:28 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c index b3666d33eb48e..b1c6a43bc10e2 100644 --- a/lib/msun/src/s_cos.c +++ b/lib/msun/src/s_cos.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_cos.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_cos.c,v 1.2 1995/05/30 05:49:29 rgrimes Exp $"; #endif /* cos(x) diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c index 95fe4e7723d6f..700af27cc1063 100644 --- a/lib/msun/src/s_cosf.c +++ b/lib/msun/src/s_cosf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_cosf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_cosf.c,v 1.2 1995/05/30 05:49:30 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c index 4a06e2043ed24..39a2acd47af01 100644 --- a/lib/msun/src/s_erf.c +++ b/lib/msun/src/s_erf.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_erf.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_erf.c,v 1.2 1995/05/30 05:49:31 rgrimes Exp $"; #endif /* double erf(double x) diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c index 15e40b13e4007..f72279b435756 100644 --- a/lib/msun/src/s_erff.c +++ b/lib/msun/src/s_erff.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_erff.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_erff.c,v 1.2 1995/05/30 05:49:32 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c index 9c933e24c8855..14df0c3663adc 100644 --- a/lib/msun/src/s_expm1.c +++ b/lib/msun/src/s_expm1.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_expm1.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_expm1.c,v 1.2 1995/05/30 05:49:33 rgrimes Exp $"; #endif /* expm1(x) diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c index e7d43514f0cc6..fe9a1b428c9cd 100644 --- a/lib/msun/src/s_expm1f.c +++ b/lib/msun/src/s_expm1f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_expm1f.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_expm1f.c,v 1.2 1995/05/30 05:49:34 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c index 590d5594ea2e4..1192324a4d59d 100644 --- a/lib/msun/src/s_fabs.c +++ b/lib/msun/src/s_fabs.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_fabs.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_fabs.c,v 1.2 1995/05/30 05:49:35 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c index e2462725b9a5c..9f36414933a33 100644 --- a/lib/msun/src/s_fabsf.c +++ b/lib/msun/src/s_fabsf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_fabsf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_fabsf.c,v 1.2 1995/05/30 05:49:36 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c index 5de602467f447..8e8068d031c18 100644 --- a/lib/msun/src/s_finite.c +++ b/lib/msun/src/s_finite.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_finite.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_finite.c,v 1.2 1995/05/30 05:49:37 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c index 28b2f791b3753..f42241996f46e 100644 --- a/lib/msun/src/s_finitef.c +++ b/lib/msun/src/s_finitef.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_finitef.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_finitef.c,v 1.2 1995/05/30 05:49:38 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c index 84b5c9db65043..9c8ae17500514 100644 --- a/lib/msun/src/s_floor.c +++ b/lib/msun/src/s_floor.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_floor.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $"; +static char rcsid[] = "$Id: s_floor.c,v 1.2 1995/05/30 05:49:39 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c index 8851213808860..e2a82485f74dc 100644 --- a/lib/msun/src/s_floorf.c +++ b/lib/msun/src/s_floorf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_floorf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_floorf.c,v 1.2 1995/05/30 05:49:40 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c index 6a1fadf978499..64b254003ac0a 100644 --- a/lib/msun/src/s_frexp.c +++ b/lib/msun/src/s_frexp.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_frexp.c,v 1.2 1995/04/07 23:23:26 bde Exp $"; +static char rcsid[] = "$Id: s_frexp.c,v 1.3 1995/05/30 05:49:41 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c index ee97029b6f4d9..33d73bef13a1e 100644 --- a/lib/msun/src/s_frexpf.c +++ b/lib/msun/src/s_frexpf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_frexpf.c,v 1.2 1995/04/07 23:23:27 bde Exp $"; +static char rcsid[] = "$Id: s_frexpf.c,v 1.3 1995/05/30 05:49:44 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c index c6263d80b87a5..b378a85466dcb 100644 --- a/lib/msun/src/s_ilogb.c +++ b/lib/msun/src/s_ilogb.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ilogb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_ilogb.c,v 1.2 1995/05/30 05:49:45 rgrimes Exp $"; #endif /* ilogb(double x) diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c index 8c0f162a908d8..2014959bd2635 100644 --- a/lib/msun/src/s_ilogbf.c +++ b/lib/msun/src/s_ilogbf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ilogbf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_ilogbf.c,v 1.2 1995/05/30 05:49:46 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c index 677913f5c114d..5f01d48d9de58 100644 --- a/lib/msun/src/s_isnan.c +++ b/lib/msun/src/s_isnan.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_isnan.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_isnan.c,v 1.2 1995/05/30 05:49:47 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_isnanf.c b/lib/msun/src/s_isnanf.c index 4c4e69ef01a02..85e68c2311076 100644 --- a/lib/msun/src/s_isnanf.c +++ b/lib/msun/src/s_isnanf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_isnanf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_isnanf.c,v 1.2 1995/05/30 05:49:48 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_ldexp.c b/lib/msun/src/s_ldexp.c index 1d11ff2ba4b1c..971ecd218a373 100644 --- a/lib/msun/src/s_ldexp.c +++ b/lib/msun/src/s_ldexp.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ldexp.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_ldexp.c,v 1.2 1995/05/30 05:49:51 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_ldexpf.c b/lib/msun/src/s_ldexpf.c index 7cd0ce06e2e21..6bfa0c5efc7ac 100644 --- a/lib/msun/src/s_ldexpf.c +++ b/lib/msun/src/s_ldexpf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_ldexpf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_ldexpf.c,v 1.2 1995/05/30 05:49:53 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_lib_version.c b/lib/msun/src/s_lib_version.c index 7936f89dca0d7..a02c715bd8c20 100644 --- a/lib/msun/src/s_lib_version.c +++ b/lib/msun/src/s_lib_version.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_lib_version.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_lib_version.c,v 1.2 1995/05/30 05:49:56 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c index 56218d4a720b6..6522f155900cc 100644 --- a/lib/msun/src/s_log1p.c +++ b/lib/msun/src/s_log1p.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_log1p.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_log1p.c,v 1.2 1995/05/30 05:49:57 rgrimes Exp $"; #endif /* double log1p(double x) diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c index 4c4f652448504..4183da498eba8 100644 --- a/lib/msun/src/s_log1pf.c +++ b/lib/msun/src/s_log1pf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_log1pf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_log1pf.c,v 1.2 1995/05/30 05:49:58 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c index 96e8fc46b61e3..91af73cb7a20a 100644 --- a/lib/msun/src/s_logb.c +++ b/lib/msun/src/s_logb.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_logb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_logb.c,v 1.2 1995/05/30 05:49:59 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c index ddc0a04d8f864..aaa1d675d30ce 100644 --- a/lib/msun/src/s_logbf.c +++ b/lib/msun/src/s_logbf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_logbf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_logbf.c,v 1.2 1995/05/30 05:50:00 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_matherr.c b/lib/msun/src/s_matherr.c index 219a88c48b022..0d7288e9f2097 100644 --- a/lib/msun/src/s_matherr.c +++ b/lib/msun/src/s_matherr.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_matherr.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_matherr.c,v 1.2 1995/05/30 05:50:02 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c index b0ebbd0ff03bf..0635159192cff 100644 --- a/lib/msun/src/s_modf.c +++ b/lib/msun/src/s_modf.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_modf.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_modf.c,v 1.2 1995/05/30 05:50:04 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c index d1f0e3257bc11..5adc2f4cb7801 100644 --- a/lib/msun/src/s_modff.c +++ b/lib/msun/src/s_modff.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_modff.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_modff.c,v 1.2 1995/05/30 05:50:08 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c index 1936fad89e0f0..44a28d2c8ea8a 100644 --- a/lib/msun/src/s_nextafter.c +++ b/lib/msun/src/s_nextafter.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_nextafter.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_nextafter.c,v 1.2 1995/05/30 05:50:11 rgrimes Exp $"; #endif /* IEEE functions diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c index bd870705acc9c..a3f3e02787a7c 100644 --- a/lib/msun/src/s_nextafterf.c +++ b/lib/msun/src/s_nextafterf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_nextafterf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_nextafterf.c,v 1.2 1995/05/30 05:50:13 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c index 81a13965bc289..493b648c8d326 100644 --- a/lib/msun/src/s_rint.c +++ b/lib/msun/src/s_rint.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_rint.c,v 1.2 1995/05/30 05:50:18 rgrimes Exp $"; +static char rcsid[] = "$Id: s_rint.c,v 1.2.4.1 1996/08/28 16:42:00 bde Exp $"; #endif /* diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c index 90a85a310b484..fc6ecdd9f6d6f 100644 --- a/lib/msun/src/s_rintf.c +++ b/lib/msun/src/s_rintf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_rintf.c,v 1.2 1995/05/30 05:50:21 rgrimes Exp $"; +static char rcsid[] = "$Id: s_rintf.c,v 1.2.4.1 1996/08/28 16:42:01 bde Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c index 6549931fb34d1..6bfa83c12def1 100644 --- a/lib/msun/src/s_scalbn.c +++ b/lib/msun/src/s_scalbn.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_scalbn.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_scalbn.c,v 1.2 1995/05/30 05:50:23 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c index 08b16406a95af..4f3e004a7df39 100644 --- a/lib/msun/src/s_scalbnf.c +++ b/lib/msun/src/s_scalbnf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_scalbnf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_scalbnf.c,v 1.2 1995/05/30 05:50:24 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c index b30e6f290d77f..4d539d66eb00e 100644 --- a/lib/msun/src/s_significand.c +++ b/lib/msun/src/s_significand.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_significand.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_significand.c,v 1.2 1995/05/30 05:50:26 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c index 445f264151e4d..0410f81617f1d 100644 --- a/lib/msun/src/s_significandf.c +++ b/lib/msun/src/s_significandf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_significandf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_significandf.c,v 1.2 1995/05/30 05:50:28 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c index a06d8b084d283..f249ee777fce9 100644 --- a/lib/msun/src/s_sin.c +++ b/lib/msun/src/s_sin.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_sin.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $"; +static char rcsid[] = "$Id: s_sin.c,v 1.2 1995/05/30 05:50:30 rgrimes Exp $"; #endif /* sin(x) diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c index 69b4841191e43..52cfc468a08c8 100644 --- a/lib/msun/src/s_sinf.c +++ b/lib/msun/src/s_sinf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_sinf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_sinf.c,v 1.2 1995/05/30 05:50:32 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c index 24a406323d271..62b63c497b4d1 100644 --- a/lib/msun/src/s_tan.c +++ b/lib/msun/src/s_tan.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_tan.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: s_tan.c,v 1.2 1995/05/30 05:50:33 rgrimes Exp $"; #endif /* tan(x) diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c index 0fb7e19c411c8..1148a8569e258 100644 --- a/lib/msun/src/s_tanf.c +++ b/lib/msun/src/s_tanf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_tanf.c,v 1.1.1.1 1994/08/19 09:39:58 jkh Exp $"; +static char rcsid[] = "$Id: s_tanf.c,v 1.2 1995/05/30 05:50:34 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c index dc1baaab9b9ec..046c67895bbaf 100644 --- a/lib/msun/src/s_tanh.c +++ b/lib/msun/src/s_tanh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_tanh.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: s_tanh.c,v 1.2 1995/05/30 05:50:35 rgrimes Exp $"; #endif /* Tanh(x) diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c index 47908316047b0..cfe602030d4f3 100644 --- a/lib/msun/src/s_tanhf.c +++ b/lib/msun/src/s_tanhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: s_tanhf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: s_tanhf.c,v 1.2 1995/05/30 05:50:36 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/w_acos.c b/lib/msun/src/w_acos.c index af5f0227edf73..31b67b3c90347 100644 --- a/lib/msun/src/w_acos.c +++ b/lib/msun/src/w_acos.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_acos.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_acos.c,v 1.2 1995/05/30 05:50:37 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_acosf.c b/lib/msun/src/w_acosf.c index 1501235e3c402..5ddd21e9f1c11 100644 --- a/lib/msun/src/w_acosf.c +++ b/lib/msun/src/w_acosf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_acosf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_acosf.c,v 1.2 1995/05/30 05:50:38 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_acosh.c b/lib/msun/src/w_acosh.c index d32cd3d32d477..4b2a98ff22db9 100644 --- a/lib/msun/src/w_acosh.c +++ b/lib/msun/src/w_acosh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_acosh.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_acosh.c,v 1.2 1995/05/30 05:50:39 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_acoshf.c b/lib/msun/src/w_acoshf.c index 232685309174c..90fb1991eb061 100644 --- a/lib/msun/src/w_acoshf.c +++ b/lib/msun/src/w_acoshf.c @@ -15,7 +15,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_acoshf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_acoshf.c,v 1.2 1995/05/30 05:50:40 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_asin.c b/lib/msun/src/w_asin.c index 7174df657fa1f..0079e15ec9920 100644 --- a/lib/msun/src/w_asin.c +++ b/lib/msun/src/w_asin.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_asin.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_asin.c,v 1.2 1995/05/30 05:50:41 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_asinf.c b/lib/msun/src/w_asinf.c index fdc08d4b7ff58..e5894361e3c81 100644 --- a/lib/msun/src/w_asinf.c +++ b/lib/msun/src/w_asinf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_asinf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_asinf.c,v 1.2 1995/05/30 05:50:42 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_atan2.c b/lib/msun/src/w_atan2.c index b408ad6e561a6..d6827296f867d 100644 --- a/lib/msun/src/w_atan2.c +++ b/lib/msun/src/w_atan2.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_atan2.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_atan2.c,v 1.2 1995/05/30 05:50:43 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_atan2f.c b/lib/msun/src/w_atan2f.c index 403cc52f22d22..319463e35a78e 100644 --- a/lib/msun/src/w_atan2f.c +++ b/lib/msun/src/w_atan2f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_atan2f.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_atan2f.c,v 1.2 1995/05/30 05:50:44 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_atanh.c b/lib/msun/src/w_atanh.c index c0774220be44a..14f0b1c97be0a 100644 --- a/lib/msun/src/w_atanh.c +++ b/lib/msun/src/w_atanh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_atanh.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_atanh.c,v 1.2 1995/05/30 05:50:45 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_atanhf.c b/lib/msun/src/w_atanhf.c index 8e6fe1a185e12..d751c8c0aca9b 100644 --- a/lib/msun/src/w_atanhf.c +++ b/lib/msun/src/w_atanhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_atanhf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_atanhf.c,v 1.2 1995/05/30 05:50:46 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_cosh.c b/lib/msun/src/w_cosh.c index 5386838ffc725..306eab1d33e32 100644 --- a/lib/msun/src/w_cosh.c +++ b/lib/msun/src/w_cosh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_cosh.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_cosh.c,v 1.2 1995/05/30 05:50:49 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_coshf.c b/lib/msun/src/w_coshf.c index 64fd579640f64..15b44ff31285c 100644 --- a/lib/msun/src/w_coshf.c +++ b/lib/msun/src/w_coshf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_coshf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_coshf.c,v 1.2 1995/05/30 05:50:53 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_exp.c b/lib/msun/src/w_exp.c index 0d592ee5004ee..3288c53c109df 100644 --- a/lib/msun/src/w_exp.c +++ b/lib/msun/src/w_exp.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_exp.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_exp.c,v 1.2 1995/05/30 05:50:58 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_expf.c b/lib/msun/src/w_expf.c index e22a951e92c9b..276a6d291c583 100644 --- a/lib/msun/src/w_expf.c +++ b/lib/msun/src/w_expf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_expf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_expf.c,v 1.2 1995/05/30 05:51:00 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_fmod.c b/lib/msun/src/w_fmod.c index 4065409d170e9..02d2184d135f5 100644 --- a/lib/msun/src/w_fmod.c +++ b/lib/msun/src/w_fmod.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_fmod.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_fmod.c,v 1.2 1995/05/30 05:51:02 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_fmodf.c b/lib/msun/src/w_fmodf.c index 5c0c43209af20..b6681360b27cd 100644 --- a/lib/msun/src/w_fmodf.c +++ b/lib/msun/src/w_fmodf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_fmodf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_fmodf.c,v 1.2 1995/05/30 05:51:03 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_gamma.c b/lib/msun/src/w_gamma.c index bf53f1874931b..a1ddf9037f478 100644 --- a/lib/msun/src/w_gamma.c +++ b/lib/msun/src/w_gamma.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_gamma.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_gamma.c,v 1.2 1995/05/30 05:51:04 rgrimes Exp $"; #endif /* double gamma(double x) diff --git a/lib/msun/src/w_gamma_r.c b/lib/msun/src/w_gamma_r.c index 7aad6133c320e..7db1799f524b0 100644 --- a/lib/msun/src/w_gamma_r.c +++ b/lib/msun/src/w_gamma_r.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_gamma_r.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_gamma_r.c,v 1.2 1995/05/30 05:51:06 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_gammaf.c b/lib/msun/src/w_gammaf.c index 89e8f7fa26a16..5aad38ae5d734 100644 --- a/lib/msun/src/w_gammaf.c +++ b/lib/msun/src/w_gammaf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_gammaf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_gammaf.c,v 1.2 1995/05/30 05:51:10 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/w_gammaf_r.c b/lib/msun/src/w_gammaf_r.c index a2585cbb300a6..024c5d4cde23e 100644 --- a/lib/msun/src/w_gammaf_r.c +++ b/lib/msun/src/w_gammaf_r.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_gammaf_r.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_gammaf_r.c,v 1.2 1995/05/30 05:51:12 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_hypot.c b/lib/msun/src/w_hypot.c index 9b6f46fcf652f..77ccecc891c74 100644 --- a/lib/msun/src/w_hypot.c +++ b/lib/msun/src/w_hypot.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_hypot.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_hypot.c,v 1.2 1995/05/30 05:51:13 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_hypotf.c b/lib/msun/src/w_hypotf.c index 0b126d702cd70..030dd5dadfcb2 100644 --- a/lib/msun/src/w_hypotf.c +++ b/lib/msun/src/w_hypotf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_hypotf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_hypotf.c,v 1.2 1995/05/30 05:51:15 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_j0.c b/lib/msun/src/w_j0.c index c5b9fe053584d..2ebba4ef78d24 100644 --- a/lib/msun/src/w_j0.c +++ b/lib/msun/src/w_j0.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_j0.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_j0.c,v 1.2 1995/05/30 05:51:16 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_j0f.c b/lib/msun/src/w_j0f.c index e836edc55f5c6..75a02e885973f 100644 --- a/lib/msun/src/w_j0f.c +++ b/lib/msun/src/w_j0f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_j0f.c,v 1.1.1.1 1994/08/19 09:39:57 jkh Exp $"; +static char rcsid[] = "$Id: w_j0f.c,v 1.2 1995/05/30 05:51:18 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_j1.c b/lib/msun/src/w_j1.c index c0204bd94c84f..7f3b42a604c72 100644 --- a/lib/msun/src/w_j1.c +++ b/lib/msun/src/w_j1.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_j1.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_j1.c,v 1.2 1995/05/30 05:51:19 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_j1f.c b/lib/msun/src/w_j1f.c index 60b9e21abcd2c..bcb2366d19957 100644 --- a/lib/msun/src/w_j1f.c +++ b/lib/msun/src/w_j1f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_j1f.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_j1f.c,v 1.2 1995/05/30 05:51:21 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_jn.c b/lib/msun/src/w_jn.c index 2fb8365ecd997..53f196a2f4168 100644 --- a/lib/msun/src/w_jn.c +++ b/lib/msun/src/w_jn.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_jn.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_jn.c,v 1.2 1995/05/30 05:51:24 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_jnf.c b/lib/msun/src/w_jnf.c index 00b2ddfa3de0c..4be344a28243a 100644 --- a/lib/msun/src/w_jnf.c +++ b/lib/msun/src/w_jnf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_jnf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_jnf.c,v 1.2 1995/05/30 05:51:27 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/w_lgamma.c b/lib/msun/src/w_lgamma.c index f15cb9d148997..ff197721a1ecc 100644 --- a/lib/msun/src/w_lgamma.c +++ b/lib/msun/src/w_lgamma.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_lgamma.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $"; +static char rcsid[] = "$Id: w_lgamma.c,v 1.2 1995/05/30 05:51:28 rgrimes Exp $"; #endif /* double lgamma(double x) diff --git a/lib/msun/src/w_lgamma_r.c b/lib/msun/src/w_lgamma_r.c index 2cac60c13ba51..cc0621428dee0 100644 --- a/lib/msun/src/w_lgamma_r.c +++ b/lib/msun/src/w_lgamma_r.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_lgamma_r.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_lgamma_r.c,v 1.2 1995/05/30 05:51:29 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_lgammaf.c b/lib/msun/src/w_lgammaf.c index e4b2aa20ee79d..02b0b6e72b6c7 100644 --- a/lib/msun/src/w_lgammaf.c +++ b/lib/msun/src/w_lgammaf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_lgammaf.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_lgammaf.c,v 1.2 1995/05/30 05:51:31 rgrimes Exp $"; #endif #include "math.h" diff --git a/lib/msun/src/w_lgammaf_r.c b/lib/msun/src/w_lgammaf_r.c index 3fd4f227c5330..067e18baea7d6 100644 --- a/lib/msun/src/w_lgammaf_r.c +++ b/lib/msun/src/w_lgammaf_r.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_lgammaf_r.c,v 1.1.1.1 1994/08/19 09:39:59 jkh Exp $"; +static char rcsid[] = "$Id: w_lgammaf_r.c,v 1.2 1995/05/30 05:51:32 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_log.c b/lib/msun/src/w_log.c index e5b8afde387f7..03f8321599685 100644 --- a/lib/msun/src/w_log.c +++ b/lib/msun/src/w_log.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_log.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_log.c,v 1.2 1995/05/30 05:51:33 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_log10.c b/lib/msun/src/w_log10.c index c09deeb78e3f3..2fe95b3ab1f99 100644 --- a/lib/msun/src/w_log10.c +++ b/lib/msun/src/w_log10.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_log10.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_log10.c,v 1.2 1995/05/30 05:51:34 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_log10f.c b/lib/msun/src/w_log10f.c index 31a94107239fb..d86014a6340fc 100644 --- a/lib/msun/src/w_log10f.c +++ b/lib/msun/src/w_log10f.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_log10f.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_log10f.c,v 1.2 1995/05/30 05:51:35 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_logf.c b/lib/msun/src/w_logf.c index 3f3f8d47aab06..fe9b5cd0a7e13 100644 --- a/lib/msun/src/w_logf.c +++ b/lib/msun/src/w_logf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_logf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_logf.c,v 1.2 1995/05/30 05:51:36 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_powf.c b/lib/msun/src/w_powf.c index 40fb91fc858e6..68685ae06f2fd 100644 --- a/lib/msun/src/w_powf.c +++ b/lib/msun/src/w_powf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_powf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_powf.c,v 1.2 1995/05/30 05:51:38 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_remainder.c b/lib/msun/src/w_remainder.c index dd0f112157141..1386f0fa9cb68 100644 --- a/lib/msun/src/w_remainder.c +++ b/lib/msun/src/w_remainder.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_remainder.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_remainder.c,v 1.2 1995/05/30 05:51:39 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_remainderf.c b/lib/msun/src/w_remainderf.c index a7f3e469e6cc2..fce589524009e 100644 --- a/lib/msun/src/w_remainderf.c +++ b/lib/msun/src/w_remainderf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_remainderf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_remainderf.c,v 1.2 1995/05/30 05:51:40 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_scalb.c b/lib/msun/src/w_scalb.c index 9e3ce15042c7e..1d79db94c6206 100644 --- a/lib/msun/src/w_scalb.c +++ b/lib/msun/src/w_scalb.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_scalb.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_scalb.c,v 1.2 1995/05/30 05:51:41 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_scalbf.c b/lib/msun/src/w_scalbf.c index 469525cfc17ff..f6a5a4f53c3e4 100644 --- a/lib/msun/src/w_scalbf.c +++ b/lib/msun/src/w_scalbf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_scalbf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_scalbf.c,v 1.2 1995/05/30 05:51:42 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_sinh.c b/lib/msun/src/w_sinh.c index 8498dbe87e330..ab311429cafa4 100644 --- a/lib/msun/src/w_sinh.c +++ b/lib/msun/src/w_sinh.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_sinh.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_sinh.c,v 1.2 1995/05/30 05:51:43 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_sinhf.c b/lib/msun/src/w_sinhf.c index 5f1467dc1d227..3edbd4473f9e0 100644 --- a/lib/msun/src/w_sinhf.c +++ b/lib/msun/src/w_sinhf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_sinhf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_sinhf.c,v 1.2 1995/05/30 05:51:44 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_sqrt.c b/lib/msun/src/w_sqrt.c index bdf97d21e086f..21672c40fdf78 100644 --- a/lib/msun/src/w_sqrt.c +++ b/lib/msun/src/w_sqrt.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_sqrt.c,v 1.1.1.1 1994/08/19 09:39:54 jkh Exp $"; +static char rcsid[] = "$Id: w_sqrt.c,v 1.2 1995/05/30 05:51:46 rgrimes Exp $"; #endif /* diff --git a/lib/msun/src/w_sqrtf.c b/lib/msun/src/w_sqrtf.c index 55631bff80126..7b87e6762c3c7 100644 --- a/lib/msun/src/w_sqrtf.c +++ b/lib/msun/src/w_sqrtf.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: w_sqrtf.c,v 1.1.1.1 1994/08/19 09:40:00 jkh Exp $"; +static char rcsid[] = "$Id: w_sqrtf.c,v 1.2 1995/05/30 05:51:47 rgrimes Exp $"; #endif /* diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index cb69fd16980d7..d0d3770c911c9 100644 --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/01/05 01:02:56 nate Exp $ +# $Id: Makefile,v 1.2 1995/04/12 02:52:08 ache Exp $ MAINSRC= ${.CURDIR}/../../usr.bin/at diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c index 3ae9ee78decde..c8d12a863cad8 100644 --- a/libexec/atrun/atrun.c +++ b/libexec/atrun/atrun.c @@ -73,7 +73,7 @@ /* File scope variables */ static char *namep; -static char rcsid[] = "$Id: atrun.c,v 1.3 1995/04/12 19:21:43 ache Exp $"; +static char rcsid[] = "$Id: atrun.c,v 1.4 1995/05/30 05:45:39 rgrimes Exp $"; static debug = 0; /* Local functions */ diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man index abce667bfacc7..2172492ab5974 100644 --- a/libexec/atrun/atrun.man +++ b/libexec/atrun/atrun.man @@ -1,4 +1,4 @@ -.\" $Id: atrun.man,v 1.1 1994/05/10 18:23:08 kernel Exp $ +.\" $Id: atrun.man,v 1.1 1995/04/12 02:52:21 ache Exp $ .Dd April 12, 1995 .Dt ATRUN 8 .Os "FreeBSD 2.1" diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile index 954761ca4e7df..ccdce28d52949 100644 --- a/libexec/bootpd/Makefile +++ b/libexec/bootpd/Makefile @@ -1,5 +1,5 @@ # bootpd/Makefile -# $Id: Makefile,v 1.3 1995/07/25 23:38:40 wpaul Exp $ +# $Id: Makefile,v 1.2.4.1 1995/08/30 09:03:41 davidg Exp $ PROG= bootpd CFLAGS+= -DETC_ETHERS diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h index 0651aa5dbfb04..c18b0e4695838 100644 --- a/libexec/bootpd/bootp.h +++ b/libexec/bootpd/bootp.h @@ -23,7 +23,7 @@ SOFTWARE. /* * Bootstrap Protocol (BOOTP). RFC951 and RFC1395. * - * $Id: bootp.h,v 1.1.1.1 1994/09/10 14:44:54 csgr Exp $ + * $Id: bootp.h,v 1.1.1.1 1994/09/30 05:45:04 pst Exp $ * * * This file specifies the "implementation-independent" BOOTP protocol diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8 index a9fb65e2f77f4..6628624001647 100644 --- a/libexec/bootpd/bootpd.8 +++ b/libexec/bootpd/bootpd.8 @@ -1,6 +1,6 @@ .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/libexec/bootpd/bootpd.8,v 1.2 1995/04/12 00:24:48 gpalmer Exp $ +.\" $Header: /home/ncvs/src/libexec/bootpd/bootpd.8,v 1.2.4.1 1996/06/05 02:53:11 jkh Exp $ .\" .TH BOOTPD 8 "November 06, 1993" "Carnegie Mellon University" .SH NAME diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c index cf693fd6cc0c3..9a41e7b55717f 100644 --- a/libexec/bootpd/bootpd.c +++ b/libexec/bootpd/bootpd.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: bootpd.c,v 1.1.1.1 1994/09/30 05:45:04 pst Exp $"; +static char rcsid[] = "$Id: bootpd.c,v 1.2 1995/05/30 05:45:47 rgrimes Exp $"; #endif /* diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5 index 447ce89856878..ec1349ef52d2d 100644 --- a/libexec/bootpd/bootptab.5 +++ b/libexec/bootpd/bootptab.5 @@ -1,6 +1,6 @@ .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/libexec/bootpd/bootptab.5,v 1.1.1.1 1994/09/30 05:45:04 pst Exp $ +.\" $Header: /home/ncvs/src/libexec/bootpd/bootptab.5,v 1.1.1.1.6.1 1996/06/05 02:53:12 jkh Exp $ .\" .TH BOOTPTAB 5 "October 31, 1991" "Carnegie Mellon University" .UC 6 diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c index 2ecda6305a250..3de8c2438b2c8 100644 --- a/libexec/bootpd/hash.c +++ b/libexec/bootpd/hash.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: hash.c,v 1.1.1.1 1994/09/10 14:44:55 csgr Exp $"; +static char rcsid[] = "$Id: hash.c,v 1.1.1.1 1994/09/30 05:45:05 pst Exp $"; #endif diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c index 4a9d9937dd5c9..6189363e15bc6 100644 --- a/libexec/bootpd/readfile.c +++ b/libexec/bootpd/readfile.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: readfile.c,v 1.1.1.1 1994/09/10 14:44:55 csgr Exp $"; +static char rcsid[] = "$Id: readfile.c,v 1.1.1.1 1994/09/30 05:45:06 pst Exp $"; #endif diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c index 5942b22d13f4e..96801ffdf323e 100644 --- a/libexec/bootpd/rtmsg.c +++ b/libexec/bootpd/rtmsg.c @@ -39,7 +39,7 @@ /* * from arp.c 8.2 (Berkeley) 1/2/94 - * $Id: rtmsg.c,v 1.3 1995/01/30 11:11:43 dfr Exp $ + * $Id: rtmsg.c,v 1.4 1995/05/30 05:45:49 rgrimes Exp $ */ #include diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile index b1f38e76ecbd0..625bdee24b1b5 100644 --- a/libexec/bootpd/tools/Makefile +++ b/libexec/bootpd/tools/Makefile @@ -1,5 +1,5 @@ # Makefile -# $Id$ +# $Id: Makefile,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $ SUBDIR= bootpef bootptest diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc index 0a2ab66f28f43..38b150a650860 100644 --- a/libexec/bootpd/tools/Makefile.inc +++ b/libexec/bootpd/tools/Makefile.inc @@ -1,4 +1,4 @@ # Makefile.inc -# $Id$ +# $Id: Makefile.inc,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $ BINDIR=/usr/sbin diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile index 7d176069a8d6d..eb0c4a5ef87f1 100644 --- a/libexec/bootpd/tools/bootpef/Makefile +++ b/libexec/bootpd/tools/bootpef/Makefile @@ -1,5 +1,5 @@ # Makefile -# $Id$ +# $Id: Makefile,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $ PROG= bootpef MAN8= bootpef.8 diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c index eb1893501242b..81ec8ab40248b 100644 --- a/libexec/bootpd/tools/bootpef/bootpef.c +++ b/libexec/bootpd/tools/bootpef/bootpef.c @@ -21,7 +21,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: bootpef.c,v 1.1.1.1 1994/09/10 14:44:54 csgr Exp $"; +static char rcsid[] = "$Id: bootpef.c,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $"; #endif diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile index 95f99f1e112d5..f22520866ab14 100644 --- a/libexec/bootpd/tools/bootptest/Makefile +++ b/libexec/bootpd/tools/bootptest/Makefile @@ -1,5 +1,5 @@ # Makefile -# $Id: Makefile,v 1.3 1995/09/28 17:33:16 bde Exp $ +# $Id: Makefile,v 1.2.4.1 1995/10/05 20:27:09 davidg Exp $ PROG= bootptest MAN8= bootptest.8 diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c index f4169986920ab..c52ecd61cc487 100644 --- a/libexec/bootpd/tools/bootptest/print-bootp.c +++ b/libexec/bootpd/tools/bootptest/print-bootp.c @@ -24,7 +24,7 @@ * There is an e-mail list for tcpdump: */ #ifndef lint -static char rcsid[] = "$Id: print-bootp.c,v 1.1.1.1 1994/09/10 14:44:55 csgr Exp $"; +static char rcsid[] = "$Id: print-bootp.c,v 1.1.1.1 1994/09/30 05:45:07 pst Exp $"; /* 93/10/10 New data-driven option print routine. */ #endif diff --git a/libexec/bootpgw/Makefile b/libexec/bootpgw/Makefile index a155e0e4f7c32..ee3ec4decdf68 100644 --- a/libexec/bootpgw/Makefile +++ b/libexec/bootpgw/Makefile @@ -1,5 +1,5 @@ # Makefile -# $Id$ +# $Id: Makefile,v 1.1.1.1 1994/09/30 05:43:13 pst Exp $ PROG= bootpgw NOMAN= true diff --git a/libexec/bootpgw/bootpgw.c b/libexec/bootpgw/bootpgw.c index 4e7538bb4defb..ec0fa7bb837ab 100644 --- a/libexec/bootpgw/bootpgw.c +++ b/libexec/bootpgw/bootpgw.c @@ -26,7 +26,7 @@ SOFTWARE. ************************************************************************/ #ifndef lint -static char rcsid[] = "$Id: bootpgw.c,v 1.1.1.1 1994/09/10 14:44:54 csgr Exp $"; +static char rcsid[] = "$Id: bootpgw.c,v 1.1.1.1 1994/09/30 05:43:13 pst Exp $"; #endif /* diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 7108a4a1d2e48..20c7afa0d9315 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftpd.c,v 1.10.4.3 1996/03/18 11:10:16 davidg Exp $ + * $Id: ftpd.c,v 1.10.4.5 1997/02/13 19:31:55 guido Exp $ */ #ifndef lint diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index 80d7694c3e804..6a419ea61443a 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: popen.c,v 1.5 1996/11/20 22:12:50 pst Exp $ + * $Id: popen.c,v 1.1.1.1.6.1 1996/11/20 22:25:39 pst Exp $ */ #if 0 diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile index f4090773752ab..74286d5638267 100644 --- a/libexec/rexecd/Makefile +++ b/libexec/rexecd/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $Id: Makefile,v 1.6 1996/09/22 21:54:40 wosch Exp $ +# $Id: Makefile,v 1.5.4.1 1996/11/22 09:01:33 pst Exp $ PROG= rexecd MAN8= rexecd.8 diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8 index babaf89aed097..f54bbd26d8973 100644 --- a/libexec/rexecd/rexecd.8 +++ b/libexec/rexecd/rexecd.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rexecd.8 8.2 (Berkeley) 12/11/93 -.\" $Id: rexecd.8,v 1.3 1996/09/22 21:54:42 wosch Exp $ +.\" $Id: rexecd.8,v 1.2.6.2 1996/11/22 09:01:34 pst Exp $ .\" .Dd September 23, 1994 .Dt REXECD 8 diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c index 414f90372e438..a1d4acfd8317f 100644 --- a/libexec/rexecd/rexecd.c +++ b/libexec/rexecd/rexecd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rexecd.c,v 1.5.4.4 1996/11/22 09:01:35 pst Exp $ + * $Id: rexecd.c,v 1.5.4.5 1997/02/09 04:41:22 imp Exp $ */ #ifndef lint diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index 312f7cf7c3fe4..aa2ce5f9e6d64 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/10 03:45:40 smace Exp $ +# $Id: Makefile,v 1.1.1.1 1994/08/28 14:49:03 csgr Exp $ PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8 index 0644bbbf7f0d8..ebf814182709b 100644 --- a/libexec/rpc.rstatd/rpc.rstatd.8 +++ b/libexec/rpc.rstatd/rpc.rstatd.8 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rpc.rstatd.8,v 1.1 1993/09/16 00:27:45 jtc Exp $ +.\" $Id: rpc.rstatd.8,v 1.1.1.1 1994/08/28 14:49:04 csgr Exp $ .\" .Dd June 7, 1993 .Dt RPC.RSTATD 8 diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index 613ce51cc47b4..3e9c49e592c80 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -29,7 +29,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/ /*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char rcsid[] = "$Id: rstat_proc.c,v 1.2 1994/10/15 13:39:54 davidg Exp $"; +static char rcsid[] = "$Id: rstat_proc.c,v 1.3 1995/05/30 05:46:28 rgrimes Exp $"; #endif /* diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index 972974cc101a1..4b196e231227c 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rstatd.c,v 1.2 1994/11/18 22:31:05 ats Exp $"; +static char rcsid[] = "$Id: rstatd.c,v 1.3 1995/05/30 05:46:30 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index 28dc2988c97e4..ad62f72b65440 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/08/28 14:53:44 csgr Exp $ +# $Id: Makefile,v 1.1.1.1.6.1 1997/01/31 09:21:58 dima Exp $ PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8 index 15947ac8bfbb7..94ce38a524139 100644 --- a/libexec/rpc.rusersd/rpc.rusersd.8 +++ b/libexec/rpc.rusersd/rpc.rusersd.8 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rpc.rusersd.8,v 1.1 1993/09/16 00:34:43 jtc Exp $ +.\" $Id: rpc.rusersd.8,v 1.1.1.1 1994/08/28 14:53:44 csgr Exp $ .\" .Dd June 7, 1993 .Dt RPC.RUSERSD 8 diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c index d472673e8a21d..15bcbc7b89afa 100644 --- a/libexec/rpc.rusersd/rusers_proc.c +++ b/libexec/rpc.rusersd/rusers_proc.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rusers_proc.c,v 1.3 1994/11/18 23:36:18 ats Exp $"; +static char rcsid[] = "$Id: rusers_proc.c,v 1.4 1995/05/30 05:46:32 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index 01823060f0b5c..80a9cc6c93735 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rusersd.c,v 1.2 1994/11/18 22:40:11 ats Exp $"; +static char rcsid[] = "$Id: rusersd.c,v 1.3 1995/05/30 05:46:34 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile index 5d7b492a8a40c..81cf9784702b0 100644 --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/10 03:46:23 smace Exp $ +# $Id: Makefile,v 1.1.1.1 1994/08/28 14:58:36 csgr Exp $ PROG = rpc.rwalld SRCS = rwalld.c diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8 index eadadf4212b77..ada838542f844 100644 --- a/libexec/rpc.rwalld/rpc.rwalld.8 +++ b/libexec/rpc.rwalld/rpc.rwalld.8 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rpc.rwalld.8,v 1.1 1993/09/16 00:36:43 jtc Exp $ +.\" $Id: rpc.rwalld.8,v 1.1.1.1 1994/08/28 14:58:36 csgr Exp $ .\" .Dd June 7, 1993 .Dt RPC.RWALLD 8 diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index adb6c3f71b271..9a55e5e1733fa 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rwalld.c,v 1.2 1994/11/18 22:50:22 ats Exp $"; +static char rcsid[] = "$Id: rwalld.c,v 1.3 1995/05/30 05:46:36 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile index 984a6b763a338..a1b5fb47f441b 100644 --- a/libexec/rshd/Makefile +++ b/libexec/rshd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $Id: Makefile,v 1.3 1994/09/29 13:06:37 csgr Exp $ +# $Id: Makefile,v 1.4 1994/11/20 23:20:00 wollman Exp $ PROG= rshd SRCS= rshd.c diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile index 75fedeff421f5..468dc8b62288a 100644 --- a/libexec/xtend/Makefile +++ b/libexec/xtend/Makefile @@ -1,5 +1,5 @@ # Makefile for xtend (Stark) 10/30/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/04/18 01:53:56 jkh Exp $ BINMODE= 555 diff --git a/lkm/Makefile b/lkm/Makefile index 4db5b1793dc85..95775d701ddab 100644 --- a/lkm/Makefile +++ b/lkm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9.4.4 1996/06/23 13:47:31 bde Exp $ +# $Id: Makefile,v 1.9.4.5 1996/11/12 17:30:15 jkh Exp $ # XXX present but broken: ip_mroute_mod mfs SUBDIR= cd9660 coff fdesc ibcs2 if_disc if_ppp if_sl ipfw if_tun \ diff --git a/lkm/Makefile.inc b/lkm/Makefile.inc index 752e6b0361c6d..cc269a9cb8681 100644 --- a/lkm/Makefile.inc +++ b/lkm/Makefile.inc @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1994/09/16 20:24:27 wollman Exp $ BINDIR= /lkm diff --git a/lkm/cd9660/Makefile b/lkm/cd9660/Makefile index a7ee27b7bf7d4..f85e023989827 100644 --- a/lkm/cd9660/Makefile +++ b/lkm/cd9660/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:03 wollman Exp $ .PATH: ${.CURDIR}/../../sys/isofs/cd9660 KMOD= cd9660_mod diff --git a/lkm/coff/Makefile b/lkm/coff/Makefile index 3160c9e97555a..b82a3bace4f8d 100644 --- a/lkm/coff/Makefile +++ b/lkm/coff/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/10/14 08:46:11 sos Exp $ +# $Id: Makefile,v 1.2 1994/10/27 23:39:19 wollman Exp $ .PATH: ${.CURDIR}/../../sys/i386/ibcs2 KMOD= ibcs2_coff_mod diff --git a/lkm/coff/coff.c b/lkm/coff/coff.c index 6a3bf9b7caa5f..d189fc7ee428e 100644 --- a/lkm/coff/coff.c +++ b/lkm/coff/coff.c @@ -25,7 +25,7 @@ * (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: coff.c,v 1.1 1994/10/14 08:46:12 sos Exp $ + * $Id: coff.c,v 1.2 1995/05/30 06:06:00 rgrimes Exp $ */ #include diff --git a/lkm/fdesc/Makefile b/lkm/fdesc/Makefile index 7aa2a7d6a6757..b4a36f196278a 100644 --- a/lkm/fdesc/Makefile +++ b/lkm/fdesc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:05 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/fdesc KMOD= fdesc_mod diff --git a/lkm/ibcs2/Makefile b/lkm/ibcs2/Makefile index 83be90f63eb4b..53236398dacb6 100644 --- a/lkm/ibcs2/Makefile +++ b/lkm/ibcs2/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1994/10/27 23:36:57 wollman Exp $ +# $Id: Makefile,v 1.5 1994/12/11 21:27:14 wollman Exp $ .PATH: ${.CURDIR}/../../sys/i386/ibcs2 KMOD= ibcs2_mod diff --git a/lkm/ibcs2/ibcs2 b/lkm/ibcs2/ibcs2 index 2908e5aba78c0..28d17babc7bca 100755 --- a/lkm/ibcs2/ibcs2 +++ b/lkm/ibcs2/ibcs2 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: ibcs2,v 1.1 1994/10/14 08:45:15 sos Exp $ +# $Id: ibcs2,v 1.2 1994/10/16 20:39:16 sos Exp $ if [ $# -le 1 ]; then LOADERS="coff" # elf fi diff --git a/lkm/ibcs2/ibcs2.c b/lkm/ibcs2/ibcs2.c index 53b61368a5a5b..5be8f0c6b73aa 100644 --- a/lkm/ibcs2/ibcs2.c +++ b/lkm/ibcs2/ibcs2.c @@ -25,7 +25,7 @@ * (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: ibcs2.c,v 1.2 1994/10/14 08:45:16 sos Exp $ + * $Id: ibcs2.c,v 1.3 1995/05/30 06:06:06 rgrimes Exp $ */ #include diff --git a/lkm/if_disc/Makefile b/lkm/if_disc/Makefile index 492de57e96859..248a6202df0df 100644 --- a/lkm/if_disc/Makefile +++ b/lkm/if_disc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/22 22:12:59 wollman Exp $ +# $Id: Makefile,v 1.1 1995/03/20 19:25:46 wollman Exp $ .PATH: ${.CURDIR}/../../sys/net KMOD= if_disc_mod diff --git a/lkm/if_ppp/Makefile b/lkm/if_ppp/Makefile index 7e52fdca4aee8..3162d6910f4b3 100644 --- a/lkm/if_ppp/Makefile +++ b/lkm/if_ppp/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/03/20 19:33:35 wollman Exp $ +# $Id: Makefile,v 1.3 1995/04/15 17:36:53 ats Exp $ .PATH: ${.CURDIR}/../../sys/net KMOD= if_ppp_mod diff --git a/lkm/if_sl/Makefile b/lkm/if_sl/Makefile index d2cdd81c2dbfa..1dc19ce0eecde 100644 --- a/lkm/if_sl/Makefile +++ b/lkm/if_sl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/03/20 19:25:47 wollman Exp $ +# $Id: Makefile,v 1.2 1995/03/20 19:31:47 wollman Exp $ .PATH: ${.CURDIR}/../../sys/net KMOD= if_sl_mod diff --git a/lkm/if_tun/Makefile b/lkm/if_tun/Makefile index 49ca7784e15a2..00edaf487baf5 100644 --- a/lkm/if_tun/Makefile +++ b/lkm/if_tun/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/22 22:12:59 wollman Exp $ +# $Id: Makefile,v 1.1 1995/03/20 19:25:49 wollman Exp $ .PATH: ${.CURDIR}/../../sys/net KMOD= if_tun_mod diff --git a/lkm/ip_mroute_mod/Makefile b/lkm/ip_mroute_mod/Makefile index d1f93c3e2185d..b273ce1e53368 100644 --- a/lkm/ip_mroute_mod/Makefile +++ b/lkm/ip_mroute_mod/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/14 22:11:51 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ .PATH: ${.CURDIR}/../../sys/netinet KMOD= ip_mroute_mod diff --git a/lkm/ipfw/Makefile b/lkm/ipfw/Makefile index 14a46cc904cd7..3287f0b6580c0 100644 --- a/lkm/ipfw/Makefile +++ b/lkm/ipfw/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/05/30 06:06:07 rgrimes Exp $ +# $Id: Makefile,v 1.3.4.1 1996/11/12 17:30:22 jkh Exp $ .PATH: ${.CURDIR}/../../sys/netinet KMOD= ipfw_mod diff --git a/lkm/kernfs/Makefile b/lkm/kernfs/Makefile index 1fbe7f76521e0..48b0662381893 100644 --- a/lkm/kernfs/Makefile +++ b/lkm/kernfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:06 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/kernfs KMOD= kernfs_mod diff --git a/lkm/linux/Makefile b/lkm/linux/Makefile index 509323ca58ed9..82be24fe6b64d 100644 --- a/lkm/linux/Makefile +++ b/lkm/linux/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/06/25 17:29:46 sos Exp $ +# $Id: Makefile,v 1.1.2.1 1996/01/28 00:00:10 rgrimes Exp $ .PATH: ${.CURDIR}/../../sys/i386/linux KMOD= linux_mod diff --git a/lkm/linux/linux b/lkm/linux/linux index e4c36068cfa31..327b6cdde5171 100644 --- a/lkm/linux/linux +++ b/lkm/linux/linux @@ -1,3 +1,3 @@ #!/bin/sh -# $Id$ +# $Id: linux,v 1.1 1995/06/25 17:29:48 sos Exp $ modload -e linux_init /lkm/linux_mod.o diff --git a/lkm/linux/linux.c b/lkm/linux/linux.c index 183ad3e492549..6300f0ff26f26 100644 --- a/lkm/linux/linux.c +++ b/lkm/linux/linux.c @@ -25,7 +25,7 @@ * (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: linux.c,v 1.1 1994/10/14 08:46:12 sos Exp $ + * $Id: linux.c,v 1.1 1995/06/25 17:29:48 sos Exp $ */ #include diff --git a/lkm/mfs/Makefile b/lkm/mfs/Makefile index b3aee055aacbf..f35ff1abb9c27 100644 --- a/lkm/mfs/Makefile +++ b/lkm/mfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:07 wollman Exp $ .PATH: ${.CURDIR}/../../sys/ufs/mfs KMOD= mfs_mod diff --git a/lkm/msdos/Makefile b/lkm/msdos/Makefile index c849011630e7b..0791e1543cb69 100644 --- a/lkm/msdos/Makefile +++ b/lkm/msdos/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/21 23:27:09 wollman Exp $ +# $Id: Makefile,v 1.2 1995/03/03 18:33:04 nate Exp $ .PATH: ${.CURDIR}/../../sys/msdosfs KMOD= msdos_mod diff --git a/lkm/nfs/Makefile b/lkm/nfs/Makefile index e8e89e8367d9a..5d2c428a9f424 100644 --- a/lkm/nfs/Makefile +++ b/lkm/nfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/21 23:27:07 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/22 22:12:59 wollman Exp $ .PATH: ${.CURDIR}/../../sys/nfs KMOD= nfs_mod diff --git a/lkm/nullfs/Makefile b/lkm/nullfs/Makefile index fc71e6a33ea69..612ce01caf863 100644 --- a/lkm/nullfs/Makefile +++ b/lkm/nullfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:10 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/nullfs KMOD= null_mod diff --git a/lkm/portal/Makefile b/lkm/portal/Makefile index 529314d1f6fe2..13923f972ede6 100644 --- a/lkm/portal/Makefile +++ b/lkm/portal/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:12 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/portal KMOD= portal_mod diff --git a/lkm/procfs/Makefile b/lkm/procfs/Makefile index 951d65d49b5b1..bc5e523e650de 100644 --- a/lkm/procfs/Makefile +++ b/lkm/procfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:13 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/procfs \ ${.CURDIR}/../../sys/${MACHINE}/${MACHINE} diff --git a/lkm/socksys/Makefile b/lkm/socksys/Makefile index de8b44c1317cf..fe3142cb45a54 100644 --- a/lkm/socksys/Makefile +++ b/lkm/socksys/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/10/16 20:38:49 sos Exp $ .PATH: ${.CURDIR}/../../sys/i386/ibcs2 KMOD= socksys_mod diff --git a/lkm/socksys/socksys.c b/lkm/socksys/socksys.c index 59d9aa22d5a11..85e388d1bd760 100644 --- a/lkm/socksys/socksys.c +++ b/lkm/socksys/socksys.c @@ -25,7 +25,7 @@ * (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: socksys.c,v 1.2 1995/01/24 04:22:19 bde Exp $ + * $Id: socksys.c,v 1.3 1995/05/30 06:06:11 rgrimes Exp $ */ #include diff --git a/lkm/syscons/Makefile b/lkm/syscons/Makefile index edd608e4907a5..2a5ddad6d632e 100644 --- a/lkm/syscons/Makefile +++ b/lkm/syscons/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/02/22 13:43:34 sos Exp $ SUBDIR= blank fade green snake star diff --git a/lkm/syscons/blank/Makefile b/lkm/syscons/blank/Makefile index b94f1cf0bc5f7..90372e266a0ba 100644 --- a/lkm/syscons/blank/Makefile +++ b/lkm/syscons/blank/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/02/22 13:45:29 sos Exp $ +# $Id: Makefile,v 1.2 1995/02/23 19:45:19 phk Exp $ BINDIR= /lkm KMOD= blank_saver_mod diff --git a/lkm/syscons/blank/blank_saver.c b/lkm/syscons/blank/blank_saver.c index e48e03796e4b5..4053cf3d449ee 100644 --- a/lkm/syscons/blank/blank_saver.c +++ b/lkm/syscons/blank/blank_saver.c @@ -25,7 +25,7 @@ * (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: blank_saver.c,v 1.1 1995/02/22 13:45:30 sos Exp $ + * $Id: blank_saver.c,v 1.2 1995/05/30 06:06:13 rgrimes Exp $ */ #include diff --git a/lkm/syscons/fade/Makefile b/lkm/syscons/fade/Makefile index 998900dfdd49b..eebf6ce8b542d 100644 --- a/lkm/syscons/fade/Makefile +++ b/lkm/syscons/fade/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/02/22 13:46:32 sos Exp $ +# $Id: Makefile,v 1.2 1995/02/23 19:45:26 phk Exp $ BINDIR= /lkm KMOD= fade_saver_mod diff --git a/lkm/syscons/fade/fade_saver.c b/lkm/syscons/fade/fade_saver.c index e639fcacbc07a..8c600ec129a1c 100644 --- a/lkm/syscons/fade/fade_saver.c +++ b/lkm/syscons/fade/fade_saver.c @@ -25,7 +25,7 @@ * (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: fade_saver.c,v 1.1 1995/02/22 13:46:32 sos Exp $ + * $Id: fade_saver.c,v 1.2 1995/05/30 06:06:15 rgrimes Exp $ */ #include diff --git a/lkm/syscons/green/Makefile b/lkm/syscons/green/Makefile index 0aeccb2b94180..74e1bb2d1dd9f 100644 --- a/lkm/syscons/green/Makefile +++ b/lkm/syscons/green/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/02/22 13:47:10 sos Exp $ +# $Id: Makefile,v 1.2 1995/02/23 19:45:28 phk Exp $ BINDIR= /lkm KMOD= green_saver_mod diff --git a/lkm/syscons/green/green_saver.c b/lkm/syscons/green/green_saver.c index 8dfe086ef4c9c..4ffc34d1b293c 100644 --- a/lkm/syscons/green/green_saver.c +++ b/lkm/syscons/green/green_saver.c @@ -25,7 +25,7 @@ * (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: green_saver.c,v 1.1 1995/02/22 13:47:14 sos Exp $ + * $Id: green_saver.c,v 1.2 1995/05/30 06:06:17 rgrimes Exp $ */ #include diff --git a/lkm/syscons/snake/Makefile b/lkm/syscons/snake/Makefile index 2d674e3e4e165..c1a58c9e80bb6 100644 --- a/lkm/syscons/snake/Makefile +++ b/lkm/syscons/snake/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/02/22 13:48:06 sos Exp $ +# $Id: Makefile,v 1.2 1995/02/23 19:45:29 phk Exp $ BINDIR= /lkm KMOD= snake_saver_mod diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c index b5cbc6dffc4e7..8958a17540552 100644 --- a/lkm/syscons/snake/snake_saver.c +++ b/lkm/syscons/snake/snake_saver.c @@ -25,7 +25,7 @@ * (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: snake_saver.c,v 1.4.4.3 1996/11/11 14:15:08 jkh Exp $ + * $Id: snake_saver.c,v 1.4.4.4 1997/02/11 09:21:24 jkh Exp $ */ #include diff --git a/lkm/syscons/star/Makefile b/lkm/syscons/star/Makefile index b22cfc6e9af6a..1507906b61bb3 100644 --- a/lkm/syscons/star/Makefile +++ b/lkm/syscons/star/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/02/22 13:47:35 sos Exp $ +# $Id: Makefile,v 1.2 1995/02/23 19:45:30 phk Exp $ BINDIR= /lkm KMOD= star_saver_mod diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c index d023228d11f44..048d36822202a 100644 --- a/lkm/syscons/star/star_saver.c +++ b/lkm/syscons/star/star_saver.c @@ -25,7 +25,7 @@ * (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: star_saver.c,v 1.2 1995/03/30 15:10:03 sos Exp $ + * $Id: star_saver.c,v 1.3 1995/05/30 06:06:20 rgrimes Exp $ */ #include diff --git a/lkm/umapfs/Makefile b/lkm/umapfs/Makefile index c8c26c8da2d00..bb93903dd5649 100644 --- a/lkm/umapfs/Makefile +++ b/lkm/umapfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:14 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/umapfs KMOD= umap_mod diff --git a/lkm/union/Makefile b/lkm/union/Makefile index 2a1cf7efd3dd3..6c0025954d738 100644 --- a/lkm/union/Makefile +++ b/lkm/union/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $ +# $Id: Makefile,v 1.1 1994/09/21 23:27:16 wollman Exp $ .PATH: ${.CURDIR}/../../sys/miscfs/union KMOD= union_mod diff --git a/release/Makefile b/release/Makefile index 49123cb17c342..046f2c095483d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -11,10 +11,10 @@ # that on a 14.4 line just yet... # # SET THIS !!! -BUILDNAME=2.1.7-RELEASE +BUILDNAME=2.1.6-RELEASE #CHROOTDIR=/junk/release # If this is a RELEASE, then set -RELEASETAG=RELENG_2_1_7_RELEASE +RELEASETAG=RELENG_2_1_0 # Things which without too much trouble can be considered variables diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf index 4b40cadd7eb45..292a69deaa180 100644 --- a/release/boot_crunch.conf +++ b/release/boot_crunch.conf @@ -1,4 +1,4 @@ -# $Id: boot_crunch.conf,v 1.20.2.8 1996/11/03 11:55:49 jkh Exp $ +# $Id: boot_crunch.conf,v 1.20.2.9 1997/02/07 04:25:11 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 diff --git a/release/fixit.profile b/release/fixit.profile index d096c9d65da65..8ae9c4545893e 100644 --- a/release/fixit.profile +++ b/release/fixit.profile @@ -1,5 +1,5 @@ : -# $Id: fixit.profile,v 1.1 1995/03/15 06:14:19 phk Exp $ +# $Id: fixit.profile,v 1.1.4.1 1996/11/10 13:13:51 jkh Exp $ export BLOCKSIZE=K export PS1="Fixit# " diff --git a/release/fixit.services b/release/fixit.services index a985c1f8dac6a..251d751d5ab5c 100644 --- a/release/fixit.services +++ b/release/fixit.services @@ -3,7 +3,7 @@ # # Stripped-down version. # -# $Id$ +# $Id: fixit.services,v 1.1 1996/11/09 16:25:32 joerg Exp $ # # WELL KNOWN PORT NUMBERS # diff --git a/release/fixit_crunch.conf b/release/fixit_crunch.conf index 5eb1647df1820..83bf1ab656b87 100644 --- a/release/fixit_crunch.conf +++ b/release/fixit_crunch.conf @@ -1,4 +1,4 @@ -# $Id: fixit_crunch.conf,v 1.3.4.11 1996/11/11 16:07:43 jkh Exp $ +# $Id: fixit_crunch.conf,v 1.3.4.12 1996/11/14 02:03:52 jkh Exp $ # first, we list the source dirs that our programs reside in. These are # searched in order listed to find the dir containing each program. diff --git a/release/floppies/Makefile b/release/floppies/Makefile index 2e4bb21dffb50..bf1bb82587601 100644 --- a/release/floppies/Makefile +++ b/release/floppies/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1996/05/29 01:35:18 jkh Exp $ +# $Id: Makefile,v 1.3 1996/08/22 09:45:27 julian Exp $ # SUBDIR= boot fixit PROG=write_mfs_in_kernel diff --git a/release/floppies/boot/Makefile b/release/floppies/boot/Makefile index 2dd894d898d96..4dfafd68f9003 100644 --- a/release/floppies/boot/Makefile +++ b/release/floppies/boot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $ +# $Id: Makefile,v 1.1 1996/05/21 01:12:32 julian Exp $ SUBDIR= crunch mfs floppy .include diff --git a/release/floppies/boot/crunch/crunch.conf b/release/floppies/boot/crunch/crunch.conf index 780efbe784063..33c1c8666e3ea 100644 --- a/release/floppies/boot/crunch/crunch.conf +++ b/release/floppies/boot/crunch/crunch.conf @@ -1,4 +1,4 @@ -# $Id: crunch.conf,v 1.1 1996/05/21 01:12:34 julian Exp $ +# $Id: crunch.conf,v 1.1.2.1 1996/11/03 05:47:02 jkh Exp $ srcdirs /usr/src/bin srcdirs /usr/src/release diff --git a/release/floppies/boot/floppy/Makefile b/release/floppies/boot/floppy/Makefile index eddf2689bd3c7..269a69879f8cb 100644 --- a/release/floppies/boot/floppy/Makefile +++ b/release/floppies/boot/floppy/Makefile @@ -1,5 +1,5 @@ -# $Id: Makefile,v 1.2 1996/06/24 04:23:34 jkh Exp $ +# $Id: Makefile,v 1.3 1996/08/22 09:45:38 julian Exp $ # If this is a RELEASE, then set # Things which without too much trouble can be considered variables diff --git a/release/floppies/boot/mfs/Makefile b/release/floppies/boot/mfs/Makefile index e7981b3bcb8e7..43ecc9c6d4a76 100644 --- a/release/floppies/boot/mfs/Makefile +++ b/release/floppies/boot/mfs/Makefile @@ -1,5 +1,5 @@ ### -# $Id: Makefile,v 1.1 1996/05/21 01:12:36 julian Exp $ +# $Id: Makefile,v 1.2 1996/08/22 09:45:43 julian Exp $ # # What are we if we weren't told.. CRUNCH?= mfs diff --git a/release/floppies/crunch_fs.mk b/release/floppies/crunch_fs.mk index 7471389f81f07..db42ae12d6794 100644 --- a/release/floppies/crunch_fs.mk +++ b/release/floppies/crunch_fs.mk @@ -1,5 +1,5 @@ ### -# $Id: crunch_fs.mk,v 1.1 1996/05/21 01:12:21 julian Exp $ +# $Id: crunch_fs.mk,v 1.2 1996/08/22 09:45:29 julian Exp $ # # This is included to make a floppy that includes a crunch file # diff --git a/release/floppies/fixit/Makefile b/release/floppies/fixit/Makefile index ee278f76ab4cb..28332a69ff87c 100644 --- a/release/floppies/fixit/Makefile +++ b/release/floppies/fixit/Makefile @@ -1,5 +1,5 @@ ### -# $Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $ +# $Id: Makefile,v 1.1 1996/05/21 01:12:39 julian Exp $ # SUBDIR= crunch image diff --git a/release/floppies/fixit/crunch/crunch.conf b/release/floppies/fixit/crunch/crunch.conf index f31652ea1e87a..4ce647631ef0e 100644 --- a/release/floppies/fixit/crunch/crunch.conf +++ b/release/floppies/fixit/crunch/crunch.conf @@ -1,4 +1,4 @@ -# $Id: fixit_crunch.conf,v 1.6 1996/01/03 23:41:03 joerg Exp $ +# $Id: crunch.conf,v 1.1 1996/05/21 01:12:40 julian Exp $ # first, we list the source dirs that our programs reside in. These are # searched in order listed to find the dir containing each program. diff --git a/release/floppies/fixit/image/Makefile b/release/floppies/fixit/image/Makefile index a8a80c4403be8..c18ece5a42950 100644 --- a/release/floppies/fixit/image/Makefile +++ b/release/floppies/fixit/image/Makefile @@ -1,5 +1,5 @@ ### -# $Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $ +# $Id: Makefile,v 1.1 1996/05/21 01:12:42 julian Exp $ # # What are we if we weren't told.. CRUNCH?= fixit diff --git a/release/floppies/fixit/verbatim/.profile b/release/floppies/fixit/verbatim/.profile index f5664e8d6eb8c..eede8f1a8f4ec 100644 --- a/release/floppies/fixit/verbatim/.profile +++ b/release/floppies/fixit/verbatim/.profile @@ -1,5 +1,5 @@ : -# $Id: fixit.profile,v 1.1 1995/03/15 06:14:19 phk Exp $ +# $Id: .profile,v 1.1 1996/05/21 01:12:43 julian Exp $ PATH=/stand BLOCKSIZE=K PS1="Fixit# " diff --git a/release/floppies/write_mfs_in_kernel.c b/release/floppies/write_mfs_in_kernel.c index 886bdd234dd8b..e2eeed0014a94 100644 --- a/release/floppies/write_mfs_in_kernel.c +++ b/release/floppies/write_mfs_in_kernel.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: write_mfs_in_kernel.c,v 1.1 1995/04/25 03:45:18 phk Exp $ + * $Id: write_mfs_in_kernel.c,v 1.1 1996/05/21 01:12:23 julian Exp $ * * This program patches a filesystem into a kernel made with MFS_ROOT * option. diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c index 699e1f6a5a0e0..dbda60ab346ea 100644 --- a/release/sysinstall/anonFTP.c +++ b/release/sysinstall/anonFTP.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: anonFTP.c,v 1.21 1997/02/07 04:25:16 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/apache.c b/release/sysinstall/apache.c index 10a03b9a3f3d0..d824295bdb2c2 100644 --- a/release/sysinstall/apache.c +++ b/release/sysinstall/apache.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: apache.c,v 1.33 1997/02/07 04:25:20 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c index e876b4b49711a..f01553e7f93b1 100644 --- a/release/sysinstall/attr.c +++ b/release/sysinstall/attr.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: attr.c,v 1.3.2.17 1997/02/07 04:25:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 8ecd461a747c4..5a646ee87df14 100644 --- a/release/sysinstall/cdrom.c +++ b/release/sysinstall/cdrom.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: cdrom.c,v 1.7.2.30 1997/02/07 04:25:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c index b14f913d706bc..6b20c24bceefb 100644 --- a/release/sysinstall/command.c +++ b/release/sysinstall/command.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: command.c,v 1.11.4.14 1997/02/07 04:25:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 002ab0ee677eb..8a5ca3777e617 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.16.2.72 1997/02/16 23:36:12 jkh Exp $ + * $Id: config.c,v 1.16.2.73 1997/02/17 13:42:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dev2c.sh b/release/sysinstall/dev2c.sh index cbd2e711fda12..e92404f4b6efb 100644 --- a/release/sysinstall/dev2c.sh +++ b/release/sysinstall/dev2c.sh @@ -7,7 +7,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: dev2c.sh,v 1.1 1994/10/26 02:53:08 phk Exp $ +# $Id: dev2c.sh,v 1.1.1.1 1995/04/27 12:50:35 jkh Exp $ # # During installation, we suffer badly of we have to run MAKEDEV. MAKEDEV # need sh, ln, chown, mknod, awk, rm, test and probably emacs too when diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index a1dbb4973fd6a..f01102d1dcedc 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.36.2.23 1997/02/07 04:25:35 jkh Exp $ + * $Id: devices.c,v 1.36.2.24 1997/02/07 19:05:20 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 9e8ecd09624aa..7eed05675030f 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: disks.c,v 1.31.2.53 1997/02/07 04:25:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c index 034a7f53b7143..c9515398a33c8 100644 --- a/release/sysinstall/dispatch.c +++ b/release/sysinstall/dispatch.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: dispatch.c,v 1.1.2.8 1997/02/07 04:25:41 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 1bf6d25ef315e..c33f32f58b799 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: dist.c,v 1.36.2.44 1997/02/07 04:25:45 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index cafcaa04352f2..fa3a8386e95e7 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id$ + * $Id: dmenu.c,v 1.12.2.19 1997/02/07 04:25:51 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c index 9d82f262863a9..8942937e53316 100644 --- a/release/sysinstall/doc.c +++ b/release/sysinstall/doc.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: doc.c,v 1.22 1997/02/07 04:25:53 jkh Exp $ + * $Id: doc.c,v 1.23 1997/02/15 13:18:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c index ccdb204efe3cc..2d9699b5cad75 100644 --- a/release/sysinstall/dos.c +++ b/release/sysinstall/dos.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: dos.c,v 1.6.2.19 1997/02/07 04:25:55 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index be8fb54ce55ef..67accfa85104f 100644 --- a/release/sysinstall/floppy.c +++ b/release/sysinstall/floppy.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: floppy.c,v 1.7.2.19 1997/02/07 04:25:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c index 284f48842c2ec..dd588886c1ce1 100644 --- a/release/sysinstall/ftp.c +++ b/release/sysinstall/ftp.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: ftp.c,v 1.14.2.12 1997/02/18 01:36:36 jkh Exp $ + * $Id: ftp.c,v 1.14.2.13 1997/02/18 16:20:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c index 2ab678a4732bf..43e2af04d442f 100644 --- a/release/sysinstall/ftp_strat.c +++ b/release/sysinstall/ftp_strat.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: ftp_strat.c,v 1.29 1996/10/12 23:48:31 jkh Exp $ + * $Id: ftp_strat.c,v 1.7.2.53 1996/11/07 09:17:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c index f96ad5a24929d..9a00ec1912dcd 100644 --- a/release/sysinstall/globals.c +++ b/release/sysinstall/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: globals.c,v 1.10.2.10 1997/02/07 04:26:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp index b5b7651ab26c4..d5c0412babafb 100644 --- a/release/sysinstall/help/hardware.hlp +++ b/release/sysinstall/help/hardware.hlp @@ -1,4 +1,4 @@ -Hardware Documentation Guide: $Id: hardware.hlp,v 1.10 1996/11/13 12:35:12 jkh Exp $ +Hardware Documentation Guide: $Id: hardware.hlp,v 1.1.2.17 1996/11/14 16:24:23 jkh Exp $ Contents last changed: July 4th, 1996 diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp index 07555a4ec9ad4..0f506650a289e 100644 --- a/release/sysinstall/help/relnotes.hlp +++ b/release/sysinstall/help/relnotes.hlp @@ -537,5 +537,5 @@ We sincerely hope you enjoy this release of FreeBSD! The FreeBSD Core Team -$Id: relnotes.hlp,v 1.1.2.31 1997/02/08 17:46:04 jkh Exp $ +$Id: relnotes.hlp,v 1.1.2.32 1997/02/17 08:32:05 jkh Exp $ LocalWords: Adaptec diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index 51bbfc1535edc..86ea9dc07b9ca 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: index.c,v 1.45 1997/02/07 04:26:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index d86f6cd60ef45..47a084eef1577 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.71.2.117 1997/02/16 23:36:13 jkh Exp $ + * $Id: install.c,v 1.71.2.118 1997/02/17 13:30:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index c7cc42ca974f3..b78e40804ad31 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: installUpgrade.c,v 1.44 1997/02/07 04:26:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/keymap.c b/release/sysinstall/keymap.c index 459f4cbe28609..d987ad3ad74f4 100644 --- a/release/sysinstall/keymap.c +++ b/release/sysinstall/keymap.c @@ -21,7 +21,7 @@ * (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$ + * $Id: keymap.c,v 1.1.4.1 1997/02/07 04:26:18 jkh Exp $ * */ diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index 0854ab81c8b81..b15936ad3d621 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: label.c,v 1.32.2.44 1997/02/07 04:26:19 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c index 8004acae264c4..1ae6ce3b496de 100644 --- a/release/sysinstall/lang.c +++ b/release/sysinstall/lang.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: lang.c,v 1.7.2.9 1997/02/07 04:26:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index 3853bfcd33367..2354071f1c188 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.13.2.26 1997/02/14 21:29:23 jkh Exp $ + * $Id: main.c,v 1.13.2.27 1997/02/15 15:41:09 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 6ed7c539c4548..f283c2e8a084d 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: media.c,v 1.25.2.46 1997/02/14 21:29:23 jkh Exp $ + * $Id: media.c,v 1.25.2.47 1997/02/17 13:30:19 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index aed91ae9b6452..0934c151a6d13 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.42.2.71 1997/02/13 00:32:56 jkh Exp $ + * $Id: menus.c,v 1.42.2.72 1997/02/18 04:38:48 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c index 4c298728d632a..3ea0168ed4c0a 100644 --- a/release/sysinstall/misc.c +++ b/release/sysinstall/misc.c @@ -320,7 +320,7 @@ Mount(char *mountp, void *dev) return DITEM_SUCCESS; if (*((char *)dev) != '/') { - sprintf(device, "%s/dev/%s", RunningAsInit ? "/mnt" : "", (char *)dev); + sprintf(device, "%s/dev/%s", (char *)dev, RunningAsInit ? "/mnt" : ""); sprintf(mountpoint, "%s%s", RunningAsInit ? "/mnt" : "", mountp); } else { diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 76707c698c6bc..a01d2096fcb92 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: msg.c,v 1.29.2.20 1997/02/07 04:26:40 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c index bb60e28ea5498..5323678570708 100644 --- a/release/sysinstall/network.c +++ b/release/sysinstall/network.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: network.c,v 1.7.2.28 1997/02/07 04:26:42 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c index 8ab752106177b..c15d7cf442eb4 100644 --- a/release/sysinstall/nfs.c +++ b/release/sysinstall/nfs.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: nfs.c,v 1.5.2.25 1997/02/07 04:26:44 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index d418110b966ff..c72ff8f7c6046 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id$ + * $Id: options.c,v 1.53 1997/02/07 04:26:46 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 8387f638c4a8a..916c14941b564 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: package.c,v 1.57 1997/02/14 21:59:26 jkh Exp $ + * $Id: package.c,v 1.58 1997/02/14 23:00:01 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/samba.c b/release/sysinstall/samba.c index 3b7fd245689b4..d37ffa842a124 100644 --- a/release/sysinstall/samba.c +++ b/release/sysinstall/samba.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: samba.c,v 1.3.2.8 1997/02/07 04:26:49 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard & Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index 98529c337c4c8..6611594916a0d 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.42.2.77 1997/02/17 13:30:21 jkh Exp $ + * $Id: sysinstall.h,v 1.42.2.78 1997/02/18 01:39:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index 8904af9f7cc0a..6fe827b1393ff 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.44.2.29 1997/02/07 04:26:54 jkh Exp $ + * $Id: system.c,v 1.44.2.30 1997/02/14 21:29:25 jkh Exp $ * * Jordan Hubbard * diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c index df3989288f8af..286aca45eb23f 100644 --- a/release/sysinstall/tape.c +++ b/release/sysinstall/tape.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: tape.c,v 1.6.2.21 1997/02/07 04:26:55 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index bab9581c964c5..a86ed232695c0 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.30.2.33 1997/02/17 13:30:23 jkh Exp $ + * $Id: tcpip.c,v 1.30.2.34 1997/02/17 22:08:56 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. diff --git a/release/sysinstall/uc_eisa.c b/release/sysinstall/uc_eisa.c index 094a77d928b89..e79a28a62acb4 100644 --- a/release/sysinstall/uc_eisa.c +++ b/release/sysinstall/uc_eisa.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_eisa.c,v 1.2.2.1 1997/02/07 04:27:02 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_isa.c b/release/sysinstall/uc_isa.c index c8c7525a396b2..3cc8a8d1a91d4 100644 --- a/release/sysinstall/uc_isa.c +++ b/release/sysinstall/uc_isa.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_isa.c,v 1.2.2.1 1997/02/07 04:27:04 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_kmem.c b/release/sysinstall/uc_kmem.c index e0df87209a694..fbcb7f20952eb 100644 --- a/release/sysinstall/uc_kmem.c +++ b/release/sysinstall/uc_kmem.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_kmem.c,v 1.1.2.1 1997/02/07 04:27:09 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_list.c b/release/sysinstall/uc_list.c index 6506c5eb6b1e2..ff02817de2703 100644 --- a/release/sysinstall/uc_list.c +++ b/release/sysinstall/uc_list.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_list.c,v 1.1.2.1 1997/02/07 04:27:12 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_main.c b/release/sysinstall/uc_main.c index ac1c6aac89ba8..bc8b0207aeb2c 100644 --- a/release/sysinstall/uc_main.c +++ b/release/sysinstall/uc_main.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * library functions for userconfig library * - * $Id: uc_main.c,v 1.13.2.1 1997/02/07 04:27:13 jkh Exp $ + * $Id: uc_main.c,v 1.13.2.2 1997/02/08 02:02:22 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_main.h b/release/sysinstall/uc_main.h index e1cd1053bdc3c..05f85add627bd 100644 --- a/release/sysinstall/uc_main.h +++ b/release/sysinstall/uc_main.h @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_main.h,v 1.2.2.1 1997/02/07 04:27:15 jkh Exp $ */ #define ISA_BIOTAB 0 diff --git a/release/sysinstall/uc_pci.c b/release/sysinstall/uc_pci.c index 0b213123b4826..19acd31198134 100644 --- a/release/sysinstall/uc_pci.c +++ b/release/sysinstall/uc_pci.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_pci.c,v 1.2.2.1 1997/02/07 04:27:16 jkh Exp $ */ #include diff --git a/release/sysinstall/uc_scsi.c b/release/sysinstall/uc_scsi.c index 326fb1db79f04..650b4114a7b3c 100644 --- a/release/sysinstall/uc_scsi.c +++ b/release/sysinstall/uc_scsi.c @@ -23,7 +23,7 @@ * (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$ + * $Id: uc_scsi.c,v 1.3.2.1 1997/02/07 04:27:18 jkh Exp $ */ #include diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c index 1f321d20267e7..180639b4ac117 100644 --- a/release/sysinstall/ufs.c +++ b/release/sysinstall/ufs.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id$ + * $Id: ufs.c,v 1.5.2.13 1997/02/07 04:27:20 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/user.c b/release/sysinstall/user.c index a44f9f7ffb2ae..443f61d97ebf0 100644 --- a/release/sysinstall/user.c +++ b/release/sysinstall/user.c @@ -1,5 +1,5 @@ /* - * $Id: user.c,v 1.6.2.1 1997/02/14 21:29:27 jkh Exp $ + * $Id: user.c,v 1.6.2.2 1997/02/18 01:51:09 jkh Exp $ * * Copyright (c) 1996 * Jörg Wunsch. All rights reserved. diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c index 7a3e80a60cf4a..e29ce46d8eca4 100644 --- a/release/sysinstall/variable.c +++ b/release/sysinstall/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: variable.c,v 1.6.2.17 1997/02/07 04:27:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/version.h b/release/sysinstall/version.h index b42c26e8937df..3c0288d4a684e 100644 --- a/release/sysinstall/version.h +++ b/release/sysinstall/version.h @@ -1 +1 @@ -#define RELEASE_NAME "__RELEASE" +#define RELEASE_NAME "2.1.7-RELEASE" diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c index 59831ea92fc55..6e608b9b53aa3 100644 --- a/release/sysinstall/wizard.c +++ b/release/sysinstall/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: wizard.c,v 1.6.2.10 1997/02/07 04:27:24 jkh Exp $ * */ diff --git a/release/write_mfs_in_kernel.c b/release/write_mfs_in_kernel.c index 358c7d943c330..886bdd234dd8b 100644 --- a/release/write_mfs_in_kernel.c +++ b/release/write_mfs_in_kernel.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: write_mfs_in_kernel.c,v 1.1 1995/04/25 03:45:18 phk Exp $ * * This program patches a filesystem into a kernel made with MFS_ROOT * option. diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index 2de876e793bcb..63baa4d2cef4c 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -1,4 +1,4 @@ -/* $Id: ccdconfig.c,v 1.3 1995/12/28 00:22:16 asami Exp $ */ +/* $Id: ccdconfig.c,v 1.4 1996/01/30 22:25:24 asami Exp $ */ /* $NetBSD: ccdconfig.c,v 1.2.2.1 1995/11/11 02:43:35 thorpej Exp $ */ diff --git a/sbin/dset/dset.8 b/sbin/dset/dset.8 index 3fd07785569d8..f471eecdb4eaa 100644 --- a/sbin/dset/dset.8 +++ b/sbin/dset/dset.8 @@ -23,7 +23,7 @@ .\" (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$ +.\" $Id: dset.8,v 1.1 1996/05/02 21:47:45 joerg Exp $ .\" " .Dd May 2, 1996 .Dt DSET 8 diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile index da6f365066792..32359f8ac2c8b 100644 --- a/sbin/dumpon/Makefile +++ b/sbin/dumpon/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/05/12 19:10:08 wollman Exp $ PROG= dumpon MAN8= dumpon.8 diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index 7a1593be22d0e..9e6988e1bc9cd 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $Id$ +.\" $Id: dumpon.8,v 1.1 1995/05/12 19:10:08 wollman Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index dc185e9be6ae2..96c9e8ae0a63e 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93";*/ static const char rcsid[] = - "$Id: dumpon.c,v 1.1 1995/05/12 19:10:09 wollman Exp $"; + "$Id: dumpon.c,v 1.2 1995/05/30 06:08:58 rgrimes Exp $"; #endif /* not lint */ #include diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile index 7d5c9ce1a2401..089a8b5d9a525 100644 --- a/sbin/i386/Makefile +++ b/sbin/i386/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/12/02 23:22:59 wollman Exp $ +# $Id: Makefile,v 1.2 1994/12/02 23:53:23 wollman Exp $ SUBDIR= comcontrol fdisk ft mount_msdos #NOTYET: cxconfig diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc index c961f85683079..2eb7be47d2de5 100644 --- a/sbin/i386/Makefile.inc +++ b/sbin/i386/Makefile.inc @@ -1,3 +1,3 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1994/12/02 23:53:23 wollman Exp $ .include "${.CURDIR}/../../Makefile.inc" diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile index ac0878e9bc056..0ef9c19a57a99 100644 --- a/sbin/i386/ft/Makefile +++ b/sbin/i386/ft/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/09/17 06:57:43 davidg Exp $ +# $Id: Makefile,v 1.3.4.1 1995/09/17 06:59:04 davidg Exp $ PROG= ft MAN8= ft.8 diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile index 19ec0ac78ebdd..c0dcb6151eaa9 100644 --- a/sbin/i386/mount_msdos/Makefile +++ b/sbin/i386/mount_msdos/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1994/09/19 15:30:33 dfr Exp $ +# $Id: Makefile,v 1.2 1994/12/04 08:01:24 bde Exp $ # PROG= mount_msdos diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8 index 63293d8c792e3..982e0d5f3fccc 100644 --- a/sbin/i386/mount_msdos/mount_msdos.8 +++ b/sbin/i386/mount_msdos/mount_msdos.8 @@ -27,7 +27,7 @@ .\" (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: mount_msdos.8,v 1.1 1994/09/19 15:30:34 dfr Exp $ +.\" $Id: mount_msdos.8,v 1.2 1994/11/19 17:55:35 nate Exp $ .\" .Dd April 7, 1994 .Dt MOUNT_MSDOS 8 diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c index db652ae3c0fc2..9c6d738f3a5e0 100644 --- a/sbin/i386/mount_msdos/mount_msdos.c +++ b/sbin/i386/mount_msdos/mount_msdos.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: mount_msdos.c,v 1.2 1994/09/22 22:16:35 wollman Exp $"; +static char rcsid[] = "$Id: mount_msdos.c,v 1.3 1994/11/01 23:51:42 wollman Exp $"; #endif /* not lint */ #include diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 8a0fd04549a47..ee1b51c859123 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.8 1996/09/05 17:14:50 bde Exp $ +# $Id: Makefile,v 1.3.6.1 1996/11/24 09:31:43 joerg Exp $ PROG= init MAN8= init.8 diff --git a/sbin/init/init.c b/sbin/init/init.c index 4937f394dc0bf..f06b2dccdf133 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1059,7 +1059,7 @@ start_window_system(sp) if (sp->se_type) { /* Don't use malloc after fork */ strcpy(term, "TERM="); - strncat(term, sp->se_type, sizeof(term) - 6); + strcat(term, sp->se_type); env[0] = term; env[1] = 0; } @@ -1121,7 +1121,7 @@ start_getty(sp) if (sp->se_type) { /* Don't use malloc after fork */ strcpy(term, "TERM="); - strncat(term, sp->se_type, sizeof(term) - 6); + strcat(term, sp->se_type); env[0] = term; env[1] = 0; } diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c index e8e024fb6e5db..f4ad978db7964 100644 --- a/sbin/ipfw/ipfw.c +++ b/sbin/ipfw/ipfw.c @@ -16,7 +16,7 @@ * * NEW command line interface for IP firewall facility * - * $Id: ipfw.c,v 1.15.4.7 1996/06/29 03:55:46 alex Exp $ + * $Id: ipfw.c,v 1.15.4.8 1996/07/07 04:11:15 alex Exp $ * */ diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 5cf91bf111109..f36dc54be241b 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -1,5 +1,5 @@ /* - * $Id: md5.c,v 1.6 1995/07/12 09:14:46 phk Exp $ + * $Id: md5.c,v 1.5.4.1 1995/09/06 14:19:17 davidg Exp $ * * Derived from: */ diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile index 265869fbaa6a5..05619d222c514 100644 --- a/sbin/modload/Makefile +++ b/sbin/modload/Makefile @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: Makefile,v 1.4 1994/02/09 15:00:32 deraadt Exp $ +# $Id: Makefile,v 1.1 1994/08/19 12:07:09 davidg Exp $ # PROG= modload diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8 index d2aaac6d9f873..d59627e1e87ed 100644 --- a/sbin/modload/modload.8 +++ b/sbin/modload/modload.8 @@ -23,7 +23,7 @@ .\" (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: modload.8,v 1.4 1994/09/18 04:12:12 davidg Exp $ +.\" $Id: modload.8,v 1.5 1994/09/22 22:35:50 wollman Exp $ .\" .Dd September 22, 1994 .Dt MODLOAD 8 diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c index 0efd0eab42ab7..c57896c388adf 100644 --- a/sbin/modload/modload.c +++ b/sbin/modload/modload.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: modload.c,v 1.7 1995/03/16 17:11:21 wollman Exp $ + * $Id: modload.c,v 1.8 1995/05/30 06:09:20 rgrimes Exp $ */ #include diff --git a/sbin/modload/pathnames.h b/sbin/modload/pathnames.h index 4359013dd9f39..13c34fab40281 100644 --- a/sbin/modload/pathnames.h +++ b/sbin/modload/pathnames.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: pathnames.h,v 1.2 1995/01/23 04:08:00 wollman Exp $ */ #include #define _PATH_LKM "/dev/lkm" diff --git a/sbin/modunload/Makefile b/sbin/modunload/Makefile index 3520c48d2f836..8bbbbde93ad7a 100644 --- a/sbin/modunload/Makefile +++ b/sbin/modunload/Makefile @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: Makefile,v 1.4 1994/02/09 15:00:35 deraadt Exp $ +# $Id: Makefile,v 1.1 1994/08/19 12:07:18 davidg Exp $ # PROG= modunload diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8 index e98de02f401e8..9fe5f5b803fbb 100644 --- a/sbin/modunload/modunload.8 +++ b/sbin/modunload/modunload.8 @@ -23,7 +23,7 @@ .\" (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: modunload.8,v 1.2 1994/08/19 13:29:23 davidg Exp $ +.\" $Id: modunload.8,v 1.3 1994/08/19 13:40:41 davidg Exp $ .\" .Dd June 7, 1993 .Dt MODUNLOAD 8 diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c index 88689ff19ba3e..c5f78a6171538 100644 --- a/sbin/modunload/modunload.c +++ b/sbin/modunload/modunload.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: modunload.c,v 1.6 1994/05/23 05:42:58 cgd Exp $ + * $Id: modunload.c,v 1.1 1994/08/19 12:07:21 davidg Exp $ */ #include diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile index 85eca128f4dbd..20bd316d4e2f9 100644 --- a/sbin/mount_portal/Makefile +++ b/sbin/mount_portal/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 3/27/94 -# $Id$ +# $Id: Makefile,v 1.4 1995/02/21 04:05:17 wollman Exp $ PROG= mount_portal SRCS= mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \ diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c index 33617988f7dfb..963947d484b9e 100644 --- a/sbin/mount_portal/activate.c +++ b/sbin/mount_portal/activate.c @@ -36,7 +36,7 @@ * * @(#)activate.c 8.2 (Berkeley) 3/27/94 * - * $Id: activate.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $ + * $Id: activate.c,v 1.1.1.1 1994/05/26 06:34:32 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c index 3eb4af3c748b3..4a79c74001348 100644 --- a/sbin/mount_portal/conf.c +++ b/sbin/mount_portal/conf.c @@ -36,7 +36,7 @@ * * @(#)conf.c 8.2 (Berkeley) 3/27/94 * - * $Id: conf.c,v 1.2 1995/02/21 04:05:20 wollman Exp $ + * $Id: conf.c,v 1.3 1995/05/30 06:09:25 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h index 25321145d9901..97bde75e7731f 100644 --- a/sbin/mount_portal/pathnames.h +++ b/sbin/mount_portal/pathnames.h @@ -36,7 +36,7 @@ * * @(#)pathnames.h 8.1 (Berkeley) 6/5/93 * - * $Id: pathnames.h,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $ + * $Id: pathnames.h,v 1.1.1.1 1994/05/26 06:34:32 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf index 5b5a773eaa3cf..51a88a014cfd2 100644 --- a/sbin/mount_portal/portal.conf +++ b/sbin/mount_portal/portal.conf @@ -1,5 +1,5 @@ # @(#)portal.conf 8.1 (Berkeley) 6/5/93 -# $Id: portal.conf,v 1.1 1992/05/27 06:50:13 jsp Exp jsp $ +# $Id: portal.conf,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $ tcplisten/ tcplisten tcplisten/ tcp/ tcp tcp/ fs/ file fs/ diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h index fbe111b1a7ad9..9bc75ac34925a 100644 --- a/sbin/mount_portal/portald.h +++ b/sbin/mount_portal/portald.h @@ -36,7 +36,7 @@ * * @(#)portald.h 8.1 (Berkeley) 6/5/93 * - * $Id: portald.h,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $ + * $Id: portald.h,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c index d1eba94ea3fe9..f84ddf4d08bb4 100644 --- a/sbin/mount_portal/pt_conf.c +++ b/sbin/mount_portal/pt_conf.c @@ -36,7 +36,7 @@ * * @(#)pt_conf.c 8.1 (Berkeley) 6/5/93 * - * $Id: pt_conf.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $ + * $Id: pt_conf.c,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c index 06e3382da85b4..6ae2b834ab3f5 100644 --- a/sbin/mount_portal/pt_exec.c +++ b/sbin/mount_portal/pt_exec.c @@ -36,7 +36,7 @@ * * @(#)pt_exec.c 8.1 (Berkeley) 6/5/93 * - * $Id: pt_exec.c,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $ + * $Id: pt_exec.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp $ */ #include diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c index a9cd2ca3ea20b..940e2b9d50e7a 100644 --- a/sbin/mount_portal/pt_file.c +++ b/sbin/mount_portal/pt_file.c @@ -36,7 +36,7 @@ * * @(#)pt_file.c 8.2 (Berkeley) 3/27/94 * - * $Id: pt_file.c,v 1.2 1994/09/19 13:52:38 ache Exp $ + * $Id: pt_file.c,v 1.3 1995/04/19 12:24:06 gpalmer Exp $ */ #include diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c index 11f1453cefb8e..7485265809b98 100644 --- a/sbin/mount_portal/pt_tcp.c +++ b/sbin/mount_portal/pt_tcp.c @@ -36,7 +36,7 @@ * * @(#)pt_tcp.c 8.3 (Berkeley) 3/27/94 * - * $Id: pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp $ + * $Id: pt_tcp.c,v 1.2 1995/04/19 12:24:08 gpalmer Exp $ */ #include diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile index f32e11b895eb0..1eac0032579ad 100644 --- a/sbin/mountd/Makefile +++ b/sbin/mountd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/25/94 -# $Id$ +# $Id: Makefile,v 1.4 1994/09/22 22:16:48 wollman Exp $ PROG= mountd CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8 index 011c5926eeae3..92654fe197a61 100644 --- a/sbin/mountd/mountd.8 +++ b/sbin/mountd/mountd.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)mountd.8 8.1 (Berkeley) 6/9/93 -.\" $Id: mountd.8,v 1.3 1995/02/22 21:42:48 ats Exp $ +.\" $Id: mountd.8,v 1.3.4.1 1996/01/11 00:12:44 joerg Exp $ .\" .Dd September 22, 1994 .Dt MOUNTD 8 diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index e8329f9180e79..ead2843b915cb 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -43,7 +43,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)mountd.c 8.8 (Berkeley) 2/20/94";*/ static const char rcsid[] = - "$Id: mountd.c,v 1.8.2.1 1996/01/03 14:14:49 peter Exp $"; + "$Id: mountd.c,v 1.8.2.2 1996/01/11 00:12:45 joerg Exp $"; #endif /*not lint*/ #include diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8 index e2ccc67130d82..92c19597a4e37 100644 --- a/sbin/nfsiod/nfsiod.8 +++ b/sbin/nfsiod/nfsiod.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)nfsiod.8 8.2 (Berkeley) 2/22/94 -.\" $Id$ +.\" $Id: nfsiod.8,v 1.2 1994/09/22 22:16:59 wollman Exp $ .\" .Dd September 22, 1994 .Dt NFSIOD 8 diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index 0919730248a65..ace412f9e68b4 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -36,7 +36,7 @@ .\" .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" -.\" $Id: boot_i386.8,v 1.2.6.1 1995/10/10 01:15:24 davidg Exp $ +.\" $Id: boot_i386.8,v 1.2.6.2 1996/01/30 14:01:10 mpp Exp $ .\" .Dd April 19, 1994 .Dt BOOT 8 i386 diff --git a/sbin/route/route.c b/sbin/route/route.c index 7acbc8c99cf36..a2ecae32afb70 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -43,7 +43,7 @@ static char copyright[] = static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94"; */ static const char rcsid[] = - "$Id: $"; + "$Id: route.c,v 1.2.6.1 1996/10/27 17:50:49 fenner Exp $"; #endif /* not lint */ #include diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8 index 76f30fb188cc7..7d8b95453a2ac 100644 --- a/sbin/savecore/savecore.8 +++ b/sbin/savecore/savecore.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $Id: savecore.8,v 1.4 1996/10/13 18:12:20 fenner Exp $ +.\" $Id: savecore.8,v 1.3.6.1 1996/10/13 21:03:44 joerg Exp $ .\" .Dd September 23, 1994 .Dt SAVECORE 8 diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8 index 5735e1badda86..98f379de37855 100644 --- a/sbin/scsi/scsi.8 +++ b/sbin/scsi/scsi.8 @@ -39,7 +39,7 @@ .\" SUCH DAMAGE. .\" .\" -.\" $Id: scsi.8,v 1.4 1995/05/01 12:35:04 dufault Exp $ +.\" $Id: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $ .\" .Dd October 11, 1993 .Dt SCSI 8 diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c index 229fd737a4c87..e871bb5ad5bbd 100644 --- a/sbin/scsi/scsi.c +++ b/sbin/scsi/scsi.c @@ -39,7 +39,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi.c,v 1.8.4.2 1995/07/30 18:26:20 davidg Exp $ + * $Id: scsi.c,v 1.8.4.3 1996/04/06 11:01:48 joerg Exp $ */ #include diff --git a/sbin/scsiformat/scsiformat.sh b/sbin/scsiformat/scsiformat.sh index 5c6dd88bf67c4..34868a3f7a32d 100644 --- a/sbin/scsiformat/scsiformat.sh +++ b/sbin/scsiformat/scsiformat.sh @@ -26,7 +26,7 @@ # (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$ +# $Id: scsiformat.sh,v 1.1 1995/09/17 12:47:01 joerg Exp $ # # scsiformat [-wq] [-p page-control] raw-device-name # diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile index b9937390a0a02..f8dd93eebd052 100644 --- a/sbin/slattach/Makefile +++ b/sbin/slattach/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 5.4 (Berkeley) 5/11/90 # -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/sbin/slattach/Makefile,v 1.4.6.1 1995/10/25 00:50:32 jkh Exp $ +# $Header: /home/ncvs/src/sbin/slattach/Makefile,v 1.4.6.2 1996/06/05 02:53:25 jkh Exp $ PROG= slattach SRCS= slattach.c uucplock.c diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8 index df9f443a28285..37aa453bd8552 100644 --- a/sbin/slattach/slattach.8 +++ b/sbin/slattach/slattach.8 @@ -31,7 +31,7 @@ .\" .\" @(#)slattach.8 6.4 (Berkeley) 3/16/91 .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/sbin/slattach/slattach.8,v 1.4.4.4 1996/01/30 14:03:07 mpp Exp $ +.\" $Header: /home/ncvs/src/sbin/slattach/slattach.8,v 1.4.4.5 1996/06/05 02:53:26 jkh Exp $ .\" .Dd April 4, 1993 .Dt SLATTACH 8 diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index 3f4ad05660cc7..cc7b69b968da6 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: startslip.c,v 1.18 1995/09/27 17:15:37 ache Exp $ + * $Id: startslip.c,v 1.3.4.1 1995/10/23 19:40:47 jkh Exp $ */ #ifndef lint diff --git a/secure/Makefile b/secure/Makefile deleted file mode 100644 index e91781f463c48..0000000000000 --- a/secure/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ - -# lib must be first, or it will not work. This is because we reference -# the lib's in the directory where they are built from the binaries we -# want to build. - -SUBDIR= lib usr.bin - -SDIR= ${.CURDIR}/.. - -CODAI= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all install - -CODAD= ${MAKE} ${MFLAGS} MAKE_EBONES=yes cleandir; \ - ${MAKE} ${MFLAGS} MAKE_EBONES=yes obj; \ - ${MAKE} ${MFLAGS} MAKE_EBONES=yes depend all distribute - -# These are the programs which depend on secure libs -sprog: - cd ${SDIR}/bin/ed; ${CODAI} - cd ${SDIR}/sbin/init; ${CODAI} - -bootstrap: - ( cd include; ${MAKE} ${MFLAGS} install ) - ( cd lib; ${MAKE} ${MFLAGS} depend all install ) - ${MAKE} ${MFLAGS} cleandir - ${MAKE} ${MFLAGS} obj - ${MAKE} ${MFLAGS} depend all install sprog - -help-distribute: distribute - cd ${SDIR}/bin/ed; ${CODAD} - cd ${SDIR}/sbin/init; ${CODAD} - -.include diff --git a/secure/Makefile.inc b/secure/Makefile.inc deleted file mode 100644 index f6491d43743a8..0000000000000 --- a/secure/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -# $Id$ - -DISTRIBUTION=des - -.if exists(${.CURDIR}/../../lib/libtelnet/obj) -TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet/obj -.else -TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet -.endif - -.if exists(${.CURDIR}/../../lib/libcrypt/obj) -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj -.else -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt -.endif diff --git a/secure/lib/Makefile b/secure/lib/Makefile deleted file mode 100644 index 2b47738ed2fdc..0000000000000 --- a/secure/lib/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $Id$ - -SUBDIR= libcipher libdes - -.include - diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc deleted file mode 100644 index 019e99afab658..0000000000000 --- a/secure/lib/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -# $Id: Makefile.inc,v 1.3 1994/11/14 20:45:28 phk Exp $ - -.include "${.CURDIR}/../../Makefile.inc" -.if exists(${.CURDIR}/../../../lib/Makefile.inc) -.include "${.CURDIR}/../../../lib/Makefile.inc" -.endif diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile deleted file mode 100644 index 07429dc36e222..0000000000000 --- a/secure/lib/libcipher/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# $Id: Makefile,v 1.7 1996/04/13 08:03:19 markm Exp $ -# - -LIB= cipher -SRCS= crypt.c -PRECIOUSLIB= yes -#NOPROFILE= yes - -MAN3= cipher.3 -MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3 -MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3 - -#SUBDIR= test - -.include diff --git a/secure/lib/libcipher/README b/secure/lib/libcipher/README deleted file mode 100644 index 53ea2299fbfd3..0000000000000 --- a/secure/lib/libcipher/README +++ /dev/null @@ -1,98 +0,0 @@ - - FreeSec - NetBSD libcrypt replacement - - David Burren - Release 1.0, March 1994 - - Document ref: $Id: README,v 1.1 1994/09/07 08:55:24 g89r4222 Exp $ - - -Description -=========== -This library is a drop-in replacement for the libcrypt used in U.S. copies -of NetBSD, duplicating that library's functionality. A suite of verification -and benchmark tools is provided. - -FreeSec 1.0 is an original implementation of the DES algorithm and the -crypt(3) interfaces used in Unix-style operating systems. It was produced -in Australia and as such is not covered by U.S. export restrictions (at -least for copies that remain outside the U.S.). - - -History -======= -An earlier version of the FreeSec library was built using the UFC-crypt -package that is distributed as part of the GNU library. UFC-crypt did not -support the des_cipher() or des_setkey() functions, nor the new-style -crypt with long keys. These were implemented in FreeSec 0.2, but at least -one bug remained, where encryption would only succeed if either the salt -or the plaintext was zero. Because of its heritage FreeSec 0.2 was covered -by the GNU Library Licence. - -FreeSec 1.0 is an original implementation by myself, and has been tested -against the verification suite I'd been using with FreeSec 0.2 (this is not -encumbered by any licence). FreeSec 1.0 is covered by a Berkeley-style -licence, which better fits into the *BSD hierarchy than the earlier GNU -licence. - - -Why should you use FreeSec? -=========================== -FreeSec is intended as a replacement for the U.S.-only NetBSD libcrypt, -to act as a baseline for encryption functionality. - -Some other packages (such as Eric Young's libdes package) are faster and -more complete than FreeSec, but typically have different licencing -arrangements. While some applications will justify the use of these -packages, the idea here is that everyone should have access to *at least* -the functionality of FreeSec. - - -Performance of FreeSec 1.0 -========================== -I compare below the performance of three libcrypt implementations. As can be -seen, it's between the U.S. library and UFC-crypt. While the performance of -FreeSec 1.0 is good enough to keep me happy for now, I hope to improve it in -future versions. I was interested to note that while UFC-crypt is faster on -a 386, hardware characteristics can have markedly different effects on each -implementation. - - -386DX40, 128k cache | U.S. BSD | FreeSec 1.0 | FreeSec 0.2 -CFLAGS=-O2 | | | -========================+===============+===============+================== -crypt (alternate keys) | 317 | 341 | 395 - crypt/sec | | | -------------------------+---------------+---------------+------------------ -crypt (constant key) | 317 | 368 | 436 - crypt/sec | | | -------------------------+---------------+---------------+------------------ -des_cipher( , , , 1) | 6037 | 7459 | 3343 - blocks/sec | | | -------------------------+---------------+---------------+------------------ -des_cipher( , , , 25) | 8871 | 9627 | 15926 - blocks/sec | | | - -Notes: The results tabled here are the average over 10 runs. - The entry/exit code for FreeSec 0.2's des_cipher() is particularly - inefficient, thus the anomalous result for single encryptions. - - -As an experiment using a machine with a larger register set and an -obscenely fast CPU, I obtained the following results: - - 60 MHz R4400 | FreeSec 1.0 | FreeSec 0.2 - ========================+================================= - crypt (alternate keys) | 2545 | 2702 - crypt/sec | | - ------------------------+--------------------------------- - crypt (constant key) | 2852 | 2981 - crypt/sec | | - ------------------------+--------------------------------- - des_cipher( , , , 1) | 56443 | 21409 - blocks/sec | | - ------------------------+--------------------------------- - des_cipher( , , , 25) | 82531 | 18276 - blocks/sec | | - -Obviously your mileage will vary with your hardware and your compiler... diff --git a/secure/lib/libcipher/README.FreeBSD b/secure/lib/libcipher/README.FreeBSD deleted file mode 100644 index 06b943fa19503..0000000000000 --- a/secure/lib/libcipher/README.FreeBSD +++ /dev/null @@ -1,6 +0,0 @@ -$Id: README.FreeBSD,v 1.1 1994/09/07 08:55:25 g89r4222 Exp $ - -This is FreeSec package for NetBSD, unchanged for -FreeBSD, except for the Makefile. - -The other stuff in libcrypt will be added in stages! diff --git a/secure/lib/libcipher/cipher.3 b/secure/lib/libcipher/cipher.3 deleted file mode 100644 index 162e89fcd3464..0000000000000 --- a/secure/lib/libcipher/cipher.3 +++ /dev/null @@ -1,150 +0,0 @@ -.\" FreeSec: libcrypt for NetBSD -.\" -.\" Copyright (c) 1994 David Burren -.\" All rights reserved. -.\" -.\" 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. -.\" 4. Neither the name of the author nor the names of other contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -.\" -.\" $Id: crypt.3,v 1.5 1995/07/25 14:03:49 mark Exp $ -.\" -.\" Manual page, using -mandoc macros -.\" -.Dd March 9, 1994 -.Dt CIPHER 3 -.Os "FreeSec 1.0" -.Sh NAME -.Nm setkey , -.Nm encrypt , -.Nm des_setkey , -.Nm des_cipher , -.Nd DES encryption -.Sh SYNOPSIS -.Ft int -.Fn setkey "char *key" -.Ft int -.Fn encrypt "char *block" "int flag" -.Ft int -.Fn des_setkey "const char *key" -.Ft int -.Fn des_cipher "const char *in" "char *out" "long salt" "int count" -.Sh DESCRIPTION -The functions, -.Fn encrypt , -.Fn setkey , -.Fn des_setkey -and -.Fn des_cipher -provide access to the -.Tn DES -algorithm. -.Fn setkey -is passed a 64-byte array of binary values (numeric 0 or 1). -A 56-bit key is extracted from this array by dividing the -array into groups of 8, and ignoring the last bit in each group. -That bit is reserved for a byte parity check by DES, but is ignored -by these functions. -.Pp -The -.Fa block -argument to -.Fn encrypt -is also a 64-byte array of binary values. -If the value of -.Fa flag -is 0, -.Fa block -is encrypted otherwise it is decrypted. -The result is returned in the original array -.Fa block -after using the key specified by -.Fn setkey -to process it. -.Pp -The argument to -.Fn des_setkey -is a character array of length 8. -The least significant bit (the parity bit) in each character is ignored, -and the remaining bits are concatenated to form a 56-bit key. -The function -.Fn des_cipher -encrypts (or decrypts if -.Fa count -is negative) the 64-bits stored in the 8 characters at -.Fa in -using -.Xr abs 3 -of -.Fa count -iterations of -.Tn DES -and stores the 64-bit result in the 8 characters at -.Fa out -(which may be the same as -.Fa in -). -The -.Fa salt -introduces disorder in the -.Tn DES -algorithm in one of 16777216 or 4096 possible ways -(ie. with 24 or 12 bits: if bit -.Em i -of the -.Ar salt -is set, then bits -.Em i -and -.Em i+24 -are swapped in the -.Tn DES -E-box output). -.Pp -The functions -.Fn setkey , -.Fn encrypt , -.Fn des_setkey , -and -.Fn des_cipher -return 0 on success and 1 on failure. -.Pp -The -.Fn setkey -and -.Fn des_setkey -functions manipulate the same key space. -.Sh SEE ALSO -.Xr login 1 , -.Xr passwd 1 , -.Xr getpass 3 , -.Xr crypt 3 , -.Xr passwd 5 -.Sh HISTORY -This library (FreeSec 1.0) was developed outside the United States of America -as an unencumbered replacement for the U.S.-only NetBSD libcrypt encryption -library. -Users should be aware that this code (and programs staticly linked with it) -may not be exported from the U.S., although it apparently can be imported. -.Sh AUTHOR -David Burren diff --git a/secure/lib/libcipher/crypt.c b/secure/lib/libcipher/crypt.c deleted file mode 100644 index cbdefde6bf961..0000000000000 --- a/secure/lib/libcipher/crypt.c +++ /dev/null @@ -1,623 +0,0 @@ -/* - * FreeSec: libcrypt for NetBSD - * - * Copyright (c) 1994 David Burren - * All rights reserved. - * - * 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. - * 4. Neither the name of the author nor the names of other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * - * $Id: crypt.c,v 1.2 1994/09/07 21:48:46 csgr Exp $ - * - * This is an original implementation of the DES and the crypt(3) interfaces - * by David Burren . - * - * An excellent reference on the underlying algorithm (and related - * algorithms) is: - * - * B. Schneier, Applied Cryptography: protocols, algorithms, - * and source code in C, John Wiley & Sons, 1994. - * - * Note that in that book's description of DES the lookups for the initial, - * pbox, and final permutations are inverted (this has been brought to the - * attention of the author). A list of errata for this book has been - * posted to the sci.crypt newsgroup by the author and is available for FTP. - * - * ARCHITECTURE ASSUMPTIONS: - * This code assumes that u_longs are 32 bits. It will probably not - * operate on 64-bit machines without modifications. - * It is assumed that the 8-byte arrays passed by reference can be - * addressed as arrays of u_longs (ie. the CPU is not picky about - * alignment). - */ -#include -#include -#include - -#ifdef DEBUG -# include -#endif - - -static u_char IP[64] = { - 58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4, - 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8, - 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3, - 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7 -}; - -static u_char inv_key_perm[64]; -static u_char u_key_perm[56]; -static u_char key_perm[56] = { - 57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18, - 10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36, - 63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22, - 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4 -}; - -static u_char key_shifts[16] = { - 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 -}; - -static u_char inv_comp_perm[56]; -static u_char comp_perm[48] = { - 14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10, - 23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2, - 41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48, - 44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32 -}; - -/* - * No E box is used, as it's replaced by some ANDs, shifts, and ORs. - */ - -static u_char u_sbox[8][64]; -static u_char sbox[8][64] = { - { - 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, - 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, - 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, - 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 - }, - { - 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, - 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, - 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, - 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 - }, - { - 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, - 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, - 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 - }, - { - 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, - 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, - 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, - 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 - }, - { - 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, - 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, - 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, - 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 - }, - { - 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, - 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, - 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, - 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 - }, - { - 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, - 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, - 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, - 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 - }, - { - 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, - 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, - 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, - 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 - } -}; - -static u_char un_pbox[32]; -static u_char pbox[32] = { - 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10, - 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 -}; - -static u_long bits32[32] = -{ - 0x80000000, 0x40000000, 0x20000000, 0x10000000, - 0x08000000, 0x04000000, 0x02000000, 0x01000000, - 0x00800000, 0x00400000, 0x00200000, 0x00100000, - 0x00080000, 0x00040000, 0x00020000, 0x00010000, - 0x00008000, 0x00004000, 0x00002000, 0x00001000, - 0x00000800, 0x00000400, 0x00000200, 0x00000100, - 0x00000080, 0x00000040, 0x00000020, 0x00000010, - 0x00000008, 0x00000004, 0x00000002, 0x00000001 -}; - -static u_char bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - -static u_long saltbits; -static long old_salt; -static u_long *bits28, *bits24; -static u_char init_perm[64], final_perm[64]; -static u_long en_keysl[16], en_keysr[16]; -static u_long de_keysl[16], de_keysr[16]; -static int des_initialised = 0; -static u_char m_sbox[4][4096]; -static u_long psbox[4][256]; -static u_long ip_maskl[8][256], ip_maskr[8][256]; -static u_long fp_maskl[8][256], fp_maskr[8][256]; -static u_long key_perm_maskl[8][128], key_perm_maskr[8][128]; -static u_long comp_maskl[8][128], comp_maskr[8][128]; -static u_long old_rawkey0, old_rawkey1; - -static u_char ascii64[] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -/* 0000000000111111111122222222223333333333444444444455555555556666 */ -/* 0123456789012345678901234567890123456789012345678901234567890123 */ - -static inline int -ascii_to_bin(char ch) -{ - if (ch > 'z') - return(0); - if (ch >= 'a') - return(ch - 'a' + 38); - if (ch > 'Z') - return(0); - if (ch >= 'A') - return(ch - 'A' + 12); - if (ch > '9') - return(0); - if (ch >= '.') - return(ch - '.'); - return(0); -} - - -static void -des_init() -{ - int i, j, b, k, inbit, obit; - u_long *p, *il, *ir, *fl, *fr; - - old_rawkey0 = old_rawkey1 = 0L; - saltbits = 0L; - old_salt = 0L; - bits24 = (bits28 = bits32 + 4) + 4; - - /* - * Invert the S-boxes, reordering the input bits. - */ - for (i = 0; i < 8; i++) - for (j = 0; j < 64; j++) { - b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf); - u_sbox[i][j] = sbox[i][b]; - } - - /* - * Convert the inverted S-boxes into 4 arrays of 8 bits. - * Each will handle 12 bits of the S-box input. - */ - for (b = 0; b < 4; b++) - for (i = 0; i < 64; i++) - for (j = 0; j < 64; j++) - m_sbox[b][(i << 6) | j] = - (u_sbox[(b << 1)][i] << 4) | - u_sbox[(b << 1) + 1][j]; - - /* - * Set up the initial & final permutations into a useful form, and - * initialise the inverted key permutation. - */ - for (i = 0; i < 64; i++) { - init_perm[final_perm[i] = IP[i] - 1] = i; - inv_key_perm[i] = 255; - } - - /* - * Invert the key permutation and initialise the inverted key - * compression permutation. - */ - for (i = 0; i < 56; i++) { - u_key_perm[i] = key_perm[i] - 1; - inv_key_perm[key_perm[i] - 1] = i; - inv_comp_perm[i] = 255; - } - - /* - * Invert the key compression permutation. - */ - for (i = 0; i < 48; i++) { - inv_comp_perm[comp_perm[i] - 1] = i; - } - - /* - * Set up the OR-mask arrays for the initial and final permutations, - * and for the key initial and compression permutations. - */ - for (k = 0; k < 8; k++) { - for (i = 0; i < 256; i++) { - *(il = &ip_maskl[k][i]) = 0L; - *(ir = &ip_maskr[k][i]) = 0L; - *(fl = &fp_maskl[k][i]) = 0L; - *(fr = &fp_maskr[k][i]) = 0L; - for (j = 0; j < 8; j++) { - inbit = 8 * k + j; - if (i & bits8[j]) { - if ((obit = init_perm[inbit]) < 32) - *il |= bits32[obit]; - else - *ir |= bits32[obit-32]; - if ((obit = final_perm[inbit]) < 32) - *fl |= bits32[obit]; - else - *fr |= bits32[obit - 32]; - } - } - } - for (i = 0; i < 128; i++) { - *(il = &key_perm_maskl[k][i]) = 0L; - *(ir = &key_perm_maskr[k][i]) = 0L; - for (j = 0; j < 7; j++) { - inbit = 8 * k + j; - if (i & bits8[j + 1]) { - if ((obit = inv_key_perm[inbit]) == 255) - continue; - if (obit < 28) - *il |= bits28[obit]; - else - *ir |= bits28[obit - 28]; - } - } - *(il = &comp_maskl[k][i]) = 0L; - *(ir = &comp_maskr[k][i]) = 0L; - for (j = 0; j < 7; j++) { - inbit = 7 * k + j; - if (i & bits8[j + 1]) { - if ((obit=inv_comp_perm[inbit]) == 255) - continue; - if (obit < 24) - *il |= bits24[obit]; - else - *ir |= bits24[obit - 24]; - } - } - } - } - - /* - * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. - */ - for (i = 0; i < 32; i++) - un_pbox[pbox[i] - 1] = i; - - for (b = 0; b < 4; b++) - for (i = 0; i < 256; i++) { - *(p = &psbox[b][i]) = 0L; - for (j = 0; j < 8; j++) { - if (i & bits8[j]) - *p |= bits32[un_pbox[8 * b + j]]; - } - } - - des_initialised = 1; -} - - -static void -setup_salt(long salt) -{ - u_long obit, saltbit; - int i; - - if (salt == old_salt) - return; - old_salt = salt; - - saltbits = 0L; - saltbit = 1; - obit = 0x800000; - for (i = 0; i < 24; i++) { - if (salt & saltbit) - saltbits |= obit; - saltbit <<= 1; - obit >>= 1; - } -} - - -int -des_setkey(const char *key) -{ - u_long k0, k1, rawkey0, rawkey1; - int shifts, i, b, round; - - if (!des_initialised) - des_init(); - - rawkey0 = ntohl(*(u_long *) key); - rawkey1 = ntohl(*(u_long *) (key + 4)); - - if ((rawkey0 | rawkey1) - && rawkey0 == old_rawkey0 - && rawkey1 == old_rawkey1) { - /* - * Already setup for this key. - * This optimisation fails on a zero key (which is weak and - * has bad parity anyway) in order to simplify the starting - * conditions. - */ - return(0); - } - old_rawkey0 = rawkey0; - old_rawkey1 = rawkey1; - - /* - * Do key permutation and split into two 28-bit subkeys. - */ - k0 = key_perm_maskl[0][rawkey0 >> 25] - | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskl[4][rawkey1 >> 25] - | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f]; - k1 = key_perm_maskr[0][rawkey0 >> 25] - | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskr[4][rawkey1 >> 25] - | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f]; - /* - * Rotate subkeys and do compression permutation. - */ - shifts = 0; - for (round = 0; round < 16; round++) { - u_long t0, t1; - int bit; - - shifts += key_shifts[round]; - - t0 = (k0 << shifts) | (k0 >> (28 - shifts)); - t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - - de_keysl[15 - round] = - en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] - | comp_maskl[1][(t0 >> 14) & 0x7f] - | comp_maskl[2][(t0 >> 7) & 0x7f] - | comp_maskl[3][t0 & 0x7f] - | comp_maskl[4][(t1 >> 21) & 0x7f] - | comp_maskl[5][(t1 >> 14) & 0x7f] - | comp_maskl[6][(t1 >> 7) & 0x7f] - | comp_maskl[7][t1 & 0x7f]; - - de_keysr[15 - round] = - en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f] - | comp_maskr[1][(t0 >> 14) & 0x7f] - | comp_maskr[2][(t0 >> 7) & 0x7f] - | comp_maskr[3][t0 & 0x7f] - | comp_maskr[4][(t1 >> 21) & 0x7f] - | comp_maskr[5][(t1 >> 14) & 0x7f] - | comp_maskr[6][(t1 >> 7) & 0x7f] - | comp_maskr[7][t1 & 0x7f]; - } - return(0); -} - - -static int -do_des( u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count) -{ - /* - * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. - */ - u_long mask, rawl, rawr, l, r, *kl, *kr, *kl1, *kr1; - u_long f, r48l, r48r; - int i, j, b, round; - - if (count == 0) { - return(1); - } else if (count > 0) { - /* - * Encrypting - */ - kl1 = en_keysl; - kr1 = en_keysr; - } else { - /* - * Decrypting - */ - count = -count; - kl1 = de_keysl; - kr1 = de_keysr; - } - - /* - * Do initial permutation (IP). - */ - l = ip_maskl[0][l_in >> 24] - | ip_maskl[1][(l_in >> 16) & 0xff] - | ip_maskl[2][(l_in >> 8) & 0xff] - | ip_maskl[3][l_in & 0xff] - | ip_maskl[4][r_in >> 24] - | ip_maskl[5][(r_in >> 16) & 0xff] - | ip_maskl[6][(r_in >> 8) & 0xff] - | ip_maskl[7][r_in & 0xff]; - r = ip_maskr[0][l_in >> 24] - | ip_maskr[1][(l_in >> 16) & 0xff] - | ip_maskr[2][(l_in >> 8) & 0xff] - | ip_maskr[3][l_in & 0xff] - | ip_maskr[4][r_in >> 24] - | ip_maskr[5][(r_in >> 16) & 0xff] - | ip_maskr[6][(r_in >> 8) & 0xff] - | ip_maskr[7][r_in & 0xff]; - - while (count--) { - /* - * Do each round. - */ - kl = kl1; - kr = kr1; - round = 16; - while (round--) { - /* - * Expand R to 48 bits (simulate the E-box). - */ - r48l = ((r & 0x00000001) << 23) - | ((r & 0xf8000000) >> 9) - | ((r & 0x1f800000) >> 11) - | ((r & 0x01f80000) >> 13) - | ((r & 0x001f8000) >> 15); - - r48r = ((r & 0x0001f800) << 7) - | ((r & 0x00001f80) << 5) - | ((r & 0x000001f8) << 3) - | ((r & 0x0000001f) << 1) - | ((r & 0x80000000) >> 31); - /* - * Do salting for crypt() and friends, and - * XOR with the permuted key. - */ - f = (r48l ^ r48r) & saltbits; - r48l ^= f ^ *kl++; - r48r ^= f ^ *kr++; - /* - * Do sbox lookups (which shrink it back to 32 bits) - * and do the pbox permutation at the same time. - */ - f = psbox[0][m_sbox[0][r48l >> 12]] - | psbox[1][m_sbox[1][r48l & 0xfff]] - | psbox[2][m_sbox[2][r48r >> 12]] - | psbox[3][m_sbox[3][r48r & 0xfff]]; - /* - * Now that we've permuted things, complete f(). - */ - f ^= l; - l = r; - r = f; - } - r = l; - l = f; - } - /* - * Do final permutation (inverse of IP). - */ - *l_out = fp_maskl[0][l >> 24] - | fp_maskl[1][(l >> 16) & 0xff] - | fp_maskl[2][(l >> 8) & 0xff] - | fp_maskl[3][l & 0xff] - | fp_maskl[4][r >> 24] - | fp_maskl[5][(r >> 16) & 0xff] - | fp_maskl[6][(r >> 8) & 0xff] - | fp_maskl[7][r & 0xff]; - *r_out = fp_maskr[0][l >> 24] - | fp_maskr[1][(l >> 16) & 0xff] - | fp_maskr[2][(l >> 8) & 0xff] - | fp_maskr[3][l & 0xff] - | fp_maskr[4][r >> 24] - | fp_maskr[5][(r >> 16) & 0xff] - | fp_maskr[6][(r >> 8) & 0xff] - | fp_maskr[7][r & 0xff]; - return(0); -} - - -int -des_cipher(const char *in, char *out, long salt, int count) -{ - u_long l_out, r_out, rawl, rawr; - int retval; - - if (!des_initialised) - des_init(); - - setup_salt(salt); - - rawl = ntohl(*((u_long *) in)++); - rawr = ntohl(*((u_long *) in)); - - retval = do_des(rawl, rawr, &l_out, &r_out, count); - - *((u_long *) out)++ = htonl(l_out); - *((u_long *) out) = htonl(r_out); - return(retval); -} - - -int -setkey(char *key) -{ - int i, j; - u_long packed_keys[2]; - u_char *p; - - p = (u_char *) packed_keys; - - for (i = 0; i < 8; i++) { - p[i] = 0; - for (j = 0; j < 8; j++) - if (*key++ & 1) - p[i] |= bits8[j]; - } - return(des_setkey(p)); -} - - -int -encrypt(char *block, int flag) -{ - u_long io[2]; - u_char *p; - int i, j, retval; - - if (!des_initialised) - des_init(); - - setup_salt(0L); - p = block; - for (i = 0; i < 2; i++) { - io[i] = 0L; - for (j = 0; j < 32; j++) - if (*p++ & 1) - io[i] |= bits32[j]; - } - retval = do_des(io[0], io[1], io, io + 1, flag ? -1 : 1); - for (i = 0; i < 2; i++) - for (j = 0; j < 32; j++) - block[(i << 5) | j] = (io[i] & bits32[j]) ? 1 : 0; - return(retval); -} - diff --git a/secure/lib/libcipher/test/Makefile b/secure/lib/libcipher/test/Makefile deleted file mode 100644 index f1cf6cced1a59..0000000000000 --- a/secure/lib/libcipher/test/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Hacked Makefile to compile and run the DES-certification program, -# but not install anything. -# -# $Id: Makefile,v 1.1.1.1 1994/09/07 21:18:08 csgr Exp $ -# -LIBCRYPT!=cd $(.CURDIR)/..; \ - printf "xxx:\n\techo \$${.OBJDIR}/libcipher.a\n" | make -r -s -f - xxx - -#CFLAGS+= -DHAVE_CRYPT16 -LIBCRYPT+= -lcrypt - -TARGETS=cert speedcrypt speeddes - -all: ${TARGETS} - -test: all testcrypt testencrypt testdes testspeed - -testcrypt: cert - @./cert -c - -testencrypt: cert - @./cert -e < ${.CURDIR}/cert.input - -testdes: cert - @./cert -d < ${.CURDIR}/cert.input - -testspeed: cryptspeed desspeed - -cryptspeed: speedcrypt - @./speedcrypt 30 1 - @./speedcrypt 30 1 - @./speedcrypt 30 0 - @./speedcrypt 30 0 - -desspeed: speeddes - @./speeddes 30 1 - @./speeddes 30 1 - @./speeddes 40 25 - @./speeddes 40 25 - -cert: cert.c ${LIBCRYPT} - $(CC) $(CFLAGS) -o cert ${.CURDIR}/cert.c ${LIBCRYPT} - -speedcrypt: speedcrypt.c ${LIBCRYPT} - $(CC) $(CFLAGS) -o speedcrypt ${.CURDIR}/speedcrypt.c ${LIBCRYPT} - -speeddes: speeddes.c ${LIBCRYPT} - $(CC) $(CFLAGS) -o speeddes ${.CURDIR}/speeddes.c ${LIBCRYPT} - -clean: - rm -f ${TARGETS} - -install: - -.include diff --git a/secure/lib/libcipher/test/README b/secure/lib/libcipher/test/README deleted file mode 100644 index eb6b0bebbc1de..0000000000000 --- a/secure/lib/libcipher/test/README +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains test programs to certify DES operation and to -time the crypt() call (of curiosity value). - -Simply type `make test` to run the tests. - -The normal `make all` and `make install` that get done during library building -and installation will build these programs BUT NOT INSTALL THEM. After all, -they're only for testing... - -- David Burren, January 1994 diff --git a/secure/lib/libcipher/test/cert.c b/secure/lib/libcipher/test/cert.c deleted file mode 100644 index 549c2306894fb..0000000000000 --- a/secure/lib/libcipher/test/cert.c +++ /dev/null @@ -1,344 +0,0 @@ -/* - * This DES validation program shipped with FreeSec is derived from that - * shipped with UFC-crypt which is apparently derived from one distributed - * with Phil Karns PD DES package. - * - * $Id: cert.c,v 1.1.1.1 1994/09/07 21:18:08 csgr Exp $ - */ - -#include - -int totfails = 0; - -char *crypt(); -#ifdef HAVE_CRYPT16 -char *crypt16(); -#endif /* HAVE_CRYPT16 */ - - -static struct crypt_test { - char *key, *setting, *answer; -} crypt_tests[] = { - "foob", "ar", "arlEKn0OzVJn.", - "holyhooplasbatman!", "_X.......", "_X.......N89y2Z.e4WU", - "holyhooplasbatman!", "_X...X...", "_X...X...rSUDQ5Na/QM", - "holyhooplasbatman!", "_XX..X...", "_XX..X...P8vb9xU4JAk", - "holyhooplasbatman!", "_XX..XX..", "_XX..XX..JDs5IlGLqT2", - "holyhooplasbatman!", "_XX..XXa.", "_XX..XXa.bFVsOnCNh8Y", - "holyhooplasbatman!", "_XXa.X...", "_XXa.X...Ghsb3QKNaps", -#ifdef TAKES_TOO_LONG_ON_SOME_CRYPTS - "holyhooplasbatman!", "_arararar", "_ararararNGMzvpNjeCc", -#endif - NULL, NULL, NULL, -}; - - -static struct crypt_test crypt16_tests[] = { - "foob", "ar", "arxo23jZDD5AYbHbqoy9Dalg", - "holyhooplasbatman!", "ar", "arU5FRLJ3kxIoedlmyrOelEw", - NULL, NULL, NULL -}; - - -void good_bye() -{ - if(totfails == 0) { - printf(" Passed validation\n"); - exit(0); - } else { - printf(" %d failures during validation!!!\n", totfails); - exit(1); - } -} - - -void put8(cp) -char *cp; -{ - int i,j,t; - - for(i = 0; i < 8; i++){ - t = 0; - for(j = 0; j < 8; j++) - t = t << 1 | *cp++; - printf("%02x", t); - } -} - - -void print_bits(bits) -unsigned char *bits; -{ - int i; - - for (i = 0; i < 8; i++) { - printf("%02x", bits[i]); - } -} - - -int parse_line(buff, salt, key, plain, answer) -char *buff; -long *salt; -char *key, *plain, *answer; -{ - char *ptr1, *ptr2; - int val; - int i,j,t; - - /* - * Extract salt - */ - if (sscanf(buff, "%lu", salt) != 1) - return(-1); - for (ptr2 = buff; *ptr2 && !isspace(*ptr2); ptr2++) - ; - - /* - * Extract key - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *key++ = (t & 1 << (7 - j)) != 0; - } - - /* - * Extract plain - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *plain++ = (t & 1 << (7 - j)) != 0; - } - - /* - * Extract answer - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *answer++ = (t & 1 << (7 - j)) != 0; - } - return(0); -} - -/* - * Test the setkey and encrypt functions - */ -void test_encrypt() -{ - char key[64],plain[64],cipher[64],answer[64]; - char buff[BUFSIZ]; - unsigned long salt; - int i; - int test; - int fail; - - printf("Testing setkey/encrypt\n"); - - for(test=0;fgets(buff, BUFSIZ, stdin);test++){ - - /* - * Allow comments. - */ - if (*buff == '#') - continue; - - if ((fail = parse_line(buff, &salt, key, plain, answer)) < 0){ - printf("test %d garbled (%d)\n", test, fail); - continue; - } - - if (salt) - continue; /* encrypt has no salt support */ - - printf(" K: "); put8(key); - printf(" P: "); put8(plain); - printf(" C: "); put8(answer); - - setkey(key); - for(i = 0; i < 64; i++) - cipher[i] = plain[i]; - encrypt(cipher, 0); - - for(i=0;i<64;i++) - if(cipher[i] != answer[i]) - break; - fail = 0; - if(i != 64){ - printf(" Enc FAIL "); - put8(cipher); - fail++; totfails++; - } - - encrypt(cipher, 1); - - for(i=0;i<64;i++) - if(cipher[i] != plain[i]) - break; - if(i != 64){ - printf(" Dec FAIL"); - fail++; totfails++; - } - - if(fail == 0) - printf(" OK"); - printf("\n"); - } -} - - -void bytes_to_bits(bytes, bits) -char *bytes; -unsigned char *bits; -{ - int i, j; - - for (i = 0; i < 8; i++) { - bits[i] = 0; - for (j = 0; j < 8; j++) { - bits[i] |= (bytes[i*8+j] & 1) << (7 - j); - } - } -} - - -/* - * Test the des_setkey and des_cipher functions - */ -void test_des() -{ - char ckey[64], cplain[64], canswer[64]; - unsigned char key[8], plain[8], cipher[8], answer[8]; - char buff[BUFSIZ]; - unsigned long salt; - int i; - int test; - int fail; - - printf("Testing des_setkey/des_cipher\n"); - - for(test=0;fgets(buff, BUFSIZ, stdin);test++){ - - /* - * Allow comments. - */ - if (*buff == '#') - continue; - - if ((fail = parse_line(buff, &salt, ckey, cplain, canswer)) <0){ - printf("test %d garbled (%d)\n", test, fail); - continue; - } - - printf(" S: %06x", salt); - printf(" K: "); put8(ckey); - printf(" P: "); put8(cplain); - printf(" C: "); put8(canswer); - - bytes_to_bits(ckey, key); - bytes_to_bits(cplain, plain); - bytes_to_bits(canswer, answer); - des_setkey(key); - des_cipher(plain, cipher, salt, 1); - - for(i = 0; i < 8; i++) - if(cipher[i] != answer[i]) - break; - fail = 0; - if(i != 8){ - printf(" Enc FAIL "); - print_bits(cipher); - fail++; totfails++; - } - - des_cipher(cipher, cipher, salt, -1); - - for(i = 0; i < 8; i++) - if(cipher[i] != plain[i]) - break; - if(i != 8){ - printf(" Dec FAIL"); - fail++; totfails++; - } - - if(fail == 0) - printf(" OK"); - printf("\n"); - } -} - - -/* - * Test the old-style crypt(), the new-style crypt(), and crypt16(). - */ -void test_crypt() -{ - char *result; - struct crypt_test *p; - - printf("Testing crypt() family\n"); - - for (p = crypt_tests; p->key; p++) { - printf(" crypt(\"%s\", \"%s\"), \"%s\" expected", - p->key, p->setting, p->answer); - fflush(stdout); - result = crypt(p->key, p->setting); - if(!strcmp(result, p->answer)) { - printf(", OK\n"); - } else { - printf("\n failed (\"%s\")\n", result); - totfails++; - } - } - -#ifdef HAVE_CRYPT16 - for (p = crypt16_tests; p->key; p++) { - printf(" crypt16(\"%s\", \"%s\"), \"%s\" expected", - p->key, p->setting, p->answer); - fflush(stdout); - result = crypt16(p->key, p->setting); - if(!strcmp(result, p->answer)) { - printf(", OK\n"); - } else { - printf("\n failed (\"%s\")\n", result); - totfails++; - } - } -#endif /* HAVE_CRYPT16 */ -} - -main(argc, argv) -int argc; -char *argv[]; -{ - if(argc < 1 || !strcmp(argv[1], "-e")) - test_encrypt(); - else if(!strcmp(argv[1], "-d")) - test_des(); - else if(!strcmp(argv[1], "-c")) - test_crypt(); - good_bye(); -} diff --git a/secure/lib/libcipher/test/cert.input b/secure/lib/libcipher/test/cert.input deleted file mode 100644 index 275639c46e5a2..0000000000000 --- a/secure/lib/libcipher/test/cert.input +++ /dev/null @@ -1,179 +0,0 @@ -# $Id: cert.input,v 1.1 1994/09/07 08:55:26 g89r4222 Exp $ -# -# Salt, key, plaintext, ciphertext -# -0 0101010101010101 95f8a5e5dd31d900 8000000000000000 -0 0101010101010101 dd7f121ca5015619 4000000000000000 -0 0101010101010101 2e8653104f3834ea 2000000000000000 -0 0101010101010101 4bd388ff6cd81d4f 1000000000000000 -0 0101010101010101 20b9e767b2fb1456 0800000000000000 -0 0101010101010101 55579380d77138ef 0400000000000000 -0 0101010101010101 6cc5defaaf04512f 0200000000000000 -0 0101010101010101 0d9f279ba5d87260 0100000000000000 -0 0101010101010101 d9031b0271bd5a0a 0080000000000000 -0 0101010101010101 424250b37c3dd951 0040000000000000 -0 0101010101010101 b8061b7ecd9a21e5 0020000000000000 -0 0101010101010101 f15d0f286b65bd28 0010000000000000 -0 0101010101010101 add0cc8d6e5deba1 0008000000000000 -0 0101010101010101 e6d5f82752ad63d1 0004000000000000 -0 0101010101010101 ecbfe3bd3f591a5e 0002000000000000 -0 0101010101010101 f356834379d165cd 0001000000000000 -0 0101010101010101 2b9f982f20037fa9 0000800000000000 -0 0101010101010101 889de068a16f0be6 0000400000000000 -0 0101010101010101 e19e275d846a1298 0000200000000000 -0 0101010101010101 329a8ed523d71aec 0000100000000000 -0 0101010101010101 e7fce22557d23c97 0000080000000000 -0 0101010101010101 12a9f5817ff2d65d 0000040000000000 -0 0101010101010101 a484c3ad38dc9c19 0000020000000000 -0 0101010101010101 fbe00a8a1ef8ad72 0000010000000000 -0 0101010101010101 750d079407521363 0000008000000000 -0 0101010101010101 64feed9c724c2faf 0000004000000000 -0 0101010101010101 f02b263b328e2b60 0000002000000000 -0 0101010101010101 9d64555a9a10b852 0000001000000000 -0 0101010101010101 d106ff0bed5255d7 0000000800000000 -0 0101010101010101 e1652c6b138c64a5 0000000400000000 -0 0101010101010101 e428581186ec8f46 0000000200000000 -0 0101010101010101 aeb5f5ede22d1a36 0000000100000000 -0 0101010101010101 e943d7568aec0c5c 0000000080000000 -0 0101010101010101 df98c8276f54b04b 0000000040000000 -0 0101010101010101 b160e4680f6c696f 0000000020000000 -0 0101010101010101 fa0752b07d9c4ab8 0000000010000000 -0 0101010101010101 ca3a2b036dbc8502 0000000008000000 -0 0101010101010101 5e0905517bb59bcf 0000000004000000 -0 0101010101010101 814eeb3b91d90726 0000000002000000 -0 0101010101010101 4d49db1532919c9f 0000000001000000 -0 0101010101010101 25eb5fc3f8cf0621 0000000000800000 -0 0101010101010101 ab6a20c0620d1c6f 0000000000400000 -0 0101010101010101 79e90dbc98f92cca 0000000000200000 -0 0101010101010101 866ecedd8072bb0e 0000000000100000 -0 0101010101010101 8b54536f2f3e64a8 0000000000080000 -0 0101010101010101 ea51d3975595b86b 0000000000040000 -0 0101010101010101 caffc6ac4542de31 0000000000020000 -0 0101010101010101 8dd45a2ddf90796c 0000000000010000 -0 0101010101010101 1029d55e880ec2d0 0000000000008000 -0 0101010101010101 5d86cb23639dbea9 0000000000004000 -0 0101010101010101 1d1ca853ae7c0c5f 0000000000002000 -0 0101010101010101 ce332329248f3228 0000000000001000 -0 0101010101010101 8405d1abe24fb942 0000000000000800 -0 0101010101010101 e643d78090ca4207 0000000000000400 -0 0101010101010101 48221b9937748a23 0000000000000200 -0 0101010101010101 dd7c0bbd61fafd54 0000000000000100 -0 0101010101010101 2fbc291a570db5c4 0000000000000080 -0 0101010101010101 e07c30d7e4e26e12 0000000000000040 -0 0101010101010101 0953e2258e8e90a1 0000000000000020 -0 0101010101010101 5b711bc4ceebf2ee 0000000000000010 -0 0101010101010101 cc083f1e6d9e85f6 0000000000000008 -0 0101010101010101 d2fd8867d50d2dfe 0000000000000004 -0 0101010101010101 06e7ea22ce92708f 0000000000000002 -0 0101010101010101 166b40b44aba4bd6 0000000000000001 -0 8001010101010101 0000000000000000 95a8d72813daa94d -0 4001010101010101 0000000000000000 0eec1487dd8c26d5 -0 2001010101010101 0000000000000000 7ad16ffb79c45926 -0 1001010101010101 0000000000000000 d3746294ca6a6cf3 -0 0801010101010101 0000000000000000 809f5f873c1fd761 -0 0401010101010101 0000000000000000 c02faffec989d1fc -0 0201010101010101 0000000000000000 4615aa1d33e72f10 -0 0180010101010101 0000000000000000 2055123350c00858 -0 0140010101010101 0000000000000000 df3b99d6577397c8 -0 0120010101010101 0000000000000000 31fe17369b5288c9 -0 0110010101010101 0000000000000000 dfdd3cc64dae1642 -0 0108010101010101 0000000000000000 178c83ce2b399d94 -0 0104010101010101 0000000000000000 50f636324a9b7f80 -0 0102010101010101 0000000000000000 a8468ee3bc18f06d -0 0101800101010101 0000000000000000 a2dc9e92fd3cde92 -0 0101400101010101 0000000000000000 cac09f797d031287 -0 0101200101010101 0000000000000000 90ba680b22aeb525 -0 0101100101010101 0000000000000000 ce7a24f350e280b6 -0 0101080101010101 0000000000000000 882bff0aa01a0b87 -0 0101040101010101 0000000000000000 25610288924511c2 -0 0101020101010101 0000000000000000 c71516c29c75d170 -0 0101018001010101 0000000000000000 5199c29a52c9f059 -0 0101014001010101 0000000000000000 c22f0a294a71f29f -0 0101012001010101 0000000000000000 ee371483714c02ea -0 0101011001010101 0000000000000000 a81fbd448f9e522f -0 0101010801010101 0000000000000000 4f644c92e192dfed -0 0101010401010101 0000000000000000 1afa9a66a6df92ae -0 0101010201010101 0000000000000000 b3c1cc715cb879d8 -0 0101010180010101 0000000000000000 19d032e64ab0bd8b -0 0101010140010101 0000000000000000 3cfaa7a7dc8720dc -0 0101010120010101 0000000000000000 b7265f7f447ac6f3 -0 0101010110010101 0000000000000000 9db73b3c0d163f54 -0 0101010108010101 0000000000000000 8181b65babf4a975 -0 0101010104010101 0000000000000000 93c9b64042eaa240 -0 0101010102010101 0000000000000000 5570530829705592 -0 0101010101800101 0000000000000000 8638809e878787a0 -0 0101010101400101 0000000000000000 41b9a79af79ac208 -0 0101010101200101 0000000000000000 7a9be42f2009a892 -0 0101010101100101 0000000000000000 29038d56ba6d2745 -0 0101010101080101 0000000000000000 5495c6abf1e5df51 -0 0101010101040101 0000000000000000 ae13dbd561488933 -0 0101010101020101 0000000000000000 024d1ffa8904e389 -0 0101010101018001 0000000000000000 d1399712f99bf02e -0 0101010101014001 0000000000000000 14c1d7c1cffec79e -0 0101010101012001 0000000000000000 1de5279dae3bed6f -0 0101010101011001 0000000000000000 e941a33f85501303 -0 0101010101010801 0000000000000000 da99dbbc9a03f379 -0 0101010101010401 0000000000000000 b7fc92f91d8e92e9 -0 0101010101010201 0000000000000000 ae8e5caa3ca04e85 -0 0101010101010180 0000000000000000 9cc62df43b6eed74 -0 0101010101010140 0000000000000000 d863dbb5c59a91a0 -0 0101010101010120 0000000000000000 a1ab2190545b91d7 -0 0101010101010110 0000000000000000 0875041e64c570f7 -0 0101010101010108 0000000000000000 5a594528bebef1cc -0 0101010101010104 0000000000000000 fcdb3291de21f0c0 -0 0101010101010102 0000000000000000 869efd7f9f265a09 -0 1046913489980131 0000000000000000 88d55e54f54c97b4 -0 1007103489988020 0000000000000000 0c0cc00c83ea48fd -0 10071034c8980120 0000000000000000 83bc8ef3a6570183 -0 1046103489988020 0000000000000000 df725dcad94ea2e9 -0 1086911519190101 0000000000000000 e652b53b550be8b0 -0 1086911519580101 0000000000000000 af527120c485cbb0 -0 5107b01519580101 0000000000000000 0f04ce393db926d5 -0 1007b01519190101 0000000000000000 c9f00ffc74079067 -0 3107915498080101 0000000000000000 7cfd82a593252b4e -0 3107919498080101 0000000000000000 cb49a2f9e91363e3 -0 10079115b9080140 0000000000000000 00b588be70d23f56 -0 3107911598080140 0000000000000000 406a9a6ab43399ae -0 1007d01589980101 0000000000000000 6cb773611dca9ada -0 9107911589980101 0000000000000000 67fd21c17dbb5d70 -0 9107d01589190101 0000000000000000 9592cb4110430787 -0 1007d01598980120 0000000000000000 a6b7ff68a318ddd3 -0 1007940498190101 0000000000000000 4d102196c914ca16 -0 0107910491190401 0000000000000000 2dfa9f4573594965 -0 0107910491190101 0000000000000000 b46604816c0e0774 -0 0107940491190401 0000000000000000 6e7e6221a4f34e87 -0 19079210981a0101 0000000000000000 aa85e74643233199 -0 1007911998190801 0000000000000000 2e5a19db4d1962d6 -0 10079119981a0801 0000000000000000 23a866a809d30894 -0 1007921098190101 0000000000000000 d812d961f017d320 -0 100791159819010b 0000000000000000 055605816e58608f -0 1004801598190101 0000000000000000 abd88e8b1b7716f1 -0 1004801598190102 0000000000000000 537ac95be69da1e1 -0 1004801598190108 0000000000000000 aed0f6ae3c25cdd8 -0 1002911598100104 0000000000000000 b3e35a5ee53e7b8d -0 1002911598190104 0000000000000000 61c79c71921a2ef8 -0 1002911598100201 0000000000000000 e2f5728f0995013c -0 1002911698100101 0000000000000000 1aeac39a61f0a464 -0 7ca110454a1a6e57 01a1d6d039776742 690f5b0d9a26939b -0 0131d9619dc1376e 5cd54ca83def57da 7a389d10354bd271 -0 07a1133e4a0b2686 0248d43806f67172 868ebb51cab4599a -0 3849674c2602319e 51454b582ddf440a 7178876e01f19b2a -0 04b915ba43feb5b6 42fd443059577fa2 af37fb421f8c4095 -0 0113b970fd34f2ce 059b5e0851cf143a 86a560f10ec6d85b -0 0170f175468fb5e6 0756d8e0774761d2 0cd3da020021dc09 -0 43297fad38e373fe 762514b829bf486a ea676b2cb7db2b7a -0 07a7137045da2a16 3bdd119049372802 dfd64a815caf1a0f -0 04689104c2fd3b2f 26955f6835af609a 5c513c9c4886c088 -0 37d06bb516cb7546 164d5e404f275232 0a2aeeae3ff4ab77 -0 1f08260d1ac2465e 6b056e18759f5cca ef1bf03e5dfa575a -0 584023641aba6176 004bd6ef09176062 88bf0db6d70dee56 -0 025816164629b007 480d39006ee762f2 a1f9915541020b56 -0 49793ebc79b3258f 437540c8698f3cfa 6fbf1cafcffd0556 -0 4fb05e1515ab73a7 072d43a077075292 2f22e49bab7ca1ac -0 49e95d6d4ca229bf 02fe55778117f12a 5a6b612cc26cce4a -0 018310dc409b26d6 1d9d5c5018f728c2 5f4c038ed12b2e41 -0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793 -1 1c587f1c13924fef 305532286d6f295a 400d307ca24fee60 -57 1c587f1c13924fef 305532286d6f295a 28b568f40e7d43ae -1 8001010101010101 0000000000000000 f501029f268e45dc -0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793 diff --git a/secure/lib/libcipher/test/speedcrypt.c b/secure/lib/libcipher/test/speedcrypt.c deleted file mode 100644 index f7507fd789f04..0000000000000 --- a/secure/lib/libcipher/test/speedcrypt.c +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include -#include -#include - -int keep_going, count, alternate, seconds; -struct rusage prior, now; - -void -finish() -{ - keep_going = 0; -} - - -main(int argc, char *argv[]) -{ - struct itimerval itv; - u_long msecs, key1[8], key2[8]; - char *k1, *k2; - - if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1) - seconds = 20; - - if (argc < 3 || sscanf(argv[2], "%d", &alternate) != 1) - alternate = 0; - - printf ("Running crypt%s for %d seconds of vtime...\n", - alternate ? " with alternate keys" : "", seconds); - - bzero(&itv, sizeof (itv)); - signal (SIGVTALRM, finish); - itv.it_value.tv_sec = seconds; - itv.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL, &itv, NULL); - - keep_going = 1; - if (getrusage(0, &prior) < 0) { - perror("getrusage"); - exit(1); - } - - k1 = (char *) key1; - k2 = (char *) key2; - strcpy(k1, "fredfredfredfredfred"); - strcpy(k2, "joejoejoejoejoejoejo"); - - if (alternate) - for (count = 0; keep_going; count++) - { -#if defined(LONGCRYPT) - crypt((count & 1) ? k1 : k2, "_ara.X..."); -#else - crypt((count & 1) ? k1 : k2, "eek"); -#endif - } - else - for (count = 0; keep_going; count++) - { -#if defined(LONGCRYPT) - crypt(k1, "_ara.X..."); -#else - crypt(k1, "eek"); -#endif - } - - if (getrusage(0, &now) < 0) { - perror("getrusage"); - exit(1); - } - msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000 - + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000; - printf ("\tDid %d crypt()s per second.\n", 1000 * count / msecs); - exit(0); -} diff --git a/secure/lib/libcipher/test/speeddes.c b/secure/lib/libcipher/test/speeddes.c deleted file mode 100644 index a5822362f107a..0000000000000 --- a/secure/lib/libcipher/test/speeddes.c +++ /dev/null @@ -1,61 +0,0 @@ -#include -#include -#include -#include -#include - -int keep_going, count, alternate, seconds, iters; -struct rusage prior, now; -u_long block[3]; -char *blk; - -void -finish() -{ - keep_going = 0; -} - - -main(int argc, char *argv[]) -{ - struct itimerval itv; - u_long msecs; - - if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1) - seconds = 20; - - if (argc < 3 || sscanf(argv[2], "%d", &iters) != 1) - iters = 1; - - printf ("Running des_cipher( , , 0L, %d) for %d seconds of vtime...\n", - iters, seconds); - - bzero(&itv, sizeof (itv)); - signal (SIGVTALRM, finish); - itv.it_value.tv_sec = seconds; - itv.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL, &itv, NULL); - - keep_going = 1; - if (getrusage(0, &prior) < 0) { - perror("getrusage"); - exit(1); - } - - blk = (char *) block; - (void)des_setkey(blk); - for (count = 0; keep_going; count++) - (void) des_cipher(blk, blk, 0, iters); - - if (getrusage(0, &now) < 0) { - perror("getrusage"); - exit(1); - } - - msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000 - + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000; - printf ("Did %d encryptions per second, each of %d iteration(s).\n", - 1000 * count / msecs, iters); - printf ("\tTotal %d blocks per second.\n", (1000*iters*count)/msecs); - exit(0); -} diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile deleted file mode 100644 index 39c64aba38b7a..0000000000000 --- a/secure/lib/libcrypt/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# $Id$ -# - -LCRYPTBASE= libcrypt -LCRYPTSO= $(LCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) - -LDCRYPTBASE= libdescrypt -LDCRYPTSO= $(LDCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) - -.PATH: ${.CURDIR}/../../../lib/libmd - -LIB= descrypt -SRCS= crypt.c crypt-md5.c md5c.c -MAN3= crypt.3 -CFLAGS+= -I${.CURDIR}/../../../lib/libmd -Wall -PRECIOUSLIB= yes - -test: - cd test ; make test ; make clean - -.include - -# We only install the links if they do not already exist. -# This may have to be revised -afterinstall: -.if !defined(NOPIC) && defined(SHLIB_MAJOR) - @cd $(DESTDIR)/$(LIBDIR); \ - if [ ! -e $(LCRYPTSO) ]; then \ - rm -f $(LCRYPTSO); \ - ln -s $(LDCRYPTSO) $(LCRYPTSO); \ - fi -.endif - @cd $(DESTDIR)/$(LIBDIR); \ - if [ ! -e $(LCRYPTBASE).a ]; then \ - rm -f $(LCRYPTBASE).a; \ - ln -s $(LDCRYPTBASE).a libcrypt.a; \ - fi -.if !defined(NOPROFILE) - @cd $(DESTDIR)/$(LIBDIR); \ - if [ ! -e $(LCRYPTBASE)_p.a ]; then \ - rm -f $(LCRYPTBASE)_p.a; \ - ln -s $(LDCRYPTBASE)_p.a libcrypt_p.a; \ - fi -.endif diff --git a/secure/lib/libcrypt/README b/secure/lib/libcrypt/README deleted file mode 100644 index 051c9c1b94ef4..0000000000000 --- a/secure/lib/libcrypt/README +++ /dev/null @@ -1,98 +0,0 @@ - - FreeSec - NetBSD libcrypt replacement - - David Burren - Release 1.0, March 1994 - - Document ref: $Id: README,v 1.1.1.1 1994/04/04 14:57:18 g89r4222 Exp $ - - -Description -=========== -This library is a drop-in replacement for the libcrypt used in U.S. copies -of NetBSD, duplicating that library's functionality. A suite of verification -and benchmark tools is provided. - -FreeSec 1.0 is an original implementation of the DES algorithm and the -crypt(3) interfaces used in Unix-style operating systems. It was produced -in Australia and as such is not covered by U.S. export restrictions (at -least for copies that remain outside the U.S.). - - -History -======= -An earlier version of the FreeSec library was built using the UFC-crypt -package that is distributed as part of the GNU library. UFC-crypt did not -support the des_cipher() or des_setkey() functions, nor the new-style -crypt with long keys. These were implemented in FreeSec 0.2, but at least -one bug remained, where encryption would only succeed if either the salt -or the plaintext was zero. Because of its heritage FreeSec 0.2 was covered -by the GNU Library Licence. - -FreeSec 1.0 is an original implementation by myself, and has been tested -against the verification suite I'd been using with FreeSec 0.2 (this is not -encumbered by any licence). FreeSec 1.0 is covered by a Berkeley-style -licence, which better fits into the *BSD hierarchy than the earlier GNU -licence. - - -Why should you use FreeSec? -=========================== -FreeSec is intended as a replacement for the U.S.-only NetBSD libcrypt, -to act as a baseline for encryption functionality. - -Some other packages (such as Eric Young's libdes package) are faster and -more complete than FreeSec, but typically have different licencing -arrangements. While some applications will justify the use of these -packages, the idea here is that everyone should have access to *at least* -the functionality of FreeSec. - - -Performance of FreeSec 1.0 -========================== -I compare below the performance of three libcrypt implementations. As can be -seen, it's between the U.S. library and UFC-crypt. While the performance of -FreeSec 1.0 is good enough to keep me happy for now, I hope to improve it in -future versions. I was interested to note that while UFC-crypt is faster on -a 386, hardware characteristics can have markedly different effects on each -implementation. - - -386DX40, 128k cache | U.S. BSD | FreeSec 1.0 | FreeSec 0.2 -CFLAGS=-O2 | | | -========================+===============+===============+================== -crypt (alternate keys) | 317 | 341 | 395 - crypt/sec | | | -------------------------+---------------+---------------+------------------ -crypt (constant key) | 317 | 368 | 436 - crypt/sec | | | -------------------------+---------------+---------------+------------------ -des_cipher( , , , 1) | 6037 | 7459 | 3343 - blocks/sec | | | -------------------------+---------------+---------------+------------------ -des_cipher( , , , 25) | 8871 | 9627 | 15926 - blocks/sec | | | - -Notes: The results tabled here are the average over 10 runs. - The entry/exit code for FreeSec 0.2's des_cipher() is particularly - inefficient, thus the anomalous result for single encryptions. - - -As an experiment using a machine with a larger register set and an -obscenely fast CPU, I obtained the following results: - - 60 MHz R4400 | FreeSec 1.0 | FreeSec 0.2 - ========================+================================= - crypt (alternate keys) | 2545 | 2702 - crypt/sec | | - ------------------------+--------------------------------- - crypt (constant key) | 2852 | 2981 - crypt/sec | | - ------------------------+--------------------------------- - des_cipher( , , , 1) | 56443 | 21409 - blocks/sec | | - ------------------------+--------------------------------- - des_cipher( , , , 25) | 82531 | 18276 - blocks/sec | | - -Obviously your mileage will vary with your hardware and your compiler... diff --git a/secure/lib/libcrypt/README.FreeBSD b/secure/lib/libcrypt/README.FreeBSD deleted file mode 100644 index 250467edfd602..0000000000000 --- a/secure/lib/libcrypt/README.FreeBSD +++ /dev/null @@ -1,21 +0,0 @@ -$Id: README.FreeBSD,v 1.2 1994/04/04 15:10:57 g89r4222 Exp $ - -This is FreeSec package for NetBSD, unchanged for -FreeBSD, except for the Makefile. - -FreeSec was written by David Burren - -A few bugs in the original FreeSec release have been fixed. - -In order to make libcrypt binaries exportable from the USA, -only the symbol _crypt() (later to be changed to ___crypt()) -is exported from libcrypt. - -This source code was developed outside the USA, and can be -obtained outside the USA. - - Geoff Rehmet - Rhodes University - Grahamstown - South Africa - 8 August 1994 diff --git a/secure/lib/libcrypt/crypt-md5.c b/secure/lib/libcrypt/crypt-md5.c deleted file mode 100644 index 6740f723a807b..0000000000000 --- a/secure/lib/libcrypt/crypt-md5.c +++ /dev/null @@ -1,157 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- - * - * This has had its entry point changed to crypt_md5 for use in - * a dual-personality (DES & MD5) environment) -- MarkM - Nov 1995 - * - * $Id$ - * - */ - -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Header: /home/ncvs/src/lib/libcrypt/crypt.c,v 1.3 1995/05/30 05:42:22 rgrimes Exp $"; -#endif /* LIBC_SCCS and not lint */ -#endif - -#include -#include -#include -#include - -static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - -static void -to64(s, v, n) - char *s; - unsigned long v; - int n; -{ - while (--n >= 0) { - *s++ = itoa64[v&0x3f]; - v >>= 6; - } -} - -/* - * UNIX password - * - * Use MD5 for what it is best at... - */ - -char * -crypt_md5(pw, salt) - register const char *pw; - register const char *salt; -{ - static char *magic = "$1$"; /* - * This string is magic for - * this algorithm. Having - * it this way, we can get - * get better later on - */ - static char passwd[120], *p; - static const char *sp,*ep; - unsigned char final[16]; - int sl,pl,i,j; - MD5_CTX ctx,ctx1; - unsigned long l; - - /* Refine the Salt first */ - sp = salt; - - /* If it starts with the magic string, then skip that */ - if(!strncmp(sp,magic,strlen(magic))) - sp += strlen(magic); - - /* It stops at the first '$', max 8 chars */ - for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++) - continue; - - /* get the length of the true salt */ - sl = ep - sp; - - MD5Init(&ctx); - - /* The password first, since that is what is most unknown */ - MD5Update(&ctx,pw,strlen(pw)); - - /* Then our magic string */ - MD5Update(&ctx,magic,strlen(magic)); - - /* Then the raw salt */ - MD5Update(&ctx,sp,sl); - - /* Then just as many characters of the MD5(pw,salt,pw) */ - MD5Init(&ctx1); - MD5Update(&ctx1,pw,strlen(pw)); - MD5Update(&ctx1,sp,sl); - MD5Update(&ctx1,pw,strlen(pw)); - MD5Final(final,&ctx1); - for(pl = strlen(pw); pl > 0; pl -= 16) - MD5Update(&ctx,final,pl>16 ? 16 : pl); - - /* Don't leave anything around in vm they could use. */ - memset(final,0,sizeof final); - - /* Then something really weird... */ - for (j=0,i = strlen(pw); i ; i >>= 1) - if(i&1) - MD5Update(&ctx, final+j, 1); - else - MD5Update(&ctx, pw+j, 1); - - /* Now make the output string */ - strcpy(passwd,magic); - strncat(passwd,sp,sl); - strcat(passwd,"$"); - - MD5Final(final,&ctx); - - /* - * and now, just to make sure things don't run too fast - * On a 60 Mhz Pentium this takes 34 msec, so you would - * need 30 seconds to build a 1000 entry dictionary... - */ - for(i=0;i<1000;i++) { - MD5Init(&ctx1); - if(i & 1) - MD5Update(&ctx1,pw,strlen(pw)); - else - MD5Update(&ctx1,final,16); - - if(i % 3) - MD5Update(&ctx1,sp,sl); - - if(i % 7) - MD5Update(&ctx1,pw,strlen(pw)); - - if(i & 1) - MD5Update(&ctx1,final,16); - else - MD5Update(&ctx1,pw,strlen(pw)); - MD5Final(final,&ctx1); - } - - p = passwd + strlen(passwd); - - l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4; - l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4; - l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4; - l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4; - l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4; - l = final[11] ; to64(p,l,2); p += 2; - *p = '\0'; - - /* Don't leave anything around in vm they could use. */ - memset(final,0,sizeof final); - - return passwd; -} - diff --git a/secure/lib/libcrypt/crypt.3 b/secure/lib/libcrypt/crypt.3 deleted file mode 100644 index 6933bad105303..0000000000000 --- a/secure/lib/libcrypt/crypt.3 +++ /dev/null @@ -1,159 +0,0 @@ -.\" FreeSec: libcrypt for NetBSD -.\" -.\" Copyright (c) 1994 David Burren -.\" All rights reserved. -.\" -.\" 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. -.\" 4. Neither the name of the author nor the names of other contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -.\" -.\" $Id: crypt.3,v 1.2.6.1 1996/02/07 15:01:45 peter Exp $ -.\" -.\" Manual page, using -mandoc macros -.\" -.Dd March 9, 1994 -.Dt CRYPT 3 -.Os "FreeSec 1.0" -.Sh NAME -.Nm crypt -.Nd DES trapdoor encryption -.Sh SYNOPSIS -.Ft char -.Fn *crypt "const char *key" "const char *setting" -.Sh DESCRIPTION -The -.Fn crypt -function performs password encryption, based on the -.Tn NBS -Data Encryption Standard (DES). -Additional code has been added to deter key search attempts. -The first argument to -.Nm crypt -is a -.Dv null Ns -terminated -string, typically a user's typed password. -The second is in one of three forms: -if it begins with an underscore (``_'') then an extended format is used -in interpreting both the the key and the setting, as outlined below. -if it begins with the string ``$1$'' then an exportable format is used. -.Ss Extended crypt: -.Pp -The -.Ar key -is divided into groups of 8 characters (the last group is null-padded) -and the low-order 7 bits of each each character (56 bits per group) are -used to form the DES key as follows: -the first group of 56 bits becomes the initial DES key. -For each additional group, the XOR of the encryption of the current DES -key with itself and the group bits becomes the next DES key. -.Pp -The setting is a 9-character array consisting of an underscore followed -by 4 bytes of iteration count and 4 bytes of salt. -These are encoded as printable characters, 6 bits per character, -least significant character first. -The values 0 to 63 are encoded as ``./0-9A-Za-z''. -This allows 24 bits for both -.Fa count -and -.Fa salt . -.Ss "Traditional" crypt: -.Pp -The first 8 bytes of the key are null-padded, and the low-order 7 bits of -each character is used to form the 56-bit -.Tn DES -key. -.Pp -The setting is a 2-character array of the ASCII-encoded salt. -Thus only 12 bits of -.Fa salt -are used. -.Fa count -is set to 25. -.Ss "FreeBSD" or "Exportable" crypt: -.Pp -If the salt begins with ``$1$'' then the freely exportable -.Tn MD5 -algorithm is used to calculate a hash value, from which the password string -is generated. The -.Tn MD5 -derived routine is designed to be time-consuming like the DES based version. -.Ss Algorithm: -.Pp -The -.Fa salt -introduces disorder in the -.Tn DES -algorithm in one of 16777216 or 4096 possible ways -(ie. with 24 or 12 bits: if bit -.Em i -of the -.Ar salt -is set, then bits -.Em i -and -.Em i+24 -are swapped in the -.Tn DES -E-box output). -.Pp -The DES key is used to encrypt a 64-bit constant using -.Ar count -iterations of -.Tn DES . -The value returned is a -.Dv null Ns -terminated -string, 20 or 13 bytes (plus null) in length, consisting of the -.Ar setting -followed by the encoded 64-bit encryption. -.Pp -The function -.Fn crypt -returns a pointer to the encrypted value on success, and NULL on failure. -.Sh SEE ALSO -.Xr login 1 , -.Xr passwd 1 , -.Xr getpass 3 , -.Xr passwd 5 -.Sh BUGS -The -.Fn crypt -function returns a pointer to static data, and subsequent calls to -.Fn crypt -will modify the same object. -.Sh HISTORY -A rotor-based -.Fn crypt -function appeared in -.At v6 . -The current style -.Fn crypt -first appeared in -.At v7 . -.Pp -This library (FreeSec 1.0) was developed outside the United States of America -as an unencumbered replacement for the U.S.-only NetBSD libcrypt encryption -library. -Users should be aware that this code (and programs staticly linked with it) -may not be exported from the U.S., although it apparently can be imported. -.Sh AUTHOR -David Burren diff --git a/secure/lib/libcrypt/crypt.c b/secure/lib/libcrypt/crypt.c deleted file mode 100644 index f59bb49318606..0000000000000 --- a/secure/lib/libcrypt/crypt.c +++ /dev/null @@ -1,697 +0,0 @@ -/* - * FreeSec: libcrypt for NetBSD - * - * Copyright (c) 1994 David Burren - * All rights reserved. - * - * Adapted for FreeBSD-2.0 by Geoffrey M. Rehmet - * crypt.c should now *only* export crypt(), in order to make - * binaries of libcrypt exportable from the USA - * - * 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. - * 4. Neither the name of the author nor the names of other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * - * $Id: crypt.c,v 1.7 1995/12/16 09:14:12 markm Exp $ - * - * This is an original implementation of the DES and the crypt(3) interfaces - * by David Burren . - * - * An excellent reference on the underlying algorithm (and related - * algorithms) is: - * - * B. Schneier, Applied Cryptography: protocols, algorithms, - * and source code in C, John Wiley & Sons, 1994. - * - * Note that in that book's description of DES the lookups for the initial, - * pbox, and final permutations are inverted (this has been brought to the - * attention of the author). A list of errata for this book has been - * posted to the sci.crypt newsgroup by the author and is available for FTP. - * - * ARCHITECTURE ASSUMPTIONS: - * This code assumes that u_longs are 32 bits. It will probably not - * operate on 64-bit machines without modifications. - * It is assumed that the 8-byte arrays passed by reference can be - * addressed as arrays of u_longs (ie. the CPU is not picky about - * alignment). - */ -#include -#include -#include -#include - -char *crypt_md5(const char *pw, const char *salt); - -/* We can't always assume gcc */ -#ifdef __GNUC__ -#define INLINE inline -#endif - - -static u_char IP[64] = { - 58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4, - 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8, - 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3, - 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7 -}; - -static u_char inv_key_perm[64]; -static u_char u_key_perm[56]; -static u_char key_perm[56] = { - 57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18, - 10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36, - 63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22, - 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4 -}; - -static u_char key_shifts[16] = { - 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 -}; - -static u_char inv_comp_perm[56]; -static u_char comp_perm[48] = { - 14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10, - 23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2, - 41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48, - 44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32 -}; - -/* - * No E box is used, as it's replaced by some ANDs, shifts, and ORs. - */ - -static u_char u_sbox[8][64]; -static u_char sbox[8][64] = { - { - 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, - 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, - 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, - 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 - }, - { - 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, - 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, - 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, - 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 - }, - { - 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, - 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, - 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 - }, - { - 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, - 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, - 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, - 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 - }, - { - 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, - 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, - 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, - 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 - }, - { - 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, - 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, - 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, - 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 - }, - { - 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, - 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, - 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, - 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 - }, - { - 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, - 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, - 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, - 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 - } -}; - -static u_char un_pbox[32]; -static u_char pbox[32] = { - 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10, - 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 -}; - -static u_long bits32[32] = -{ - 0x80000000, 0x40000000, 0x20000000, 0x10000000, - 0x08000000, 0x04000000, 0x02000000, 0x01000000, - 0x00800000, 0x00400000, 0x00200000, 0x00100000, - 0x00080000, 0x00040000, 0x00020000, 0x00010000, - 0x00008000, 0x00004000, 0x00002000, 0x00001000, - 0x00000800, 0x00000400, 0x00000200, 0x00000100, - 0x00000080, 0x00000040, 0x00000020, 0x00000010, - 0x00000008, 0x00000004, 0x00000002, 0x00000001 -}; - -static u_char bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - -static u_long saltbits; -static long old_salt; -static u_long *bits28, *bits24; -static u_char init_perm[64], final_perm[64]; -static u_long en_keysl[16], en_keysr[16]; -static u_long de_keysl[16], de_keysr[16]; -static int des_initialised = 0; -static u_char m_sbox[4][4096]; -static u_long psbox[4][256]; -static u_long ip_maskl[8][256], ip_maskr[8][256]; -static u_long fp_maskl[8][256], fp_maskr[8][256]; -static u_long key_perm_maskl[8][128], key_perm_maskr[8][128]; -static u_long comp_maskl[8][128], comp_maskr[8][128]; -static u_long old_rawkey0, old_rawkey1; - -static u_char ascii64[] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -/* 0000000000111111111122222222223333333333444444444455555555556666 */ -/* 0123456789012345678901234567890123456789012345678901234567890123 */ - -static INLINE int -ascii_to_bin(char ch) -{ - if (ch > 'z') - return(0); - if (ch >= 'a') - return(ch - 'a' + 38); - if (ch > 'Z') - return(0); - if (ch >= 'A') - return(ch - 'A' + 12); - if (ch > '9') - return(0); - if (ch >= '.') - return(ch - '.'); - return(0); -} - -static void -des_init() -{ - int i, j, b, k, inbit, obit; - u_long *p, *il, *ir, *fl, *fr; - - old_rawkey0 = old_rawkey1 = 0L; - saltbits = 0L; - old_salt = 0L; - bits24 = (bits28 = bits32 + 4) + 4; - - /* - * Invert the S-boxes, reordering the input bits. - */ - for (i = 0; i < 8; i++) - for (j = 0; j < 64; j++) { - b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf); - u_sbox[i][j] = sbox[i][b]; - } - - /* - * Convert the inverted S-boxes into 4 arrays of 8 bits. - * Each will handle 12 bits of the S-box input. - */ - for (b = 0; b < 4; b++) - for (i = 0; i < 64; i++) - for (j = 0; j < 64; j++) - m_sbox[b][(i << 6) | j] = - (u_sbox[(b << 1)][i] << 4) | - u_sbox[(b << 1) + 1][j]; - - /* - * Set up the initial & final permutations into a useful form, and - * initialise the inverted key permutation. - */ - for (i = 0; i < 64; i++) { - init_perm[final_perm[i] = IP[i] - 1] = i; - inv_key_perm[i] = 255; - } - - /* - * Invert the key permutation and initialise the inverted key - * compression permutation. - */ - for (i = 0; i < 56; i++) { - u_key_perm[i] = key_perm[i] - 1; - inv_key_perm[key_perm[i] - 1] = i; - inv_comp_perm[i] = 255; - } - - /* - * Invert the key compression permutation. - */ - for (i = 0; i < 48; i++) { - inv_comp_perm[comp_perm[i] - 1] = i; - } - - /* - * Set up the OR-mask arrays for the initial and final permutations, - * and for the key initial and compression permutations. - */ - for (k = 0; k < 8; k++) { - for (i = 0; i < 256; i++) { - *(il = &ip_maskl[k][i]) = 0L; - *(ir = &ip_maskr[k][i]) = 0L; - *(fl = &fp_maskl[k][i]) = 0L; - *(fr = &fp_maskr[k][i]) = 0L; - for (j = 0; j < 8; j++) { - inbit = 8 * k + j; - if (i & bits8[j]) { - if ((obit = init_perm[inbit]) < 32) - *il |= bits32[obit]; - else - *ir |= bits32[obit-32]; - if ((obit = final_perm[inbit]) < 32) - *fl |= bits32[obit]; - else - *fr |= bits32[obit - 32]; - } - } - } - for (i = 0; i < 128; i++) { - *(il = &key_perm_maskl[k][i]) = 0L; - *(ir = &key_perm_maskr[k][i]) = 0L; - for (j = 0; j < 7; j++) { - inbit = 8 * k + j; - if (i & bits8[j + 1]) { - if ((obit = inv_key_perm[inbit]) == 255) - continue; - if (obit < 28) - *il |= bits28[obit]; - else - *ir |= bits28[obit - 28]; - } - } - *(il = &comp_maskl[k][i]) = 0L; - *(ir = &comp_maskr[k][i]) = 0L; - for (j = 0; j < 7; j++) { - inbit = 7 * k + j; - if (i & bits8[j + 1]) { - if ((obit=inv_comp_perm[inbit]) == 255) - continue; - if (obit < 24) - *il |= bits24[obit]; - else - *ir |= bits24[obit - 24]; - } - } - } - } - - /* - * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. - */ - for (i = 0; i < 32; i++) - un_pbox[pbox[i] - 1] = i; - - for (b = 0; b < 4; b++) - for (i = 0; i < 256; i++) { - *(p = &psbox[b][i]) = 0L; - for (j = 0; j < 8; j++) { - if (i & bits8[j]) - *p |= bits32[un_pbox[8 * b + j]]; - } - } - - des_initialised = 1; -} - -static void -setup_salt(long salt) -{ - u_long obit, saltbit; - int i; - - if (salt == old_salt) - return; - old_salt = salt; - - saltbits = 0L; - saltbit = 1; - obit = 0x800000; - for (i = 0; i < 24; i++) { - if (salt & saltbit) - saltbits |= obit; - saltbit <<= 1; - obit >>= 1; - } -} - -static int -des_setkey(const char *key) -{ - u_long k0, k1, rawkey0, rawkey1; - int shifts, round; - - if (!des_initialised) - des_init(); - - rawkey0 = ntohl(*(u_long *) key); - rawkey1 = ntohl(*(u_long *) (key + 4)); - - if ((rawkey0 | rawkey1) - && rawkey0 == old_rawkey0 - && rawkey1 == old_rawkey1) { - /* - * Already setup for this key. - * This optimisation fails on a zero key (which is weak and - * has bad parity anyway) in order to simplify the starting - * conditions. - */ - return(0); - } - old_rawkey0 = rawkey0; - old_rawkey1 = rawkey1; - - /* - * Do key permutation and split into two 28-bit subkeys. - */ - k0 = key_perm_maskl[0][rawkey0 >> 25] - | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskl[4][rawkey1 >> 25] - | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f]; - k1 = key_perm_maskr[0][rawkey0 >> 25] - | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskr[4][rawkey1 >> 25] - | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f]; - /* - * Rotate subkeys and do compression permutation. - */ - shifts = 0; - for (round = 0; round < 16; round++) { - u_long t0, t1; - - shifts += key_shifts[round]; - - t0 = (k0 << shifts) | (k0 >> (28 - shifts)); - t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - - de_keysl[15 - round] = - en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] - | comp_maskl[1][(t0 >> 14) & 0x7f] - | comp_maskl[2][(t0 >> 7) & 0x7f] - | comp_maskl[3][t0 & 0x7f] - | comp_maskl[4][(t1 >> 21) & 0x7f] - | comp_maskl[5][(t1 >> 14) & 0x7f] - | comp_maskl[6][(t1 >> 7) & 0x7f] - | comp_maskl[7][t1 & 0x7f]; - - de_keysr[15 - round] = - en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f] - | comp_maskr[1][(t0 >> 14) & 0x7f] - | comp_maskr[2][(t0 >> 7) & 0x7f] - | comp_maskr[3][t0 & 0x7f] - | comp_maskr[4][(t1 >> 21) & 0x7f] - | comp_maskr[5][(t1 >> 14) & 0x7f] - | comp_maskr[6][(t1 >> 7) & 0x7f] - | comp_maskr[7][t1 & 0x7f]; - } - return(0); -} - -static int -do_des( u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count) -{ - /* - * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. - */ - u_long l, r, *kl, *kr, *kl1, *kr1; - u_long f, r48l, r48r; - int round; - - if (count == 0) { - return(1); - } else if (count > 0) { - /* - * Encrypting - */ - kl1 = en_keysl; - kr1 = en_keysr; - } else { - /* - * Decrypting - */ - count = -count; - kl1 = de_keysl; - kr1 = de_keysr; - } - - /* - * Do initial permutation (IP). - */ - l = ip_maskl[0][l_in >> 24] - | ip_maskl[1][(l_in >> 16) & 0xff] - | ip_maskl[2][(l_in >> 8) & 0xff] - | ip_maskl[3][l_in & 0xff] - | ip_maskl[4][r_in >> 24] - | ip_maskl[5][(r_in >> 16) & 0xff] - | ip_maskl[6][(r_in >> 8) & 0xff] - | ip_maskl[7][r_in & 0xff]; - r = ip_maskr[0][l_in >> 24] - | ip_maskr[1][(l_in >> 16) & 0xff] - | ip_maskr[2][(l_in >> 8) & 0xff] - | ip_maskr[3][l_in & 0xff] - | ip_maskr[4][r_in >> 24] - | ip_maskr[5][(r_in >> 16) & 0xff] - | ip_maskr[6][(r_in >> 8) & 0xff] - | ip_maskr[7][r_in & 0xff]; - - while (count--) { - /* - * Do each round. - */ - kl = kl1; - kr = kr1; - round = 16; - while (round--) { - /* - * Expand R to 48 bits (simulate the E-box). - */ - r48l = ((r & 0x00000001) << 23) - | ((r & 0xf8000000) >> 9) - | ((r & 0x1f800000) >> 11) - | ((r & 0x01f80000) >> 13) - | ((r & 0x001f8000) >> 15); - - r48r = ((r & 0x0001f800) << 7) - | ((r & 0x00001f80) << 5) - | ((r & 0x000001f8) << 3) - | ((r & 0x0000001f) << 1) - | ((r & 0x80000000) >> 31); - /* - * Do salting for crypt() and friends, and - * XOR with the permuted key. - */ - f = (r48l ^ r48r) & saltbits; - r48l ^= f ^ *kl++; - r48r ^= f ^ *kr++; - /* - * Do sbox lookups (which shrink it back to 32 bits) - * and do the pbox permutation at the same time. - */ - f = psbox[0][m_sbox[0][r48l >> 12]] - | psbox[1][m_sbox[1][r48l & 0xfff]] - | psbox[2][m_sbox[2][r48r >> 12]] - | psbox[3][m_sbox[3][r48r & 0xfff]]; - /* - * Now that we've permuted things, complete f(). - */ - f ^= l; - l = r; - r = f; - } - r = l; - l = f; - } - /* - * Do final permutation (inverse of IP). - */ - *l_out = fp_maskl[0][l >> 24] - | fp_maskl[1][(l >> 16) & 0xff] - | fp_maskl[2][(l >> 8) & 0xff] - | fp_maskl[3][l & 0xff] - | fp_maskl[4][r >> 24] - | fp_maskl[5][(r >> 16) & 0xff] - | fp_maskl[6][(r >> 8) & 0xff] - | fp_maskl[7][r & 0xff]; - *r_out = fp_maskr[0][l >> 24] - | fp_maskr[1][(l >> 16) & 0xff] - | fp_maskr[2][(l >> 8) & 0xff] - | fp_maskr[3][l & 0xff] - | fp_maskr[4][r >> 24] - | fp_maskr[5][(r >> 16) & 0xff] - | fp_maskr[6][(r >> 8) & 0xff] - | fp_maskr[7][r & 0xff]; - return(0); -} - -static int -des_cipher(const char *in, char *out, long salt, int count) -{ - u_long l_out, r_out, rawl, rawr; - int retval; - - if (!des_initialised) - des_init(); - - setup_salt(salt); - - rawl = ntohl(*((u_long *) in)++); - rawr = ntohl(*((u_long *) in)); - - retval = do_des(rawl, rawr, &l_out, &r_out, count); - - *((u_long *) out)++ = htonl(l_out); - *((u_long *) out) = htonl(r_out); - return(retval); -} - -char * -crypt(char *key, char *setting) -{ - int i; - u_long count, salt, l, r0, r1, keybuf[2]; - u_char *p, *q; - static u_char output[21]; - - if (!strncmp(setting, "$1$", 3)) - return crypt_md5(key, setting); - - if (!des_initialised) - des_init(); - - - /* - * Copy the key, shifting each character up by one bit - * and padding with zeros. - */ - q = (u_char *) keybuf; - while (q - (u_char *) keybuf - 8) { - if ((*q++ = *key << 1)) - key++; - } - if (des_setkey((u_char *) keybuf)) - return(NULL); - - if (*setting == _PASSWORD_EFMT1) { - /* - * "new"-style: - * setting - underscore, 4 bytes of count, 4 bytes of salt - * key - unlimited characters - */ - for (i = 1, count = 0L; i < 5; i++) - count |= ascii_to_bin(setting[i]) << (i - 1) * 6; - - for (i = 5, salt = 0L; i < 9; i++) - salt |= ascii_to_bin(setting[i]) << (i - 5) * 6; - - while (*key) { - /* - * Encrypt the key with itself. - */ - if (des_cipher((u_char*)keybuf, (u_char*)keybuf, 0L, 1)) - return(NULL); - /* - * And XOR with the next 8 characters of the key. - */ - q = (u_char *) keybuf; - while (q - (u_char *) keybuf - 8 && *key) - *q++ ^= *key++ << 1; - - if (des_setkey((u_char *) keybuf)) - return(NULL); - } - strncpy(output, setting, 9); - - /* - * Double check that we weren't given a short setting. - * If we were, the above code will probably have created - * wierd values for count and salt, but we don't really care. - * Just make sure the output string doesn't have an extra - * NUL in it. - */ - output[9] = '\0'; - p = output + strlen(output); - } else { - /* - * "old"-style: - * setting - 2 bytes of salt - * key - up to 8 characters - */ - count = 25; - - salt = (ascii_to_bin(setting[1]) << 6) - | ascii_to_bin(setting[0]); - - output[0] = setting[0]; - /* - * If the encrypted password that the salt was extracted from - * is only 1 character long, the salt will be corrupted. We - * need to ensure that the output string doesn't have an extra - * NUL in it! - */ - output[1] = setting[1] ? setting[1] : output[0]; - - p = output + 2; - } - setup_salt(salt); - /* - * Do it. - */ - if (do_des(0L, 0L, &r0, &r1, count)) - return(NULL); - /* - * Now encode the result... - */ - l = (r0 >> 8); - *p++ = ascii64[(l >> 18) & 0x3f]; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - - l = (r0 << 16) | ((r1 >> 16) & 0xffff); - *p++ = ascii64[(l >> 18) & 0x3f]; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - - l = r1 << 2; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - *p = 0; - - return(output); -} diff --git a/secure/lib/libcrypt/test/Makefile b/secure/lib/libcrypt/test/Makefile deleted file mode 100644 index b65b09fa5093c..0000000000000 --- a/secure/lib/libcrypt/test/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Hacked Makefile to compile and run the DES-certification program, -# but not install anything. -# -# $Id: Makefile,v 1.3 1994/08/12 21:55:04 csgr Exp $ -# -.if exists (../obj) -OBJDIR = obj -.else -OBJDIR = -.endif - -LIBCRYPT= $(.CURDIR)/../$(OBJDIR)/libdescrypt.a - -#CFLAGS+= -DHAVE_CRYPT16 - -TARGETS=cert speedcrypt - -all: ${TARGETS} - -test: all testcrypt testspeed - -testcrypt: cert - @./cert -c - -testspeed: cryptspeed - -cryptspeed: speedcrypt - @./speedcrypt 30 1 - @./speedcrypt 30 1 - @./speedcrypt 30 0 - @./speedcrypt 30 0 - -cert: cert.c ${LIBCRYPT} - $(CC) $(CFLAGS) -o cert ${.CURDIR}/cert.c ${LIBCRYPT} - -speedcrypt: speedcrypt.c ${LIBCRYPT} - $(CC) $(CFLAGS) -o speedcrypt ${.CURDIR}/speedcrypt.c ${LIBCRYPT} - - -clean: - rm -f ${TARGETS} - -install: - -obj: - -.include diff --git a/secure/lib/libcrypt/test/README b/secure/lib/libcrypt/test/README deleted file mode 100644 index eb6b0bebbc1de..0000000000000 --- a/secure/lib/libcrypt/test/README +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains test programs to certify DES operation and to -time the crypt() call (of curiosity value). - -Simply type `make test` to run the tests. - -The normal `make all` and `make install` that get done during library building -and installation will build these programs BUT NOT INSTALL THEM. After all, -they're only for testing... - -- David Burren, January 1994 diff --git a/secure/lib/libcrypt/test/cert.c b/secure/lib/libcrypt/test/cert.c deleted file mode 100644 index b2e3ae5699800..0000000000000 --- a/secure/lib/libcrypt/test/cert.c +++ /dev/null @@ -1,208 +0,0 @@ -/* - * This DES validation program shipped with FreeSec is derived from that - * shipped with UFC-crypt which is apparently derived from one distributed - * with Phil Karns PD DES package. - * - * $Id: cert.c,v 1.2 1994/08/08 17:29:03 csgr Exp $ - */ - -#include - -int totfails = 0; - -char *crypt(); -#ifdef HAVE_CRYPT16 -char *crypt16(); -#endif /* HAVE_CRYPT16 */ - - -static struct crypt_test { - char *key, *setting, *answer; -} crypt_tests[] = { - "foob", "ar", "arlEKn0OzVJn.", - "holyhooplasbatman!", "_X.......", "_X.......N89y2Z.e4WU", - "holyhooplasbatman!", "_X...X...", "_X...X...rSUDQ5Na/QM", - "holyhooplasbatman!", "_XX..X...", "_XX..X...P8vb9xU4JAk", - "holyhooplasbatman!", "_XX..XX..", "_XX..XX..JDs5IlGLqT2", - "holyhooplasbatman!", "_XX..XXa.", "_XX..XXa.bFVsOnCNh8Y", - "holyhooplasbatman!", "_XXa.X...", "_XXa.X...Ghsb3QKNaps", -#ifdef TAKES_TOO_LONG_ON_SOME_CRYPTS - "holyhooplasbatman!", "_arararar", "_ararararNGMzvpNjeCc", -#endif - NULL, NULL, NULL, -}; - - -static struct crypt_test crypt16_tests[] = { - "foob", "ar", "arxo23jZDD5AYbHbqoy9Dalg", - "holyhooplasbatman!", "ar", "arU5FRLJ3kxIoedlmyrOelEw", - NULL, NULL, NULL -}; - - -void good_bye() -{ - if(totfails == 0) { - printf(" Passed validation\n"); - exit(0); - } else { - printf(" %d failures during validation!!!\n", totfails); - exit(1); - } -} - - -void put8(cp) -char *cp; -{ - int i,j,t; - - for(i = 0; i < 8; i++){ - t = 0; - for(j = 0; j < 8; j++) - t = t << 1 | *cp++; - printf("%02x", t); - } -} - - -void print_bits(bits) -unsigned char *bits; -{ - int i; - - for (i = 0; i < 8; i++) { - printf("%02x", bits[i]); - } -} - - -int parse_line(buff, salt, key, plain, answer) -char *buff; -long *salt; -char *key, *plain, *answer; -{ - char *ptr1, *ptr2; - int val; - int i,j,t; - - /* - * Extract salt - */ - if (sscanf(buff, "%lu", salt) != 1) - return(-1); - for (ptr2 = buff; *ptr2 && !isspace(*ptr2); ptr2++) - ; - - /* - * Extract key - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *key++ = (t & 1 << (7 - j)) != 0; - } - - /* - * Extract plain - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *plain++ = (t & 1 << (7 - j)) != 0; - } - - /* - * Extract answer - */ - for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++) - ; - for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++) - ; - if (ptr2 - ptr1 != 16) - return(-1); - for (i = 0; i < 8; i++){ - if (sscanf(ptr1 + 2*i, "%2x", &t) != 1) - return(-2); - for (j = 0; j < 8; j++) - *answer++ = (t & 1 << (7 - j)) != 0; - } - return(0); -} - -void bytes_to_bits(bytes, bits) -char *bytes; -unsigned char *bits; -{ - int i, j; - - for (i = 0; i < 8; i++) { - bits[i] = 0; - for (j = 0; j < 8; j++) { - bits[i] |= (bytes[i*8+j] & 1) << (7 - j); - } - } -} - - - -/* - * Test the old-style crypt(), the new-style crypt(), and crypt16(). - */ -void test_crypt() -{ - char *result; - struct crypt_test *p; - - printf("Testing crypt() family\n"); - - for (p = crypt_tests; p->key; p++) { - printf(" crypt(\"%s\", \"%s\"), \"%s\" expected", - p->key, p->setting, p->answer); - fflush(stdout); - result = crypt(p->key, p->setting); - if(!strcmp(result, p->answer)) { - printf(", OK\n"); - } else { - printf("\n failed (\"%s\")\n", result); - totfails++; - } - } - -#ifdef HAVE_CRYPT16 - for (p = crypt16_tests; p->key; p++) { - printf(" crypt16(\"%s\", \"%s\"), \"%s\" expected", - p->key, p->setting, p->answer); - fflush(stdout); - result = crypt16(p->key, p->setting); - if(!strcmp(result, p->answer)) { - printf(", OK\n"); - } else { - printf("\n failed (\"%s\")\n", result); - totfails++; - } - } -#endif /* HAVE_CRYPT16 */ -} - -main(argc, argv) -int argc; -char *argv[]; -{ - test_crypt(); - good_bye(); -} diff --git a/secure/lib/libcrypt/test/cert.input b/secure/lib/libcrypt/test/cert.input deleted file mode 100644 index d0fa7a5caf43a..0000000000000 --- a/secure/lib/libcrypt/test/cert.input +++ /dev/null @@ -1,179 +0,0 @@ -# $Id: cert.input,v 1.1.1.1 1994/04/04 14:57:19 g89r4222 Exp $ -# -# Salt, key, plaintext, ciphertext -# -0 0101010101010101 95f8a5e5dd31d900 8000000000000000 -0 0101010101010101 dd7f121ca5015619 4000000000000000 -0 0101010101010101 2e8653104f3834ea 2000000000000000 -0 0101010101010101 4bd388ff6cd81d4f 1000000000000000 -0 0101010101010101 20b9e767b2fb1456 0800000000000000 -0 0101010101010101 55579380d77138ef 0400000000000000 -0 0101010101010101 6cc5defaaf04512f 0200000000000000 -0 0101010101010101 0d9f279ba5d87260 0100000000000000 -0 0101010101010101 d9031b0271bd5a0a 0080000000000000 -0 0101010101010101 424250b37c3dd951 0040000000000000 -0 0101010101010101 b8061b7ecd9a21e5 0020000000000000 -0 0101010101010101 f15d0f286b65bd28 0010000000000000 -0 0101010101010101 add0cc8d6e5deba1 0008000000000000 -0 0101010101010101 e6d5f82752ad63d1 0004000000000000 -0 0101010101010101 ecbfe3bd3f591a5e 0002000000000000 -0 0101010101010101 f356834379d165cd 0001000000000000 -0 0101010101010101 2b9f982f20037fa9 0000800000000000 -0 0101010101010101 889de068a16f0be6 0000400000000000 -0 0101010101010101 e19e275d846a1298 0000200000000000 -0 0101010101010101 329a8ed523d71aec 0000100000000000 -0 0101010101010101 e7fce22557d23c97 0000080000000000 -0 0101010101010101 12a9f5817ff2d65d 0000040000000000 -0 0101010101010101 a484c3ad38dc9c19 0000020000000000 -0 0101010101010101 fbe00a8a1ef8ad72 0000010000000000 -0 0101010101010101 750d079407521363 0000008000000000 -0 0101010101010101 64feed9c724c2faf 0000004000000000 -0 0101010101010101 f02b263b328e2b60 0000002000000000 -0 0101010101010101 9d64555a9a10b852 0000001000000000 -0 0101010101010101 d106ff0bed5255d7 0000000800000000 -0 0101010101010101 e1652c6b138c64a5 0000000400000000 -0 0101010101010101 e428581186ec8f46 0000000200000000 -0 0101010101010101 aeb5f5ede22d1a36 0000000100000000 -0 0101010101010101 e943d7568aec0c5c 0000000080000000 -0 0101010101010101 df98c8276f54b04b 0000000040000000 -0 0101010101010101 b160e4680f6c696f 0000000020000000 -0 0101010101010101 fa0752b07d9c4ab8 0000000010000000 -0 0101010101010101 ca3a2b036dbc8502 0000000008000000 -0 0101010101010101 5e0905517bb59bcf 0000000004000000 -0 0101010101010101 814eeb3b91d90726 0000000002000000 -0 0101010101010101 4d49db1532919c9f 0000000001000000 -0 0101010101010101 25eb5fc3f8cf0621 0000000000800000 -0 0101010101010101 ab6a20c0620d1c6f 0000000000400000 -0 0101010101010101 79e90dbc98f92cca 0000000000200000 -0 0101010101010101 866ecedd8072bb0e 0000000000100000 -0 0101010101010101 8b54536f2f3e64a8 0000000000080000 -0 0101010101010101 ea51d3975595b86b 0000000000040000 -0 0101010101010101 caffc6ac4542de31 0000000000020000 -0 0101010101010101 8dd45a2ddf90796c 0000000000010000 -0 0101010101010101 1029d55e880ec2d0 0000000000008000 -0 0101010101010101 5d86cb23639dbea9 0000000000004000 -0 0101010101010101 1d1ca853ae7c0c5f 0000000000002000 -0 0101010101010101 ce332329248f3228 0000000000001000 -0 0101010101010101 8405d1abe24fb942 0000000000000800 -0 0101010101010101 e643d78090ca4207 0000000000000400 -0 0101010101010101 48221b9937748a23 0000000000000200 -0 0101010101010101 dd7c0bbd61fafd54 0000000000000100 -0 0101010101010101 2fbc291a570db5c4 0000000000000080 -0 0101010101010101 e07c30d7e4e26e12 0000000000000040 -0 0101010101010101 0953e2258e8e90a1 0000000000000020 -0 0101010101010101 5b711bc4ceebf2ee 0000000000000010 -0 0101010101010101 cc083f1e6d9e85f6 0000000000000008 -0 0101010101010101 d2fd8867d50d2dfe 0000000000000004 -0 0101010101010101 06e7ea22ce92708f 0000000000000002 -0 0101010101010101 166b40b44aba4bd6 0000000000000001 -0 8001010101010101 0000000000000000 95a8d72813daa94d -0 4001010101010101 0000000000000000 0eec1487dd8c26d5 -0 2001010101010101 0000000000000000 7ad16ffb79c45926 -0 1001010101010101 0000000000000000 d3746294ca6a6cf3 -0 0801010101010101 0000000000000000 809f5f873c1fd761 -0 0401010101010101 0000000000000000 c02faffec989d1fc -0 0201010101010101 0000000000000000 4615aa1d33e72f10 -0 0180010101010101 0000000000000000 2055123350c00858 -0 0140010101010101 0000000000000000 df3b99d6577397c8 -0 0120010101010101 0000000000000000 31fe17369b5288c9 -0 0110010101010101 0000000000000000 dfdd3cc64dae1642 -0 0108010101010101 0000000000000000 178c83ce2b399d94 -0 0104010101010101 0000000000000000 50f636324a9b7f80 -0 0102010101010101 0000000000000000 a8468ee3bc18f06d -0 0101800101010101 0000000000000000 a2dc9e92fd3cde92 -0 0101400101010101 0000000000000000 cac09f797d031287 -0 0101200101010101 0000000000000000 90ba680b22aeb525 -0 0101100101010101 0000000000000000 ce7a24f350e280b6 -0 0101080101010101 0000000000000000 882bff0aa01a0b87 -0 0101040101010101 0000000000000000 25610288924511c2 -0 0101020101010101 0000000000000000 c71516c29c75d170 -0 0101018001010101 0000000000000000 5199c29a52c9f059 -0 0101014001010101 0000000000000000 c22f0a294a71f29f -0 0101012001010101 0000000000000000 ee371483714c02ea -0 0101011001010101 0000000000000000 a81fbd448f9e522f -0 0101010801010101 0000000000000000 4f644c92e192dfed -0 0101010401010101 0000000000000000 1afa9a66a6df92ae -0 0101010201010101 0000000000000000 b3c1cc715cb879d8 -0 0101010180010101 0000000000000000 19d032e64ab0bd8b -0 0101010140010101 0000000000000000 3cfaa7a7dc8720dc -0 0101010120010101 0000000000000000 b7265f7f447ac6f3 -0 0101010110010101 0000000000000000 9db73b3c0d163f54 -0 0101010108010101 0000000000000000 8181b65babf4a975 -0 0101010104010101 0000000000000000 93c9b64042eaa240 -0 0101010102010101 0000000000000000 5570530829705592 -0 0101010101800101 0000000000000000 8638809e878787a0 -0 0101010101400101 0000000000000000 41b9a79af79ac208 -0 0101010101200101 0000000000000000 7a9be42f2009a892 -0 0101010101100101 0000000000000000 29038d56ba6d2745 -0 0101010101080101 0000000000000000 5495c6abf1e5df51 -0 0101010101040101 0000000000000000 ae13dbd561488933 -0 0101010101020101 0000000000000000 024d1ffa8904e389 -0 0101010101018001 0000000000000000 d1399712f99bf02e -0 0101010101014001 0000000000000000 14c1d7c1cffec79e -0 0101010101012001 0000000000000000 1de5279dae3bed6f -0 0101010101011001 0000000000000000 e941a33f85501303 -0 0101010101010801 0000000000000000 da99dbbc9a03f379 -0 0101010101010401 0000000000000000 b7fc92f91d8e92e9 -0 0101010101010201 0000000000000000 ae8e5caa3ca04e85 -0 0101010101010180 0000000000000000 9cc62df43b6eed74 -0 0101010101010140 0000000000000000 d863dbb5c59a91a0 -0 0101010101010120 0000000000000000 a1ab2190545b91d7 -0 0101010101010110 0000000000000000 0875041e64c570f7 -0 0101010101010108 0000000000000000 5a594528bebef1cc -0 0101010101010104 0000000000000000 fcdb3291de21f0c0 -0 0101010101010102 0000000000000000 869efd7f9f265a09 -0 1046913489980131 0000000000000000 88d55e54f54c97b4 -0 1007103489988020 0000000000000000 0c0cc00c83ea48fd -0 10071034c8980120 0000000000000000 83bc8ef3a6570183 -0 1046103489988020 0000000000000000 df725dcad94ea2e9 -0 1086911519190101 0000000000000000 e652b53b550be8b0 -0 1086911519580101 0000000000000000 af527120c485cbb0 -0 5107b01519580101 0000000000000000 0f04ce393db926d5 -0 1007b01519190101 0000000000000000 c9f00ffc74079067 -0 3107915498080101 0000000000000000 7cfd82a593252b4e -0 3107919498080101 0000000000000000 cb49a2f9e91363e3 -0 10079115b9080140 0000000000000000 00b588be70d23f56 -0 3107911598080140 0000000000000000 406a9a6ab43399ae -0 1007d01589980101 0000000000000000 6cb773611dca9ada -0 9107911589980101 0000000000000000 67fd21c17dbb5d70 -0 9107d01589190101 0000000000000000 9592cb4110430787 -0 1007d01598980120 0000000000000000 a6b7ff68a318ddd3 -0 1007940498190101 0000000000000000 4d102196c914ca16 -0 0107910491190401 0000000000000000 2dfa9f4573594965 -0 0107910491190101 0000000000000000 b46604816c0e0774 -0 0107940491190401 0000000000000000 6e7e6221a4f34e87 -0 19079210981a0101 0000000000000000 aa85e74643233199 -0 1007911998190801 0000000000000000 2e5a19db4d1962d6 -0 10079119981a0801 0000000000000000 23a866a809d30894 -0 1007921098190101 0000000000000000 d812d961f017d320 -0 100791159819010b 0000000000000000 055605816e58608f -0 1004801598190101 0000000000000000 abd88e8b1b7716f1 -0 1004801598190102 0000000000000000 537ac95be69da1e1 -0 1004801598190108 0000000000000000 aed0f6ae3c25cdd8 -0 1002911598100104 0000000000000000 b3e35a5ee53e7b8d -0 1002911598190104 0000000000000000 61c79c71921a2ef8 -0 1002911598100201 0000000000000000 e2f5728f0995013c -0 1002911698100101 0000000000000000 1aeac39a61f0a464 -0 7ca110454a1a6e57 01a1d6d039776742 690f5b0d9a26939b -0 0131d9619dc1376e 5cd54ca83def57da 7a389d10354bd271 -0 07a1133e4a0b2686 0248d43806f67172 868ebb51cab4599a -0 3849674c2602319e 51454b582ddf440a 7178876e01f19b2a -0 04b915ba43feb5b6 42fd443059577fa2 af37fb421f8c4095 -0 0113b970fd34f2ce 059b5e0851cf143a 86a560f10ec6d85b -0 0170f175468fb5e6 0756d8e0774761d2 0cd3da020021dc09 -0 43297fad38e373fe 762514b829bf486a ea676b2cb7db2b7a -0 07a7137045da2a16 3bdd119049372802 dfd64a815caf1a0f -0 04689104c2fd3b2f 26955f6835af609a 5c513c9c4886c088 -0 37d06bb516cb7546 164d5e404f275232 0a2aeeae3ff4ab77 -0 1f08260d1ac2465e 6b056e18759f5cca ef1bf03e5dfa575a -0 584023641aba6176 004bd6ef09176062 88bf0db6d70dee56 -0 025816164629b007 480d39006ee762f2 a1f9915541020b56 -0 49793ebc79b3258f 437540c8698f3cfa 6fbf1cafcffd0556 -0 4fb05e1515ab73a7 072d43a077075292 2f22e49bab7ca1ac -0 49e95d6d4ca229bf 02fe55778117f12a 5a6b612cc26cce4a -0 018310dc409b26d6 1d9d5c5018f728c2 5f4c038ed12b2e41 -0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793 -1 1c587f1c13924fef 305532286d6f295a 400d307ca24fee60 -57 1c587f1c13924fef 305532286d6f295a 28b568f40e7d43ae -1 8001010101010101 0000000000000000 f501029f268e45dc -0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793 diff --git a/secure/lib/libcrypt/test/speedcrypt.c b/secure/lib/libcrypt/test/speedcrypt.c deleted file mode 100644 index f7507fd789f04..0000000000000 --- a/secure/lib/libcrypt/test/speedcrypt.c +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include -#include -#include - -int keep_going, count, alternate, seconds; -struct rusage prior, now; - -void -finish() -{ - keep_going = 0; -} - - -main(int argc, char *argv[]) -{ - struct itimerval itv; - u_long msecs, key1[8], key2[8]; - char *k1, *k2; - - if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1) - seconds = 20; - - if (argc < 3 || sscanf(argv[2], "%d", &alternate) != 1) - alternate = 0; - - printf ("Running crypt%s for %d seconds of vtime...\n", - alternate ? " with alternate keys" : "", seconds); - - bzero(&itv, sizeof (itv)); - signal (SIGVTALRM, finish); - itv.it_value.tv_sec = seconds; - itv.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL, &itv, NULL); - - keep_going = 1; - if (getrusage(0, &prior) < 0) { - perror("getrusage"); - exit(1); - } - - k1 = (char *) key1; - k2 = (char *) key2; - strcpy(k1, "fredfredfredfredfred"); - strcpy(k2, "joejoejoejoejoejoejo"); - - if (alternate) - for (count = 0; keep_going; count++) - { -#if defined(LONGCRYPT) - crypt((count & 1) ? k1 : k2, "_ara.X..."); -#else - crypt((count & 1) ? k1 : k2, "eek"); -#endif - } - else - for (count = 0; keep_going; count++) - { -#if defined(LONGCRYPT) - crypt(k1, "_ara.X..."); -#else - crypt(k1, "eek"); -#endif - } - - if (getrusage(0, &now) < 0) { - perror("getrusage"); - exit(1); - } - msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000 - + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000; - printf ("\tDid %d crypt()s per second.\n", 1000 * count / msecs); - exit(0); -} diff --git a/secure/lib/libdes/COPYRIGHT b/secure/lib/libdes/COPYRIGHT deleted file mode 100644 index dc789d4fdce90..0000000000000 --- a/secure/lib/libdes/COPYRIGHT +++ /dev/null @@ -1,50 +0,0 @@ -Copyright (C) 1995 Eric Young (eay@mincom.oz.au) -All rights reserved. - -This package is an DES implementation written by Eric Young (eay@mincom.oz.au). -The implementation was written so as to conform with MIT's libdes. - -This library is free for commercial and non-commercial use as long as -the following conditions are aheared to. The following conditions -apply to all code found in this distribution. - -Copyright remains Eric Young's, and as such any Copyright notices in -the code are not to be removed. -If this package is used in a product, Eric Young should be given attribution -as the author of that the SSL library. This can be in the form of a textual -message at program startup or in documentation (online or textual) provided -with the package. - -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 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by Eric Young (eay@mincom.oz.au) - -THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - -The license and distribution terms for any publically available version or -derivative of this code cannot be changed. i.e. this code cannot simply be -copied and put under another distrubution license -[including the GNU Public License.] - -The reason behind this being stated in this direct manner is past -experience in code simply being copied and the attribution removed -from it and then being distributed as part of other packages. This -implementation was a non-trivial and unpaid effort. diff --git a/secure/lib/libdes/DES.pm b/secure/lib/libdes/DES.pm deleted file mode 100644 index 6a175b6ca4b04..0000000000000 --- a/secure/lib/libdes/DES.pm +++ /dev/null @@ -1,19 +0,0 @@ -package DES; - -require Exporter; -require DynaLoader; -@ISA = qw(Exporter DynaLoader); -# Items to export into callers namespace by default -# (move infrequently used names to @EXPORT_OK below) -@EXPORT = qw( -); -# Other items we are prepared to export if requested -@EXPORT_OK = qw( -crypt -); - -# Preloaded methods go here. Autoload methods go after __END__, and are -# processed by the autosplit program. -bootstrap DES; -1; -__END__ diff --git a/secure/lib/libdes/DES.pod b/secure/lib/libdes/DES.pod deleted file mode 100644 index 8a739e7ca0d01..0000000000000 --- a/secure/lib/libdes/DES.pod +++ /dev/null @@ -1,16 +0,0 @@ -crypt <= crypt(buf,salt) -key <= set_odd_parity(key) -int <= is_weak_key(key) -keysched<= set_key(key) -key <= ecb_encrypt(string8,ks,enc) -key <= ecb3_encrypt(input,ks1,ks2,enc) -string <= cbc_encrypt(input,ks,ivec,enc) => ivec -string <= cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,enc) => ivec1&ivec2 -ck1,ck2 <= cbc_cksum(input,ks,ivec) => ivec -string <= pcbc_encrypt(input,ks,ivec,enc) => ivec -string <= ofb_encrypt(input,numbits,ks,ivec) => ivec -string <= cfb_encrypt(input,numbits,ks,ivec,enc) => ivec -key <= random_key() -key <= string_to_key(string) -key1,key2<= string_to_2keys(string) - diff --git a/secure/lib/libdes/DES.xs b/secure/lib/libdes/DES.xs deleted file mode 100644 index def220b36b1dd..0000000000000 --- a/secure/lib/libdes/DES.xs +++ /dev/null @@ -1,268 +0,0 @@ -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" -#include "des.h" - -#define deschar char -static STRLEN len; - -static int -not_here(s) -char *s; -{ - croak("%s not implemented on this architecture", s); - return -1; -} - -MODULE = DES PACKAGE = DES PREFIX = des_ - -char * -des_crypt(buf,salt) - char * buf - char * salt - -void -des_set_odd_parity(key) - des_cblock * key -PPCODE: - { - SV *s; - - s=sv_newmortal(); - sv_setpvn(s,(char *)key,8); - des_set_odd_parity((des_cblock *)SvPV(s,na)); - PUSHs(s); - } - -int -des_is_weak_key(key) - des_cblock * key - -des_key_schedule -des_set_key(key) - des_cblock * key -CODE: - des_set_key(key,RETVAL); -OUTPUT: -RETVAL - -des_cblock -des_ecb_encrypt(input,ks,encrypt) - des_cblock * input - des_key_schedule * ks - int encrypt -CODE: - des_ecb_encrypt(input,&RETVAL,*ks,encrypt); -OUTPUT: -RETVAL - -void -des_cbc_encrypt(input,ks,ivec,encrypt) - char * input - des_key_schedule * ks - des_cblock * ivec - int encrypt -PPCODE: - { - SV *s; - STRLEN len,l; - char *c; - - l=SvCUR(ST(0)); - len=((((unsigned long)l)+7)/8)*8; - s=sv_newmortal(); - sv_setpvn(s,"",0); - SvGROW(s,len); - SvCUR_set(s,len); - c=(char *)SvPV(s,na); - des_cbc_encrypt((des_cblock *)input,(des_cblock *)c, - l,*ks,ivec,encrypt); - sv_setpvn(ST(2),(char *)c[len-8],8); - PUSHs(s); - } - -void -des_cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,encrypt) - char * input - des_key_schedule * ks1 - des_key_schedule * ks2 - des_cblock * ivec1 - des_cblock * ivec2 - int encrypt -PPCODE: - { - SV *s; - STRLEN len,l; - - l=SvCUR(ST(0)); - len=((((unsigned long)l)+7)/8)*8; - s=sv_newmortal(); - sv_setpvn(s,"",0); - SvGROW(s,len); - SvCUR_set(s,len); - des_3cbc_encrypt((des_cblock *)input,(des_cblock *)SvPV(s,na), - l,*ks1,*ks2,ivec1,ivec2,encrypt); - sv_setpvn(ST(3),(char *)ivec1,8); - sv_setpvn(ST(4),(char *)ivec2,8); - PUSHs(s); - } - -void -des_cbc_cksum(input,ks,ivec) - char * input - des_key_schedule * ks - des_cblock * ivec -PPCODE: - { - SV *s1,*s2; - STRLEN len,l; - des_cblock c; - unsigned long i1,i2; - - s1=sv_newmortal(); - s2=sv_newmortal(); - l=SvCUR(ST(0)); - des_cbc_cksum((des_cblock *)input,(des_cblock *)c, - l,*ks,ivec); - i1=c[4]|(c[5]<<8)|(c[6]<<16)|(c[7]<<24); - i2=c[0]|(c[1]<<8)|(c[2]<<16)|(c[3]<<24); - sv_setiv(s1,i1); - sv_setiv(s2,i2); - sv_setpvn(ST(2),(char *)c,8); - PUSHs(s1); - PUSHs(s2); - } - -void -des_cfb_encrypt(input,numbits,ks,ivec,encrypt) - char * input - int numbits - des_key_schedule * ks - des_cblock * ivec - int encrypt -PPCODE: - { - SV *s; - STRLEN len; - char *c; - - len=SvCUR(ST(0)); - s=sv_newmortal(); - sv_setpvn(s,"",0); - SvGROW(s,len); - SvCUR_set(s,len); - c=(char *)SvPV(s,na); - des_cfb_encrypt((unsigned char *)input,(unsigned char *)c, - (int)numbits,(long)len,*ks,ivec,encrypt); - sv_setpvn(ST(3),(char *)ivec,8); - PUSHs(s); - } - -des_cblock * -des_ecb3_encrypt(input,ks1,ks2,encrypt) - des_cblock * input - des_key_schedule * ks1 - des_key_schedule * ks2 - int encrypt -CODE: - { - des_cblock c; - - des_3ecb_encrypt((des_cblock *)input,(des_cblock *)&c, - *ks1,*ks2,encrypt); - RETVAL= &c; - } -OUTPUT: -RETVAL - -void -des_ofb_encrypt(input,numbits,ks,ivec) - unsigned char * input - int numbits - des_key_schedule * ks - des_cblock * ivec -PPCODE: - { - SV *s; - STRLEN len,l; - unsigned char *c; - - len=SvCUR(ST(0)); - s=sv_newmortal(); - sv_setpvn(s,"",0); - SvGROW(s,len); - SvCUR_set(s,len); - c=(unsigned char *)SvPV(s,na); - des_ofb_encrypt((unsigned char *)input,(unsigned char *)c, - numbits,len,*ks,ivec); - sv_setpvn(ST(3),(char *)ivec,8); - PUSHs(s); - } - -void -des_pcbc_encrypt(input,ks,ivec,encrypt) - char * input - des_key_schedule * ks - des_cblock * ivec - int encrypt -PPCODE: - { - SV *s; - STRLEN len,l; - char *c; - - l=SvCUR(ST(0)); - len=((((unsigned long)l)+7)/8)*8; - s=sv_newmortal(); - sv_setpvn(s,"",0); - SvGROW(s,len); - SvCUR_set(s,len); - c=(char *)SvPV(s,na); - des_pcbc_encrypt((des_cblock *)input,(des_cblock *)c, - l,*ks,ivec,encrypt); - sv_setpvn(ST(2),(char *)c[len-8],8); - PUSHs(s); - } - -des_cblock * -des_random_key() -CODE: - { - des_cblock c; - - des_random_key(c); - RETVAL=&c; - } -OUTPUT: -RETVAL - -des_cblock * -des_string_to_key(str) -char * str -CODE: - { - des_cblock c; - - des_string_to_key(str,&c); - RETVAL=&c; - } -OUTPUT: -RETVAL - -void -des_string_to_2keys(str) -char * str -PPCODE: - { - des_cblock c1,c2; - SV *s1,*s2; - - des_string_to_2keys(str,&c1,&c2); - EXTEND(sp,2); - s1=sv_newmortal(); - sv_setpvn(s1,(char *)c1,8); - s2=sv_newmortal(); - sv_setpvn(s2,(char *)c2,8); - PUSHs(s1); - PUSHs(s2); - } diff --git a/secure/lib/libdes/FILES b/secure/lib/libdes/FILES deleted file mode 100644 index f8b0c8108179f..0000000000000 --- a/secure/lib/libdes/FILES +++ /dev/null @@ -1,96 +0,0 @@ -/* General stuff */ -COPYRIGHT - Copyright info. -MODES.DES - A description of the features of the different modes of DES. -FILES - This file. -INSTALL - How to make things compile. -Imakefile - For use with kerberos. -README - What this package is. -VERSION - Which version this is and what was changed. -KERBEROS - Kerberos version 4 notes. -Makefile.PL - An old makefile to build with perl5, not current. -Makefile.ssl - The SSLeay makefile -Makefile.uni - The normal unix makefile. -GNUmakefile - The makefile for use with glibc. -makefile.bc - A Borland C makefile -times - Some outputs from 'speed' on some machines. -vms.com - For use when compiling under VMS - -/* My SunOS des(1) replacement */ -des.c - des(1) source code. -des.man - des(1) manual. - -/* Testing and timing programs. */ -destest.c - Source for libdes.a test program. -speed.c - Source for libdes.a timing program. -rpw.c - Source for libdes.a testing password reading routines. - -/* libdes.a source code */ -des_crypt.man - libdes.a manual page. -des.h - Public libdes.a header file. -ecb_enc.c - des_ecb_encrypt() source, this contains the basic DES code. -ecb3_enc.c - des_ecb3_encrypt() source. -cbc_ckm.c - des_cbc_cksum() source. -cbc_enc.c - des_cbc_encrypt() source. -ncbc_enc.c - des_cbc_encrypt() that is 'normal' in that it copies - the new iv values back in the passed iv vector. -ede_enc.c - des_ede3_cbc_encrypt() cbc mode des using triple DES. -cbc3_enc.c - des_3cbc_encrypt() source, don't use this function. -cfb_enc.c - des_cfb_encrypt() source. -cfb64enc.c - des_cfb64_encrypt() cfb in 64 bit mode but setup to be - used as a stream cipher. -cfb64ede.c - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be - used as a stream cipher and using triple DES. -ofb_enc.c - des_cfb_encrypt() source. -ofb64_enc.c - des_ofb_encrypt() ofb in 64 bit mode but setup to be - used as a stream cipher. -ofb64ede.c - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be - used as a stream cipher and using triple DES. -enc_read.c - des_enc_read() source. -enc_writ.c - des_enc_write() source. -pcbc_enc.c - des_pcbc_encrypt() source. -qud_cksm.c - quad_cksum() source. -rand_key.c - des_random_key() source. -read_pwd.c - Source for des_read_password() plus related functions. -set_key.c - Source for des_set_key(). -str2key.c - Covert a string of any length into a key. -fcrypt.c - A small, fast version of crypt(3). -des_locl.h - Internal libdes.a header file. -podd.h - Odd parity tables - used in des_set_key(). -sk.h - Lookup tables used in des_set_key(). -spr.h - What is left of the S tables - used in ecb_encrypt(). -version.h - header file for the external definition of the - version string. -des.doc - SSLeay documentation for the library. - -/* The perl scripts - you can ignore these files they are only - * included for the curious */ -des.pl - des in perl anyone? des_set_key and des_ecb_encrypt - both done in a perl library. -testdes.pl - Testing program for des.pl -doIP - Perl script used to develop IP xor/shift code. -doPC1 - Perl script used to develop PC1 xor/shift code. -doPC2 - Generates sk.h. -PC1 - Output of doPC1 should be the same as output from PC1. -PC2 - used in development of doPC2. -shifts.pl - Perl library used by my perl scripts. - -/* I started making a perl5 dynamic library for libdes - * but did not fully finish, these files are part of that effort. */ -DES.pm -DES.pod -DES.xs -t -typemap - -/* The following are for use with sun RPC implementaions. */ -rpc_des.h -rpc_enc.c - -/* The following are contibuted by Mark Murray . They - * are not normally built into libdes due to machine specific routines - * contained in them. They are for use in the most recent incarnation of - * export kerberos v 4 (eBones). */ -supp.c -new_rkey.c - - diff --git a/secure/lib/libdes/GNUmakefile b/secure/lib/libdes/GNUmakefile deleted file mode 100644 index 6372d08ec8562..0000000000000 --- a/secure/lib/libdes/GNUmakefile +++ /dev/null @@ -1,35 +0,0 @@ -# This was GNUmakefile -# I have changed the library a bit since I was last able to test the -# build so this may require a little tweaking. -# have fun. - -ifeq ($(wildcard ../Rules),) -# no glibc -include Makefile.uni -else -# We are part of glibc -default_cflags:= -O2 -subdir := des -headers:= des.h rpc_des.h - -routines:= $(destest) - cbc3_enc cbc_cksm cbc_enc cfb64enc cfb_enc \ - ecb3_enc ecb_enc ede_enc enc_read enc_writ \ - fcrypt ncbc_enc ofb64enc ofb_enc pcbc_enc \ - qud_cksm rand_key read_pwd rpc_enc set_key \ - str2key cfb64ede ofb64ede supp -distribute:= ARTISTIC COPYRIGHT FILES INSTALL Imakefile README VERSION \ - GNUmakefile times vms.com KERBEROS MODES.DES \ - des.man des_crypt.man \ - version.h des_locl.h podd.h sk.h spr.h \ - des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl \ - des.doc makefile.bc - -tests:= destest speed -override +gccwarn := -w -others:= des rpw -install:= des - -include ../Rules -endif - diff --git a/secure/lib/libdes/INSTALL b/secure/lib/libdes/INSTALL deleted file mode 100644 index c8cc5bebd6e2b..0000000000000 --- a/secure/lib/libdes/INSTALL +++ /dev/null @@ -1,57 +0,0 @@ -Check the CC and CFLAGS lines in the makefile - -If your C library does not support the times(3) function, change the -#define TIMES to -#undef TIMES in speed.c -If it does, check the HZ value for the times(3) function. -If your system does not define CLK_TCK it will be assumed to -be 100.0. - -If possible use gcc v 2.7.? -Turn on the maximum optimising (normally '-O3 -fomit-frame-pointer' for gcc) - -type 'make' - -run './destest' to check things are ok. -run './rpw' to check the tty code for reading passwords works. -run './speed' to see how fast those optimisations make the library run :-) - -A make install will by default install -libdes.a in /usr/local/lib/libdes.a -des in /usr/local/bin/des -des_crypt.man in /usr/local/man/man3/des_crypt.3 -des.man in /usr/local/man/man1/des.1 -des.h in /usr/include/des.h - -des(1) should be compatible with sunOS's but I have been unable to -test it. - -These routines should compile on MSDOS, most 32bit and 64bit version -of Unix (BSD and SYSV) and VMS, without modification. -The only problems should be #include files that are in the wrong places. - -These routines can be compiled under MSDOS. -I have successfully encrypted files using des(1) under MSDOS and then -decrypted the files on a SparcStation. -I have been able to compile and test the routines with -Microsoft C v 5.1 and Turbo C v 2.0. -The code in this library is in no way optimised for the 16bit -operation of MSDOS. Microsoft C generates code that is 40% slower -than Turbo C's code. I believe this is due to problems it has with -code generation with the 32bit shift operation in the IP and FP -sections. I have added some 16bit optimization in ecb_encrypt.c -and this generated a %70 speedup under Turbo C. Such are the -limitations of DOS compilers :-(. - -For Turbo C v 2.0, make sure to define MSDOS, in the relevant menu. - -There is an alternative version of the D_ENCRYPT macro that can be -enabled with the -DDES_USE_PTR option in the makefile. This alternative -macro can make a +-%20 speed difference to the DES encryption speed, -depending on the compiler/CPU combinations. -It has its greatest effect on Sparc machines when using the sun compiler. -If in doubt, try enable/disable it and running speed. It does not -seem to affect gcc much. - -When building for glibc, ignore all of the above and just unpack into -glibc-1.??/des and then gmake as per normal. diff --git a/secure/lib/libdes/Imakefile b/secure/lib/libdes/Imakefile deleted file mode 100644 index c4592f23a1672..0000000000000 --- a/secure/lib/libdes/Imakefile +++ /dev/null @@ -1,35 +0,0 @@ -# This Imakefile has not been tested for a while but it should still -# work when placed in the correct directory in the kerberos v 4 distribution - -SRCS= cbc_cksm.c cbc_enc.c ecb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c read_pwd.c set_key.c str2key.c \ - enc_read.c enc_writ.c fcrypt.c cfb_enc.c \ - 3ecb_enc.c ofb_enc.c ofb64enc.c - -OBJS= cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \ - qud_cksm.o rand_key.o read_pwd.o set_key.o str2key.o \ - enc_read.o enc_writ.o fcrypt.o cfb_enc.o \ - 3ecb_enc.o ofb_enc.o ofb64enc.o - -GENERAL=COPYRIGHT FILES INSTALL Imakefile README VERSION makefile times \ - vms.com KERBEROS -DES= des.c des.man -TESTING=destest.c speed.c rpw.c -LIBDES= des_crypt.man des.h des_locl.h podd.h sk.h spr.h - -PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl - -CODE= $(GENERAL) $(DES) $(TESTING) $(SRCS) $(LIBDES) $(PERL) - -SRCDIR=$(SRCTOP)/lib/des - -DBG= -O -INCLUDE= -I$(SRCDIR) -CC= cc - -library_obj_rule() - -install_library_target(des,$(OBJS),$(SRCS),) - -test(destest,libdes.a,) -test(rpw,libdes.a,) diff --git a/secure/lib/libdes/KERBEROS b/secure/lib/libdes/KERBEROS deleted file mode 100644 index f401b10014ffb..0000000000000 --- a/secure/lib/libdes/KERBEROS +++ /dev/null @@ -1,41 +0,0 @@ - [ This is an old file, I don't know if it is true anymore - but I will leave the file here - eay 21/11/95 ] - -To use this library with Bones (kerberos without DES): -1) Get my modified Bones - eBones. It can be found on - gondwana.ecr.mu.oz.au (128.250.1.63) /pub/athena/eBones-p9.tar.Z - and - nic.funet.fi (128.214.6.100) /pub/unix/security/Kerberos/eBones-p9.tar.Z - -2) Unpack this library in src/lib/des, makeing sure it is version - 3.00 or greater (libdes.tar.93-10-07.Z). This versions differences - from the version in comp.sources.misc volume 29 patchlevel2. - The primarily difference is that it should compile under kerberos :-). - It can be found at. - ftp.psy.uq.oz.au (130.102.32.1) /pub/DES/libdes.tar.93-10-07.Z - -Now do a normal kerberos build and things should work. - -One problem I found when I was build on my local sun. ---- -For sunOS 4.1.1 apply the following patch to src/util/ss/make_commands.c - -*** make_commands.c.orig Fri Jul 3 04:18:35 1987 ---- make_commands.c Wed May 20 08:47:42 1992 -*************** -*** 98,104 **** - if (!rename(o_file, z_file)) { - if (!vfork()) { - chdir("/tmp"); -! execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r", "-n", - z_file+5, 0); - perror("/bin/ld"); - _exit(1); ---- 98,104 ---- - if (!rename(o_file, z_file)) { - if (!vfork()) { - chdir("/tmp"); -! execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r", - z_file+5, 0); - perror("/bin/ld"); - _exit(1); diff --git a/secure/lib/libdes/MODES.DES b/secure/lib/libdes/MODES.DES deleted file mode 100644 index 18934b56c335c..0000000000000 --- a/secure/lib/libdes/MODES.DES +++ /dev/null @@ -1,84 +0,0 @@ -Modes of DES -Quite a bit of the following information has been taken from - AS 2805.5.2 - Australian Standard - Electronic funds transfer - Requirements for interfaces, - Part 5.2: Modes of operation for an n-bit block cipher algorithm - Appendix A - -There are several different modes in which DES can be used, they are -as follows. - -Electronic Codebook Mode (ECB) (des_ecb_encrypt()) -- 64 bits are enciphered at a time. -- The order of the blocks can be rearranged without detection. -- The same plaintext block always produces the same ciphertext block - (for the same key) making it vulnerable to a 'dictionary attack'. -- An error will only affect one ciphertext block. - -Cipher Block Chaining Mode (CBC) (des_cbc_encrypt()) -- a multiple of 64 bits are enciphered at a time. -- The CBC mode produces the same ciphertext whenever the same - plaintext is encrypted using the same key and starting variable. -- The chaining operation makes the ciphertext blocks dependent on the - current and all preceding plaintext blocks and therefore blocks can not - be rearranged. -- The use of different starting variables prevents the same plaintext - enciphering to the same ciphertext. -- An error will affect the current and the following ciphertext blocks. - -Cipher Feedback Mode (CFB) (des_cfb_encrypt()) -- a number of bits (j) <= 64 are enciphered at a time. -- The CFB mode produces the same ciphertext whenever the same - plaintext is encrypted using the same key and starting variable. -- The chaining operation makes the ciphertext variables dependent on the - current and all preceding variables and therefore j-bit variables are - chained together and con not be rearranged. -- The use of different starting variables prevents the same plaintext - enciphering to the same ciphertext. -- The strength of the CFB mode depends on the size of k (maximal if - j == k). In my implementation this is always the case. -- Selection of a small value for j will require more cycles through - the encipherment algorithm per unit of plaintext and thus cause - greater processing overheads. -- Only multiples of j bits can be enciphered. -- An error will affect the current and the following ciphertext variables. - -Output Feedback Mode (OFB) (des_ofb_encrypt()) -- a number of bits (j) <= 64 are enciphered at a time. -- The OFB mode produces the same ciphertext whenever the same - plaintext enciphered using the same key and starting variable. More - over, in the OFB mode the same key stream is produced when the same - key and start variable are used. Consequently, for security reasons - a specific start variable should be used only once for a given key. -- The absence of chaining makes the OFB more vulnerable to specific attacks. -- The use of different start variables values prevents the same - plaintext enciphering to the same ciphertext, by producing different - key streams. -- Selection of a small value for j will require more cycles through - the encipherment algorithm per unit of plaintext and thus cause - greater processing overheads. -- Only multiples of j bits can be enciphered. -- OFB mode of operation does not extend ciphertext errors in the - resultant plaintext output. Every bit error in the ciphertext causes - only one bit to be in error in the deciphered plaintext. -- OFB mode is not self-synchronising. If the two operation of - encipherment and decipherment get out of synchronism, the system needs - to be re-initialised. -- Each re-initialisation should use a value of the start variable -different from the start variable values used before with the same -key. The reason for this is that an identical bit stream would be -produced each time from the same parameters. This would be -susceptible to a 'known plaintext' attack. - -Triple ECB Mode (des_3ecb_encrypt()) -- Encrypt with key1, decrypt with key2 and encrypt with key1 again. -- As for ECB encryption but increases the effective key length to 112 bits. -- If both keys are the same it is equivalent to encrypting once with - just one key. - -Triple CBC Mode (des_3cbc_encrypt()) -- Encrypt with key1, decrypt with key2 and encrypt with key1 again. -- As for CBC encryption but increases the effective key length to 112 bits. -- If both keys are the same it is equivalent to encrypting once with - just one key. diff --git a/secure/lib/libdes/Makefile b/secure/lib/libdes/Makefile deleted file mode 100644 index 006cda2206661..0000000000000 --- a/secure/lib/libdes/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# @(#)Makefile 5.4 (Berkeley) 5/7/91 -# $Id$ - -LIB= des -SRCS= cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ - ecb3_enc.c ecb_enc.c ede_enc.c enc_read.c enc_writ.c \ - ncbc_enc.c new_rkey.c ofb64enc.c ofb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ - str2key.c cfb64ede.c ofb64ede.c supp.c -HEADER= des.h - -SHLIB_MAJOR= 2 -SHLIB_MINOR= 1 - -CFLAGS+= -Wall - -MAN3= des_crypt.3 -MANSRC= . -CLEANFILES += ${MAN3} -MANDEPEND = ${MAN3} - -MLINKS= des_crypt.3 des_read_password.3 \ - des_crypt.3 des_read_2password.3 des_crypt.3 des_string_to_key.3 \ - des_crypt.3 des_string_to_2key.3 des_crypt.3 des_read_pw_string.3 \ - des_crypt.3 des_random_key.3 des_crypt.3 des_set_key.3 \ - des_crypt.3 des_key_sched.3 des_crypt.3 des_ecb_encrypt.3 \ - des_crypt.3 des_3ecb_encrypt.3 des_crypt.3 des_cbc_encrypt.3 \ - des_crypt.3 des_3cbc_encrypt.3 des_crypt.3 des_pcbc_encrypt.3 \ - des_crypt.3 des_cfb_encrypt.3 des_crypt.3 des_ofb_encrypt.3 \ - des_crypt.3 des_cbc_cksum.3 des_crypt.3 des_quad_cksum.3 \ - des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \ - des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3 - -beforeinstall: - -cd ${.CURDIR}; for file in ${HEADER}; do \ - cmp -s $$file ${DESTDIR}/usr/include/$$file || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$file \ - ${DESTDIR}/usr/include; done - -.include - -${MAN3}: des_crypt.man - @cp $? $@ diff --git a/secure/lib/libdes/Makefile.PL b/secure/lib/libdes/Makefile.PL deleted file mode 100644 index 41a7e0fbba104..0000000000000 --- a/secure/lib/libdes/Makefile.PL +++ /dev/null @@ -1,14 +0,0 @@ -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile being created. -&writeMakefile( - 'potential_libs' => '', # e.g., '-lm' - 'INC' => '', # e.g., '-I/usr/include/other' - 'DISTNAME' => 'DES', - 'VERSION' => '0.1', - 'DEFINE' => '-DPERL5', - 'OBJECT' => 'DES.o cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \ - rand_key.o set_key.o str2key.o \ - enc_read.o enc_writ.o fcrypt.o cfb_enc.o \ - ecb3_enc.o ofb_enc.o cbc3_enc.o', - ); diff --git a/secure/lib/libdes/Makefile.ssl b/secure/lib/libdes/Makefile.ssl deleted file mode 100644 index dec44565c466c..0000000000000 --- a/secure/lib/libdes/Makefile.ssl +++ /dev/null @@ -1,89 +0,0 @@ -# -# SSLeay/crypto/des/Makefile -# - -DIR= des -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl -MAKEDEPEND= makedepend -fMakefile.ssl -MAKEFILE= Makefile.ssl - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST=destest.c -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC= cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ - ecb3_enc.c ecb_enc.c ede_enc.c enc_read.c enc_writ.c \ - fcrypt.c ncbc_enc.c ofb64enc.c ofb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ - str2key.c cfb64ede.c ofb64ede.c supp.c - -LIBOBJ= cbc3_enc.o cbc_cksm.o cbc_enc.o cfb64enc.o cfb_enc.o \ - ecb3_enc.o ecb_enc.o ede_enc.o enc_read.o enc_writ.o \ - fcrypt.o ncbc_enc.o ofb64enc.o ofb_enc.o pcbc_enc.o \ - qud_cksm.o rand_key.o read_pwd.o rpc_enc.o set_key.o \ - str2key.o cfb64ede.o ofb64ede.o supp.o - -SRC= $(LIBSRC) - -EXHEADER= des.h -HEADER= des_locl.h rpc_des.h podd.h sk.h spr.h version.h $(EXHEADER) - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - ar r $(LIB) $(LIBOBJ) - $(TOP)/util/ranlib.sh $(LIB) - @touch lib - -links: - /bin/rm -f Makefile - $(TOP)/util/point.sh Makefile.ssl Makefile - /bin/rm -f des.doc - $(TOP)/util/point.sh ../../doc/des.doc . - $(TOP)/util/mklink.sh ../../include $(EXHEADER) - $(TOP)/util/mklink.sh ../../test $(TEST) - $(TOP)/util/mklink.sh ../../apps $(APPS) - -install: installs - -installs: - @for i in $(EXHEADER) ; \ - do \ - (cp $$i $(INSTALLTOP)/include/$$i; \ - chmod 644 $(INSTALLTOP)/include/$$i ) \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -depend: - $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) - -dclean: - sed -e '/^# DO NOT DELETE THIS LINE/ q' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - /bin/rm -f *.o *.obj lib tags core .nfs* *.old *.bak fluff - -errors: - -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/secure/lib/libdes/Makefile.uni b/secure/lib/libdes/Makefile.uni deleted file mode 100644 index 972a84505af2b..0000000000000 --- a/secure/lib/libdes/Makefile.uni +++ /dev/null @@ -1,149 +0,0 @@ -# You must select the correct terminal control system to be used to -# turn character echo off when reading passwords. There a 5 systems -# SGTTY - the old BSD system -# TERMIO - most system V boxes -# TERMIOS - SGI (ala IRIX). -# VMS - the DEC operating system -# MSDOS - we all know what it is :-) -# read_pwd.c makes a reasonable guess at what is correct. - -OPTS0= -DRAND -DTERMIO #-DNOCONST - -# Version 1.94 has changed the strings_to_key function so that it is -# now compatible with MITs when the string is longer than 8 characters. -# If you wish to keep the old version, uncomment the following line. -# This will affect the -E/-D options on des(1). -#OPTS1= -DOLD_STR_TO_KEY - -# This #define specifies the use of an alternative D_ENCRYPT macro in -# ecb_encrypt. The choice of macro can make a %20 difference in the -# speed. Unfortunatly the choise of the best macro appears to be very -# dependant on the compiler and the machine in question. -# For the following combinations use the ALT_ECB option. -# Sparc 2 (cc -O4), sun 3/260 (cc -O4) -# For the following combinations do not use the ALT_ECB option. -# Sparc 2 (gcc2 -O2), sun 3/260 (cc -O2), mvax2 (cc -O), MSDOS (Turbo Cv2) -# For other machines, experiment with changing the option and run -# ./speed to see which is faster. -# DO NOT TURN THIS OPTION ON WHEN COMPILING THIS CODE ON A 64 BIT MACHINE -#OPTS2= -DDES_USE_PTR - -OPTS= $(OPTS0) $(OPTS1) $(OPTS2) - -#CC=cc -#CFLAGS= -O $(OPTS) $(CFLAG) - -CC=gcc -CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG) - -LIBDIR=/usr/local/lib -BINDIR=/usr/local/bin -INCDIR=/usr/local/include -MANDIR=/usr/local/man -MAN1=1 -MAN3=3 -SHELL=/bin/sh -OBJS= cbc3_enc.o cbc_cksm.o cbc_enc.o ncbc_enc.o pcbc_enc.o qud_cksm.o \ - cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o ecb_enc.o ede_enc.o \ - enc_read.o enc_writ.o fcrypt.o ofb64ede.o ofb64enc.o ofb_enc.o \ - rand_key.o read_pwd.o set_key.o rpc_enc.o str2key.o supp.o - -GENERAL=COPYRIGHT FILES INSTALL Imakefile README VERSION Makefile \ - times vms.com KERBEROS MODES.DES GNUmakefile des.man \ - DES.pm DES.pod DES.xs Makefile.PL Makefile.uni typemap t \ - des_crypt.man Makefile.ssl des.doc makefile.bc -DES= des.c -TESTING=destest.c speed.c rpw.c -HEADERS=version.h des.h des_locl.h podd.h sk.h spr.h rpc_des.h -LIBDES= cbc3_enc.c cbc_cksm.c cbc_enc.c ncbc_enc.c pcbc_enc.c qud_cksm.c \ - cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c ecb_enc.c ede_enc.c \ - enc_read.c enc_writ.c fcrypt.c ofb64ede.c ofb64enc.c ofb_enc.c \ - rand_key.c read_pwd.c set_key.c rpc_enc.c str2key.c supp.c - -PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl - -ALL= $(GENERAL) $(DES) $(TESTING) $(LIBDES) $(PERL) $(HEADERS) - -DLIB= libdes.a - -all: $(DLIB) destest rpw des speed - -test: all - ./destest - -$(DLIB): $(OBJS) - /bin/rm -f $(DLIB) - ar cr $(DLIB) $(OBJS) - -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \ - else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \ - else exit 0; fi; fi - -destest: destest.o libdes.a - $(CC) $(CFLAGS) -o destest destest.o libdes.a - -rpw: rpw.o libdes.a - $(CC) $(CFLAGS) -o rpw rpw.o libdes.a - -speed: speed.o libdes.a - $(CC) $(CFLAGS) -o speed speed.o libdes.a - -des: des.o libdes.a - $(CC) $(CFLAGS) -o des des.o libdes.a - -tags: - ctags $(DES) $(TESTING) $(LIBDES) - -tar: - tar chf libdes.tar $(ALL) - -shar: - shar $(ALL) >libdes.shar - -depend: - makedepend $(LIBDES) $(DES) $(TESTING) - -clean: - /bin/rm -f *.o tags core rpw destest des speed $(DLIB) .nfs* *.old \ - *.bak destest rpw des speed - -dclean: - sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new - mv -f Makefile.new Makefile - -# Eric is probably going to choke when he next looks at this --tjh -install: $(DLIB) des - if test $(INSTALLTOP); then \ - echo SSL style install; \ - cp $(DLIB) $(INSTALLTOP)/lib; \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ - fi; fi; \ - chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ - cp des.h $(INSTALLTOP)/include; \ - chmod 644 $(INSTALLTOP)/include/des.h; \ - cp des $(INSTALLTOP)/bin; \ - chmod 755 $(INSTALLTOP)/bin/des; \ - else \ - echo Standalone install; \ - cp $(DLIB) $(LIBDIR)/$(DLIB); \ - if test -s /bin/ranlib; then \ - /bin/ranlib $(LIBDIR)/$(DLIB); \ - else \ - if test -s /usr/bin/ranlib; then \ - /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ - fi; \ - fi; \ - chmod 644 $(LIBDIR)/$(DLIB); \ - cp des $(BINDIR)/des; \ - chmod 711 $(BINDIR)/des; \ - cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ - chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ - cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \ - chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \ - cp des.h $(INCDIR)/des.h; \ - chmod 644 $(INCDIR)/des.h; \ - fi -# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/secure/lib/libdes/PC1 b/secure/lib/libdes/PC1 deleted file mode 100644 index efb8348b72d73..0000000000000 --- a/secure/lib/libdes/PC1 +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/local/bin/perl - -@PC1=( 57,49,41,33,25,17, 9, - 1,58,50,42,34,26,18, - 10, 2,59,51,43,35,27, - 19,11, 3,60,52,44,36, - "-","-","-","-", - 63,55,47,39,31,23,15, - 7,62,54,46,38,30,22, - 14, 6,61,53,45,37,29, - 21,13, 5,28,20,12, 4, - "-","-","-","-", - ); - -foreach (@PC1) - { - if ($_ ne "-") - { - $_--; - $_=int($_/8)*8+7-($_%8); - printf "%2d ",$_; - } - else - { print "-- "; } - print "\n" if (((++$i) % 8) == 0); - print "\n" if ((($i) % 32) == 0); - } - diff --git a/secure/lib/libdes/PC2 b/secure/lib/libdes/PC2 deleted file mode 100644 index 2d560270ecd80..0000000000000 --- a/secure/lib/libdes/PC2 +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/local/bin/perl - -@PC2_C=(14,17,11,24, 1, 5, - 3,28,15, 6,21,10, - 23,19,12, 4,26, 8, - 16, 7,27,20,13, 2, - ); - -@PC2_D=(41,52,31,37,47,55, - 30,40,51,45,33,48, - 44,49,39,56,34,53, - 46,42,50,36,29,32, - ); - -foreach (@PC2_C) { - if ($_ ne "-") - { - $_--; - printf "%2d ",$_; } - else { print "-- "; } - $C{$_}=1; - print "\n" if (((++$i) % 8) == 0); - } -$i=0; -print "\n"; -foreach (@PC2_D) { - if ($_ ne "-") - { - $_-=29; - printf "%2d ",$_; } - else { print "-- "; } - $D{$_}=1; - print "\n" if (((++$i) % 8) == 0); } - -print "\n"; -foreach $i (0 .. 27) - { - $_=$C{$i}; - if ($_ ne "-") {printf "%2d ",$_;} - else { print "-- "; } - print "\n" if (((++$i) % 8) == 0); - } -print "\n"; - -print "\n"; -foreach $i (0 .. 27) - { - $_=$D{$i}; - if ($_ ne "-") {printf "%2d ",$_;} - else { print "-- "; } - print "\n" if (((++$i) % 8) == 0); - } -print "\n"; -sub numsort - { - $a-$b; - } diff --git a/secure/lib/libdes/README b/secure/lib/libdes/README deleted file mode 100644 index 3264c2f5d8984..0000000000000 --- a/secure/lib/libdes/README +++ /dev/null @@ -1,48 +0,0 @@ - - libdes, Version 3.21 21/11/95 - - Copyright (c) 1995, Eric Young - All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms specified in COPYRIGHT. - --- -The primary ftp site for this library is -ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/libdes-x.xx.tar.gz -libdes is now also shipped with SSLeay. Primary ftp site of -ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/SSLeay-x.xx.tar.gz - -The best way to build this library is to build it as part of SSLeay. - -This kit builds a DES encryption library and a DES encryption program. -It supports ecb, cbc, ofb, cfb, triple ecb, triple cbc, triple ofb, -triple cfb, and MIT's pcbc encryption modes and also has a fast -implementation of crypt(3). -It contains support routines to read keys from a terminal, -generate a random key, generate a key from an arbitrary length string, -read/write encrypted data from/to a file descriptor. - -The implementation was written so as to conform with the manual entry -for the des_crypt(3) library routines from MIT's project Athena. - -destest should be run after compilation to test the des routines. -rpw should be run after compilation to test the read password routines. -The des program is a replacement for the sun des command. I believe it -conforms to the sun version. - -The Imakefile is setup for use in the kerberos distribution. - -These routines are best compiled with gcc or any other good -optimising compiler. -Just turn you optimiser up to the highest settings and run destest -after the build to make sure everything works. - -I believe these routines are close to the fastest and most portable DES -routines that use small lookup tables (4.5k) that are publicly available. -The fcrypt routine is faster than ufc's fcrypt (when compiling with -gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines -(on a sun3/260 168 vs 336). It is a function of CPU on chip cache size. - -Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au) - diff --git a/secure/lib/libdes/VERSION b/secure/lib/libdes/VERSION deleted file mode 100644 index 5d25ddc174991..0000000000000 --- a/secure/lib/libdes/VERSION +++ /dev/null @@ -1,318 +0,0 @@ -Version 3.22 29/11/95 - Bug in des(1), an error with the uuencoding stuff when the - 'data' is small, thanks to Geoff Keating - for the patch. - -Version 3.21 22/11/95 - After some emailing back and forth with - Colin Plumb , I've tweaked a few things - and in a future version I will probably put in some of the - optimisation he suggested for use with the DES_USE_PTR option. - Extra routines from Mark Murray for use in - freeBSD. They mostly involve random number generation for use - with kerberos. They involve evil machine specific system calls - etc so I would normally suggest pushing this stuff into the - application and/or using RAND_seed()/RAND_bytes() if you are - using this DES library as part of SSLeay. - Redone the read_pw() function so that it is cleaner and - supports termios, thanks to Sameer Parekh - for the initial patches for this. - Renamed 3ecb_encrypt() to ecb3_encrypt(). This has been - done just to make things more consistent. - I have also now added triple DES versions of cfb and ofb. - -Version 3.20 - Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com, - my des_random_seed() function was only copying 4 bytes of the - passed seed into the init structure. It is now fixed to copy 8. - My own suggestion is to used something like MD5 :-) - -Version 3.19 - While looking at my code one day, I though, why do I keep on - calling des_encrypt(in,out,ks,enc) when every function that - calls it has in and out the same. So I dropped the 'out' - parameter, people should not be using this function. - -Version 3.18 30/08/95 - Fixed a few bit with the distribution and the filenames. - 3.17 had been munged via a move to DOS and back again. - NO CODE CHANGES - -Version 3.17 14/07/95 - Fixed ede3 cbc which I had broken in 3.16. I have also - removed some unneeded variables in 7-8 of the routines. - -Version 3.16 26/06/95 - Added des_encrypt2() which does not use IP/FP, used by triple - des routines. Tweaked things a bit elsewhere. %13 speedup on - sparc and %6 on a R4400 for ede3 cbc mode. - -Version 3.15 06/06/95 - Added des_ncbc_encrypt(), it is des_cbc mode except that it is - 'normal' and copies the new iv value back over the top of the - passed parameter. - CHANGED des_ede3_cbc_encrypt() so that it too now overwrites - the iv. THIS WILL BREAK EXISTING CODE, but since this function - only new, I feel I can change it, not so with des_cbc_encrypt :-(. - I need to update the documentation. - -Version 3.14 31/05/95 - New release upon the world, as part of my SSL implementation. - New copyright and usage stuff. Basically free for all to use - as long as you say it came from me :-) - -Version 3.13 31/05/95 - A fix in speed.c, if HZ is not defined, I set it to 100.0 - which is reasonable for most unixes except SunOS 4.x. - I now have a #ifdef sun but timing for SunOS 4.x looked very - good :-(. At my last job where I used SunOS 4.x, it was - defined to be 60.0 (look at the old INSTALL documentation), at - the last release had it changed to 100.0 since I now work with - Solaris2 and SVR4 boxes. - Thanks to Rory Chisholm for pointing this - one out. - -Version 3.12 08/05/95 - As pointed out by The Crypt Keeper , - my D_ENCRYPT macro in crypt() had an un-necessary variable. - It has been removed. - -Version 3.11 03/05/95 - Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys - and one iv. It is a standard and I needed it for my SSL code. - It makes more sense to use this for triple DES than - 3cbc_encrypt(). I have also added (or should I say tested :-) - cfb64_encrypt() which is cfb64 but it will encrypt a partial - number of bytes - 3 bytes in 3 bytes out. Again this is for - my SSL library, as a form of encryption to use with SSL - telnet. - -Version 3.10 22/03/95 - Fixed a bug in 3cbc_encrypt() :-(. When making repeated calls - to cbc3_encrypt, the 2 iv values that were being returned to - be used in the next call were reversed :-(. - Many thanks to Bill Wade for pointing out - this error. - -Version 3.09 01/02/95 - Fixed des_random_key to far more random, it was rather feeble - with regards to picking the initial seed. The problem was - pointed out by Olaf Kirch . - -Version 3.08 14/12/94 - Added Makefile.PL so libdes can be built into perl5. - Changed des_locl.h so RAND is always defined. - -Version 3.07 05/12/94 - Added GNUmake and stuff so the library can be build with - glibc. - -Version 3.06 30/08/94 - Added rpc_enc.c which contains _des_crypt. This is for use in - secure_rpc v 4.0 - Finally fixed the cfb_enc problems. - Fixed a few parameter parsing bugs in des (-3 and -b), thanks - to Rob McMillan - -Version 3.05 21/04/94 - for unsigned long l; gcc does not produce ((l>>34) == 0) - This causes bugs in cfb_enc. - Thanks to Hadmut Danisch - -Version 3.04 20/04/94 - Added a version number to des.c and libdes.a - -Version 3.03 12/01/94 - Fixed a bug in non zero iv in 3cbc_enc. - -Version 3.02 29/10/93 - I now work in a place where there are 6+ architectures and 14+ - OS versions :-). - Fixed TERMIO definition so the most sys V boxes will work :-) - -Release upon comp.sources.misc -Version 3.01 08/10/93 - Added des_3cbc_encrypt() - -Version 3.00 07/10/93 - Fixed up documentation. - quad_cksum definitely compatible with MIT's now. - -Version 2.30 24/08/93 - Triple DES now defaults to triple cbc but can do triple ecb - with the -b flag. - Fixed some MSDOS uuen/uudecoding problems, thanks to - Added prototypes. - -Version 2.22 29/06/93 - Fixed a bug in des_is_weak_key() which stopped it working :-( - thanks to engineering@MorningStar.Com. - -Version 2.21 03/06/93 - des(1) with no arguments gives quite a bit of help. - Added -c (generate ckecksum) flag to des(1). - Added -3 (triple DES) flag to des(1). - Added cfb and ofb routines to the library. - -Version 2.20 11/03/93 - Added -u (uuencode) flag to des(1). - I have been playing with byte order in quad_cksum to make it - compatible with MIT's version. All I can say is avid this - function if possible since MIT's output is endian dependent. - -Version 2.12 14/10/92 - Added MSDOS specific macro in ecb_encrypt which gives a %70 - speed up when the code is compiled with turbo C. - -Version 2.11 12/10/92 - Speedup in set_key (recoding of PC-1) - I now do it in 47 simple operations, down from 60. - Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) - for motivating me to look for a faster system :-) - The speedup is probably less that 1% but it is still 13 - instructions less :-). - -Version 2.10 06/10/92 - The code now works on the 64bit ETA10 and CRAY without modifications or - #defines. I believe the code should work on any machine that - defines long, int or short to be 8 bytes long. - Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu) - for helping me fix the code to run on 64bit machines (he had - access to an ETA10). - Thanks also to John Fletcher - for testing the routines on a CRAY. - read_password.c has been renamed to read_passwd.c - string_to_key.c has been renamed to string2key.c - -Version 2.00 14/09/92 - Made mods so that the library should work on 64bit CPU's. - Removed all my uchar and ulong defs. To many different - versions of unix define them in their header files in too many - different combinations :-) - IRIX - Sillicon Graphics mods (mostly in read_password.c). - Thanks to Andrew Daviel (advax@erich.triumf.ca) - -Version 1.99 26/08/92 - Fixed a bug or 2 in enc_read.c - Fixed a bug in enc_write.c - Fixed a pseudo bug in fcrypt.c (very obscure). - -Version 1.98 31/07/92 - Support for the ETA10. This is a strange machine that defines - longs and ints as 8 bytes and shorts as 4 bytes. - Since I do evil things with long * that assume that they are 4 - bytes. Look in the Makefile for the option to compile for - this machine. quad_cksum appears to have problems but I - will don't have the time to fix it right now, and this is not - a function that uses DES and so will not effect the main uses - of the library. - -Version 1.97 20/05/92 eay - Fixed the Imakefile and made some changes to des.h to fix some - problems when building this package with Kerberos v 4. - -Version 1.96 18/05/92 eay - Fixed a small bug in string_to_key() where problems could - occur if des_check_key was set to true and the string - generated a weak key. - -Patch2 posted to comp.sources.misc -Version 1.95 13/05/92 eay - Added an alternative version of the D_ENCRYPT macro in - ecb_encrypt and fcrypt. Depending on the compiler, one version or the - other will be faster. This was inspired by - Dana How , and her pointers about doing the - *(ulong *)((uchar *)ptr+(value&0xfc)) - vs - ptr[value&0x3f] - to stop the C compiler doing a <<2 to convert the long array index. - -Version 1.94 05/05/92 eay - Fixed an incompatibility between my string_to_key and the MIT - version. When the key is longer than 8 chars, I was wrapping - with a different method. To use the old version, define - OLD_STR_TO_KEY in the makefile. Thanks to - viktor@newsu.shearson.com (Viktor Dukhovni). - -Version 1.93 28/04/92 eay - Fixed the VMS mods so that echo is now turned off in - read_password. Thanks again to brennan@coco.cchs.su.oz.AU. - MSDOS support added. The routines can be compiled with - Turbo C (v2.0) and MSC (v5.1). Make sure MSDOS is defined. - -Patch1 posted to comp.sources.misc -Version 1.92 13/04/92 eay - Changed D_ENCRYPT so that the rotation of R occurs outside of - the loop. This required rotating all the longs in sp.h (now - called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM> - speed.c has been changed so it will work without SIGALRM. If - times(3) is not present it will try to use ftime() instead. - -Version 1.91 08/04/92 eay - Added -E/-D options to des(1) so it can use string_to_key. - Added SVR4 mods suggested by witr@rwwa.COM - Added VMS mods suggested by brennan@coco.cchs.su.oz.AU. If - anyone knows how to turn of tty echo in VMS please tell me or - implement it yourself :-). - Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS - does not like IN/OUT being used. - -Libdes posted to comp.sources.misc -Version 1.9 24/03/92 eay - Now contains a fast small crypt replacement. - Added des(1) command. - Added des_rw_mode so people can use cbc encryption with - enc_read and enc_write. - -Version 1.8 15/10/91 eay - Bug in cbc_cksum. - Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this - one out. - -Version 1.7 24/09/91 eay - Fixed set_key :-) - set_key is 4 times faster and takes less space. - There are a few minor changes that could be made. - -Version 1.6 19/09/1991 eay - Finally go IP and FP finished. - Now I need to fix set_key. - This version is quite a bit faster that 1.51 - -Version 1.52 15/06/1991 eay - 20% speedup in ecb_encrypt by changing the E bit selection - to use 2 32bit words. This also required modification of the - sp table. There is still a way to speedup the IP and IP-1 - (hints from outer@sq.com) still working on this one :-(. - -Version 1.51 07/06/1991 eay - Faster des_encrypt by loop unrolling - Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu) - -Version 1.50 28/05/1991 eay - Optimised the code a bit more for the sparc. I have improved the - speed of the inner des_encrypt by speeding up the initial and - final permutations. - -Version 1.40 23/10/1990 eay - Fixed des_random_key, it did not produce a random key :-( - -Version 1.30 2/10/1990 eay - Have made des_quad_cksum the same as MIT's, the full package - should be compatible with MIT's - Have tested on a DECstation 3100 - Still need to fix des_set_key (make it faster). - Does des_cbc_encrypts at 70.5k/sec on a 3100. - -Version 1.20 18/09/1990 eay - Fixed byte order dependencies. - Fixed (I hope) all the word alignment problems. - Speedup in des_ecb_encrypt. - -Version 1.10 11/09/1990 eay - Added des_enc_read and des_enc_write. - Still need to fix des_quad_cksum. - Still need to document des_enc_read and des_enc_write. - -Version 1.00 27/08/1990 eay - diff --git a/secure/lib/libdes/cbc3_enc.c b/secure/lib/libdes/cbc3_enc.c deleted file mode 100644 index 11aa3ff4d7c7a..0000000000000 --- a/secure/lib/libdes/cbc3_enc.c +++ /dev/null @@ -1,88 +0,0 @@ -/* lib/des/cbc3_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* HAS BUGS? DON'T USE */ -void des_3cbc_encrypt(input, output, length, ks1, ks2, iv1, iv2, encrypt) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule ks1; -des_key_schedule ks2; -des_cblock (*iv1); -des_cblock (*iv2); -int encrypt; - { - int off=(length-1)/8; - long l8=((length+7)/8)*8; - des_cblock niv1,niv2; - - if (encrypt == DES_ENCRYPT) - { - des_cbc_encrypt(input,output,length,ks1,iv1,encrypt); - if (length >= sizeof(des_cblock)) - memcpy(niv1,output[off],sizeof(des_cblock)); - des_cbc_encrypt(output,output,l8,ks2,iv1,!encrypt); - des_cbc_encrypt(output,output,l8,ks1,iv2, encrypt); - if (length >= sizeof(des_cblock)) - memcpy(niv2,output[off],sizeof(des_cblock)); - } - else - { - if (length >= sizeof(des_cblock)) - memcpy(niv2,input[off],sizeof(des_cblock)); - des_cbc_encrypt(input,output,l8,ks1,iv2,encrypt); - des_cbc_encrypt(output,output,l8,ks2,iv1,!encrypt); - if (length >= sizeof(des_cblock)) - memcpy(niv1,output[off],sizeof(des_cblock)); - des_cbc_encrypt(output,output,length,ks1,iv1, encrypt); - } - memcpy(*iv1,niv1,sizeof(des_cblock)); - memcpy(*iv2,niv2,sizeof(des_cblock)); - } - diff --git a/secure/lib/libdes/cbc_cksm.c b/secure/lib/libdes/cbc_cksm.c deleted file mode 100644 index 9088c732c6f6d..0000000000000 --- a/secure/lib/libdes/cbc_cksm.c +++ /dev/null @@ -1,92 +0,0 @@ -/* lib/des/cbc_cksm.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -unsigned long des_cbc_cksum(input, output, length, schedule, ivec) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule schedule; -des_cblock (*ivec); - { - register unsigned long tout0,tout1,tin0,tin1; - register long l=length; - unsigned long tin[2]; - unsigned char *in,*out,*iv; - - in=(unsigned char *)input; - out=(unsigned char *)output; - iv=(unsigned char *)ivec; - - c2l(iv,tout0); - c2l(iv,tout1); - for (; l>0; l-=8) - { - if (l >= 8) - { - c2l(in,tin0); - c2l(in,tin1); - } - else - c2ln(in,tin0,tin1,l); - - tin0^=tout0; tin[0]=tin0; - tin1^=tout1; tin[1]=tin1; - des_encrypt((unsigned long *)tin,schedule,DES_ENCRYPT); - /* fix 15/10/91 eay - thanks to keithr@sco.COM */ - tout0=tin[0]; - tout1=tin[1]; - } - if (out != NULL) - { - l2c(tout0,out); - l2c(tout1,out); - } - tout0=tin0=tin1=tin[0]=tin[1]=0; - return(tout1); - } diff --git a/secure/lib/libdes/cbc_enc.c b/secure/lib/libdes/cbc_enc.c deleted file mode 100644 index c0cdef896a54b..0000000000000 --- a/secure/lib/libdes/cbc_enc.c +++ /dev/null @@ -1,114 +0,0 @@ -/* lib/des/cbc_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -void des_cbc_encrypt(input, output, length, schedule, ivec, encrypt) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int encrypt; - { - register unsigned long tin0,tin1; - register unsigned long tout0,tout1,xor0,xor1; - register unsigned char *in,*out; - register long l=length; - unsigned long tin[2]; - unsigned char *iv; - - in=(unsigned char *)input; - out=(unsigned char *)output; - iv=(unsigned char *)ivec; - - if (encrypt) - { - c2l(iv,tout0); - c2l(iv,tout1); - for (; l>0; l-=8) - { - if (l >= 8) - { - c2l(in,tin0); - c2l(in,tin1); - } - else - c2ln(in,tin0,tin1,l); - tin0^=tout0; tin[0]=tin0; - tin1^=tout1; tin[1]=tin1; - des_encrypt((unsigned long *)tin,schedule,DES_ENCRYPT); - tout0=tin[0]; l2c(tout0,out); - tout1=tin[1]; l2c(tout1,out); - } - } - else - { - c2l(iv,xor0); - c2l(iv,xor1); - for (; l>0; l-=8) - { - c2l(in,tin0); tin[0]=tin0; - c2l(in,tin1); tin[1]=tin1; - des_encrypt((unsigned long *)tin,schedule,DES_DECRYPT); - tout0=tin[0]^xor0; - tout1=tin[1]^xor1; - if (l >= 8) - { - l2c(tout0,out); - l2c(tout1,out); - } - else - l2cn(tout0,tout1,out,l); - xor0=tin0; - xor1=tin1; - } - } - tin0=tin1=tout0=tout1=xor0=xor1=0; - tin[0]=tin[1]=0; - } - diff --git a/secure/lib/libdes/cfb64ede.c b/secure/lib/libdes/cfb64ede.c deleted file mode 100644 index 93af8172c1bb2..0000000000000 --- a/secure/lib/libdes/cfb64ede.c +++ /dev/null @@ -1,152 +0,0 @@ -/* lib/des/cfb64ede.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output encrypted as though 64bit cfb mode is being - * used. The extra state information to record how much of the - * 64bit block we have used is contained in *num; - */ - -void des_ede3_cfb64_encrypt(in, out, length, ks1,ks2,ks3, ivec, num, encrypt) -unsigned char *in; -unsigned char *out; -long length; -des_key_schedule ks1,ks2,ks3; -des_cblock (*ivec); -int *num; -int encrypt; - { - register unsigned long v0,v1; - register long l=length,n=*num; - unsigned long ti[2]; - unsigned char *iv,c,cc; - - iv=(unsigned char *)ivec; - if (encrypt) - { - while (l--) - { - if (n == 0) - { - c2l(iv,v0); - c2l(iv,v1); - - IP(v0,v1); - - ti[0]=v0; - ti[1]=v1; - des_encrypt2((unsigned long *)ti,ks1,DES_ENCRYPT); - des_encrypt2((unsigned long *)ti,ks2,DES_DECRYPT); - des_encrypt2((unsigned long *)ti,ks3,DES_ENCRYPT); - v0=ti[0]; - v1=ti[1]; - - FP(v1,v0); - - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - iv=(unsigned char *)ivec; - } - c= *(in++)^iv[n]; - *(out++)=c; - iv[n]=c; - n=(n+1)&0x07; - } - } - else - { - while (l--) - { - if (n == 0) - { - c2l(iv,v0); - c2l(iv,v1); - - IP(v0,v1); - - ti[0]=v0; - ti[1]=v1; - des_encrypt2((unsigned long *)ti,ks1,DES_ENCRYPT); - des_encrypt2((unsigned long *)ti,ks2,DES_DECRYPT); - des_encrypt2((unsigned long *)ti,ks3,DES_ENCRYPT); - - v0=ti[0]; - v1=ti[1]; - - FP(v1,v0); - - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - iv=(unsigned char *)ivec; - } - cc= *(in++); - c=iv[n]; - iv[n]=cc; - *(out++)=c^cc; - n=(n+1)&0x07; - } - } - v0=v1=ti[0]=ti[1]=c=cc=0; - *num=n; - } - -#ifdef undef /* MACRO */ -void des_ede2_cfb64_encrypt(in, out, length, ks1,ks2, ivec, num, encrypt) -unsigned char *in; -unsigned char *out; -long length; -des_key_schedule ks1,ks2; -des_cblock (*ivec); -int *num; -int encrypt; - { - des_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,encrypt); - } -#endif diff --git a/secure/lib/libdes/cfb64enc.c b/secure/lib/libdes/cfb64enc.c deleted file mode 100644 index 35875f3f647af..0000000000000 --- a/secure/lib/libdes/cfb64enc.c +++ /dev/null @@ -1,116 +0,0 @@ -/* lib/des/cfb64enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output encrypted as though 64bit cfb mode is being - * used. The extra state information to record how much of the - * 64bit block we have used is contained in *num; - */ - -void des_cfb64_encrypt(in, out, length, schedule, ivec, num, encrypt) -unsigned char *in; -unsigned char *out; -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int *num; -int encrypt; - { - register unsigned long v0,v1; - register long l=length,n=*num; - unsigned long ti[2]; - unsigned char *iv,c,cc; - - iv=(unsigned char *)ivec; - if (encrypt) - { - while (l--) - { - if (n == 0) - { - c2l(iv,v0); ti[0]=v0; - c2l(iv,v1); ti[1]=v1; - des_encrypt((unsigned long *)ti, - schedule,DES_ENCRYPT); - iv=(unsigned char *)ivec; - v0=ti[0]; l2c(v0,iv); - v0=ti[1]; l2c(v0,iv); - iv=(unsigned char *)ivec; - } - c= *(in++)^iv[n]; - *(out++)=c; - iv[n]=c; - n=(n+1)&0x07; - } - } - else - { - while (l--) - { - if (n == 0) - { - c2l(iv,v0); ti[0]=v0; - c2l(iv,v1); ti[1]=v1; - des_encrypt((unsigned long *)ti, - schedule,DES_ENCRYPT); - iv=(unsigned char *)ivec; - v0=ti[0]; l2c(v0,iv); - v0=ti[1]; l2c(v0,iv); - iv=(unsigned char *)ivec; - } - cc= *(in++); - c=iv[n]; - iv[n]=cc; - *(out++)=c^cc; - n=(n+1)&0x07; - } - } - v0=v1=ti[0]=ti[1]=c=cc=0; - *num=n; - } - diff --git a/secure/lib/libdes/cfb_enc.c b/secure/lib/libdes/cfb_enc.c deleted file mode 100644 index 33002d1592191..0000000000000 --- a/secure/lib/libdes/cfb_enc.c +++ /dev/null @@ -1,160 +0,0 @@ -/* lib/des/cfb_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output are loaded in multiples of 8 bits. - * What this means is that if you hame numbits=12 and length=2 - * the first 12 bits will be retrieved from the first byte and half - * the second. The second 12 bits will come from the 3rd and half the 4th - * byte. - */ -void des_cfb_encrypt(in, out, numbits, length, schedule, ivec, encrypt) -unsigned char *in; -unsigned char *out; -int numbits; -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int encrypt; - { - register unsigned long d0,d1,v0,v1,n=(numbits+7)/8; - register unsigned long mask0,mask1; - register unsigned long l=length; - register int num=numbits; - unsigned long ti[2]; - unsigned char *iv; - - if (num > 64) return; - if (num > 32) - { - mask0=0xffffffffL; - if (num == 64) - mask1=mask0; - else mask1=(1L<<(num-32))-1; - } - else - { - if (num == 32) - mask0=0xffffffffL; - else mask0=(1L<= n) - { - l-=n; - ti[0]=v0; - ti[1]=v1; - des_encrypt((unsigned long *)ti,schedule,DES_ENCRYPT); - c2ln(in,d0,d1,n); - in+=n; - d0=(d0^ti[0])&mask0; - d1=(d1^ti[1])&mask1; - l2cn(d0,d1,out,n); - out+=n; - /* 30-08-94 - eay - changed because l>>32 and - * l<<32 are bad under gcc :-( */ - if (num == 32) - { v0=v1; v1=d0; } - else if (num == 64) - { v0=d0; v1=d1; } - else if (num > 32) /* && num != 64 */ - { - v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL; - v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL; - } - else /* num < 32 */ - { - v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL; - v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL; - } - } - } - else - { - while (l >= n) - { - l-=n; - ti[0]=v0; - ti[1]=v1; - des_encrypt((unsigned long *)ti,schedule,DES_ENCRYPT); - c2ln(in,d0,d1,n); - in+=n; - /* 30-08-94 - eay - changed because l>>32 and - * l<<32 are bad under gcc :-( */ - if (num == 32) - { v0=v1; v1=d0; } - else if (num == 64) - { v0=d0; v1=d1; } - else if (num > 32) /* && num != 64 */ - { - v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL; - v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL; - } - else /* num < 32 */ - { - v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL; - v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL; - } - d0=(d0^ti[0])&mask0; - d1=(d1^ti[1])&mask1; - l2cn(d0,d1,out,n); - out+=n; - } - } - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - v0=v1=d0=d1=ti[0]=ti[1]=0; - } - diff --git a/secure/lib/libdes/des.c b/secure/lib/libdes/des.c deleted file mode 100644 index ca5505bb3b1a7..0000000000000 --- a/secure/lib/libdes/des.c +++ /dev/null @@ -1,949 +0,0 @@ -/* lib/des/des.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include -#ifndef MSDOS -#include -#else -#include -#define RAND -#endif - -#include -#include "version.h" - -#ifdef VMS -#include -#include -#else -#ifndef _IRIX -#include -#endif -#include -#endif -#if defined(NOCONST) -#define const -#endif -#include "des.h" - -#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) -#include -#endif - -#ifdef RAND -#define random rand -#define srandom(s) srand(s) -#endif - -#ifndef NOPROTO -void usage(void); -void doencryption(void); -int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); -void uufwriteEnd(FILE *fp); -int uufread(unsigned char *out,int size,unsigned int num,FILE *fp); -int uuencode(unsigned char *in,int num,unsigned char *out); -int uudecode(unsigned char *in,int num,unsigned char *out); -#else -void usage(); -void doencryption(); -int uufwrite(); -void uufwriteEnd(); -int uufread(); -int uuencode(); -int uudecode(); -#endif - -#ifdef VMS -#define EXIT(a) exit(a&0x10000000) -#else -#define EXIT(a) exit(a) -#endif - -#define BUFSIZE (8*1024) -#define VERIFY 1 -#define KEYSIZ 8 -#define KEYSIZB 1024 /* should hit tty line limit first :-) */ -char key[KEYSIZB+1]; -int do_encrypt,longk=0; -FILE *DES_IN,*DES_OUT,*CKSUM_OUT; -char uuname[200]; -unsigned char uubuf[50]; -int uubufnum=0; -#define INUUBUFN (45*100) -#define OUTUUBUF (65*100) -unsigned char b[OUTUUBUF]; -unsigned char bb[300]; -des_cblock cksum={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; -char cksumname[200]=""; - -int vflag,cflag,eflag,dflag,kflag,bflag,fflag,sflag,uflag,flag3,hflag,error; - -int main(argc, argv) -int argc; -char **argv; - { - int i; - struct stat ins,outs; - char *p; - char *in=NULL,*out=NULL; - - vflag=cflag=eflag=dflag=kflag=hflag=bflag=fflag=sflag=uflag=flag3=0; - error=0; - memset(key,0,sizeof(key)); - - for (i=1; i=0; j--) - argv[i][j]='\0'; - } - break; - default: - fprintf(stderr,"'%c' unknown flag\n",p[-1]); - error=1; - break; - } - } - } - else - { - if (in == NULL) - in=argv[i]; - else if (out == NULL) - out=argv[i]; - else - error=1; - } - } - if (error) usage(); - /* We either - * do checksum or - * do encrypt or - * do decrypt or - * do decrypt then ckecksum or - * do checksum then encrypt - */ - if (((eflag+dflag) == 1) || cflag) - { - if (eflag) do_encrypt=DES_ENCRYPT; - if (dflag) do_encrypt=DES_DECRYPT; - } - else - { - if (vflag) - { -#ifndef _Windows - fprintf(stderr,"des(1) built with %s\n",DES_version); -#endif - EXIT(1); - } - else usage(); - } - -#ifndef _Windows - if (vflag) fprintf(stderr,"des(1) built with %s\n",DES_version); -#endif - if ( (in != NULL) && - (out != NULL) && -#ifndef MSDOS - (stat(in,&ins) != -1) && - (stat(out,&outs) != -1) && - (ins.st_dev == outs.st_dev) && - (ins.st_ino == outs.st_ino)) -#else /* MSDOS */ - (strcmp(in,out) == 0)) -#endif - { - fputs("input and output file are the same\n",stderr); - EXIT(3); - } - - if (!kflag) - if (des_read_pw_string(key,KEYSIZB+1,"Enter key:",eflag?VERIFY:0)) - { - fputs("password error\n",stderr); - EXIT(2); - } - - if (in == NULL) - DES_IN=stdin; - else if ((DES_IN=fopen(in,"r")) == NULL) - { - perror("opening input file"); - EXIT(4); - } - - CKSUM_OUT=stdout; - if (out == NULL) - { - DES_OUT=stdout; - CKSUM_OUT=stderr; - } - else if ((DES_OUT=fopen(out,"w")) == NULL) - { - perror("opening output file"); - EXIT(5); - } - -#ifdef MSDOS - /* This should set the file to binary mode. */ - { -#include - if (!(uflag && dflag)) - setmode(fileno(DES_IN),O_BINARY); - if (!(uflag && eflag)) - setmode(fileno(DES_OUT),O_BINARY); - } -#endif - - doencryption(); - fclose(DES_IN); - fclose(DES_OUT); - EXIT(0); - } - -void usage() - { - char **u; - static const char *Usage[]={ -"des [input-file [output-file]]", -"options:", -"-v : des(1) version number", -"-e : encrypt using sunOS compatible user key to DES key conversion.", -"-E : encrypt ", -"-d : decrypt using sunOS compatible user key to DES key conversion.", -"-D : decrypt ", -"-c[ckname] : generate a cbc_cksum using sunOS compatible user key to", -" DES key conversion and output to ckname (stdout default,", -" stderr if data being output on stdout). The checksum is", -" generated before encryption and after decryption if used", -" in conjunction with -[eEdD].", -"-C[ckname] : generate a cbc_cksum as for -c but compatible with -[ED].", -"-k key : use key 'key'", -"-h : the key that is entered will be a hexidecimal number", -" that is used directly as the des key", -"-u[uuname] : input file is uudecoded if -[dD] or output uuencoded data if -[eE]", -" (uuname is the filename to put in the uuencode header).", -"-b : encrypt using DES in ecb encryption mode, the defaut is cbc mode.", -"-3 : encrypt using tripple DES encryption. This uses 2 keys", -" generated from the input key. If the input key is less", -" than 8 characters long, this is equivelent to normal", -" encryption. Default is tripple cbc, -b makes it tripple ecb.", -NULL -}; - for (u=(char **)Usage; *u; u++) - { - fputs(*u,stderr); - fputc('\n',stderr); - } - - EXIT(1); - } - -void doencryption() - { -#ifdef _LIBC - extern int srandom(); - extern int random(); - extern unsigned long time(); -#endif - - register int i; - des_key_schedule ks,ks2; - unsigned char iv[8],iv2[8]; - char *p; - int num=0,j,k,l,rem,ll,len,last,ex=0; - des_cblock kk,k2; - FILE *O; - int Exit=0; -#ifndef MSDOS - static unsigned char buf[BUFSIZE+8],obuf[BUFSIZE+8]; -#else - static unsigned char *buf=NULL,*obuf=NULL; - - if (buf == NULL) - { - if ( (( buf=(unsigned char *)malloc(BUFSIZE+8)) == NULL) || - ((obuf=(unsigned char *)malloc(BUFSIZE+8)) == NULL)) - { - fputs("Not enough memory\n",stderr); - Exit=10; - goto problems; - } - } -#endif - - if (hflag) - { - j=(flag3?16:8); - p=key; - for (i=0; i= '0')) - k=(*p-'0')<<4; - else if ((*p <= 'f') && (*p >= 'a')) - k=(*p-'a'+10)<<4; - else if ((*p <= 'F') && (*p >= 'A')) - k=(*p-'A'+10)<<4; - else - { - fputs("Bad hex key\n",stderr); - Exit=9; - goto problems; - } - p++; - if ((*p <= '9') && (*p >= '0')) - k|=(*p-'0'); - else if ((*p <= 'f') && (*p >= 'a')) - k|=(*p-'a'+10); - else if ((*p <= 'F') && (*p >= 'A')) - k|=(*p-'A'+10); - else - { - fputs("Bad hex key\n",stderr); - Exit=9; - goto problems; - } - p++; - if (i < 8) - kk[i]=k; - else - k2[i-8]=k; - } - des_set_key((C_Block *)k2,ks2); - memset(k2,0,sizeof(k2)); - } - else if (longk || flag3) - { - if (flag3) - { - des_string_to_2keys(key,(C_Block *)kk,(C_Block *)k2); - des_set_key((C_Block *)k2,ks2); - memset(k2,0,sizeof(k2)); - } - else - des_string_to_key(key,(C_Block *)kk); - } - else - for (i=0; i>=1; - } - if (l & 1) - kk[i]=key[i]&0x7f; - else - kk[i]=key[i]|0x80; - } - - des_set_key((C_Block *)kk,ks); - memset(key,0,sizeof(key)); - memset(kk,0,sizeof(kk)); - /* woops - A bug that does not showup under unix :-( */ - memset(iv,0,sizeof(iv)); - memset(iv2,0,sizeof(iv2)); - - l=1; - rem=0; - /* first read */ - if (eflag || (!dflag && cflag)) - { - for (;;) - { - num=l=fread(&(buf[rem]),1,BUFSIZE,DES_IN); - l+=rem; - num+=rem; - if (l < 0) - { - perror("read error"); - Exit=6; - goto problems; - } - - rem=l%8; - len=l-rem; - if (feof(DES_IN)) - { - srandom((unsigned int)time(NULL)); - for (i=7-rem; i>0; i--) - buf[l++]=random()&0xff; - buf[l++]=rem; - ex=1; - len+=rem; - } - else - l-=rem; - - if (cflag) - { - des_cbc_cksum((C_Block *)buf,(C_Block *)cksum, - (long)len,ks,(C_Block *)cksum); - if (!eflag) - { - if (feof(DES_IN)) break; - else continue; - } - } - - if (bflag && !flag3) - for (i=0; i= 8) memcpy(iv,&(obuf[l-8]),8); - } - if (rem) memcpy(buf,&(buf[l]),(unsigned int)rem); - - i=0; - while (i < l) - { - if (uflag) - j=uufwrite(obuf,1,(unsigned int)l-i, - DES_OUT); - else - j=fwrite(obuf,1,(unsigned int)l-i, - DES_OUT); - if (j == -1) - { - perror("Write error"); - Exit=7; - goto problems; - } - i+=j; - } - if (feof(DES_IN)) - { - if (uflag) uufwriteEnd(DES_OUT); - break; - } - } - } - else /* decrypt */ - { - ex=1; - for (;;) - { - if (ex) { - if (uflag) - l=uufread(buf,1,BUFSIZE,DES_IN); - else - l=fread(buf,1,BUFSIZE,DES_IN); - ex=0; - rem=l%8; - l-=rem; - } - if (l < 0) - { - perror("read error"); - Exit=6; - goto problems; - } - - if (bflag && !flag3) - for (i=0; i= 8) memcpy(iv,&(buf[l-8]),8); - } - - if (uflag) - ll=uufread(&(buf[rem]),1,BUFSIZE,DES_IN); - else - ll=fread(&(buf[rem]),1,BUFSIZE,DES_IN); - ll+=rem; - rem=ll%8; - ll-=rem; - if (feof(DES_IN) && (ll == 0)) - { - last=obuf[l-1]; - - if ((last > 7) || (last < 0)) - { - fputs("The file was not decrypted correctly.\n", - stderr); - Exit=8; - last=0; - } - l=l-8+last; - } - i=0; - if (cflag) des_cbc_cksum((C_Block *)obuf, - (C_Block *)cksum,(long)l/8*8,ks, - (C_Block *)cksum); - while (i != l) - { - j=fwrite(obuf,1,(unsigned int)l-i,DES_OUT); - if (j == -1) - { - perror("Write error"); - Exit=7; - goto problems; - } - i+=j; - } - l=ll; - if ((l == 0) && feof(DES_IN)) break; - } - } - if (cflag) - { - l=0; - if (cksumname[0] != '\0') - { - if ((O=fopen(cksumname,"w")) != NULL) - { - CKSUM_OUT=O; - l=1; - } - } - for (i=0; i<8; i++) - fprintf(CKSUM_OUT,"%02X",cksum[i]); - fprintf(CKSUM_OUT,"\n"); - if (l) fclose(CKSUM_OUT); - } -problems: - memset(buf,0,sizeof(buf)); - memset(obuf,0,sizeof(obuf)); - memset(ks,0,sizeof(ks)); - memset(ks2,0,sizeof(ks2)); - memset(iv,0,sizeof(iv)); - memset(iv2,0,sizeof(iv2)); - memset(kk,0,sizeof(kk)); - memset(k2,0,sizeof(k2)); - memset(uubuf,0,sizeof(uubuf)); - memset(b,0,sizeof(b)); - memset(bb,0,sizeof(bb)); - memset(cksum,0,sizeof(cksum)); - if (Exit) EXIT(Exit); - } - -int uufwrite(data, size, num, fp) -unsigned char *data; -int size; -unsigned int num; -FILE *fp; - - /* We ignore this parameter but it should be > ~50 I believe */ - - - { - int i,j,left,rem,ret=num; - static int start=1; - - if (start) - { - fprintf(fp,"begin 600 %s\n", - (uuname[0] == '\0')?"text.d":uuname); - start=0; - } - - if (uubufnum) - { - if (uubufnum+num < 45) - { - memcpy(&(uubuf[uubufnum]),data,(unsigned int)num); - uubufnum+=num; - return(num); - } - else - { - i=45-uubufnum; - memcpy(&(uubuf[uubufnum]),data,(unsigned int)i); - j=uuencode((unsigned char *)uubuf,45,b); - fwrite(b,1,(unsigned int)j,fp); - uubufnum=0; - data+=i; - num-=i; - } - } - - for (i=0; i<(((int)num)-INUUBUFN); i+=INUUBUFN) - { - j=uuencode(&(data[i]),INUUBUFN,b); - fwrite(b,1,(unsigned int)j,fp); - } - rem=(num-i)%45; - left=(num-i-rem); - if (left) - { - j=uuencode(&(data[i]),left,b); - fwrite(b,1,(unsigned int)j,fp); - i+=left; - } - if (i != num) - { - memcpy(uubuf,&(data[i]),(unsigned int)rem); - uubufnum=rem; - } - return(ret); - } - -void uufwriteEnd(fp) -FILE *fp; - { - int j; - static const char *end=" \nend\n"; - - if (uubufnum != 0) - { - uubuf[uubufnum]='\0'; - uubuf[uubufnum+1]='\0'; - uubuf[uubufnum+2]='\0'; - j=uuencode(uubuf,uubufnum,b); - fwrite(b,1,(unsigned int)j,fp); - } - fwrite(end,1,strlen(end),fp); - } - -int uufread(out, size, num, fp) -unsigned char *out; -int size; /* should always be > ~ 60; I actually ignore this parameter :-) */ -unsigned int num; -FILE *fp; - { - int i,j,tot; - static int done=0; - static int valid=0; - static int start=1; - - if (start) - { - for (;;) - { - b[0]='\0'; - fgets((char *)b,300,fp); - if (b[0] == '\0') - { - fprintf(stderr,"no 'begin' found in uuencoded input\n"); - return(-1); - } - if (strncmp((char *)b,"begin ",6) == 0) break; - } - start=0; - } - if (done) return(0); - tot=0; - if (valid) - { - memcpy(out,bb,(unsigned int)valid); - tot=valid; - valid=0; - } - for (;;) - { - b[0]='\0'; - fgets((char *)b,300,fp); - if (b[0] == '\0') break; - i=strlen((char *)b); - if ((b[0] == 'e') && (b[1] == 'n') && (b[2] == 'd')) - { - done=1; - while (!feof(fp)) - { - fgets((char *)b,300,fp); - } - break; - } - i=uudecode(b,i,bb); - if (i < 0) break; - if ((i+tot+8) > num) - { - /* num to copy to make it a multiple of 8 */ - j=(num/8*8)-tot-8; - memcpy(&(out[tot]),bb,(unsigned int)j); - tot+=j; - memcpy(bb,&(bb[j]),(unsigned int)i-j); - valid=i-j; - break; - } - memcpy(&(out[tot]),bb,(unsigned int)i); - tot+=i; - } - return(tot); - } - -#define ccc2l(c,l) (l =((unsigned long)(*((c)++)))<<16, \ - l|=((unsigned long)(*((c)++)))<< 8, \ - l|=((unsigned long)(*((c)++)))) - -#define l2ccc(l,c) (*((c)++)=(unsigned char)(((l)>>16)&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8)&0xff), \ - *((c)++)=(unsigned char)(((l) )&0xff)) - - -int uuencode(in, num, out) -unsigned char *in; -int num; -unsigned char *out; - { - int j,i,n,tot=0; - unsigned long l; - register unsigned char *p; - p=out; - - for (j=0; j num) - i=(num-j); - else i=45; - *(p++)=i+' '; - for (n=0; n>18)&0x3f)+' '; - *(p++)=((l>>12)&0x3f)+' '; - *(p++)=((l>> 6)&0x3f)+' '; - *(p++)=((l )&0x3f)+' '; - tot+=4; - } - *(p++)='\n'; - tot+=2; - } - *p='\0'; - l=0; - return(tot); - } - -int uudecode(in, num, out) -unsigned char *in; -int num; -unsigned char *out; - { - int j,i,k; - unsigned int n=0,space=0; - unsigned long l; - unsigned long w,x,y,z; - unsigned int blank=(unsigned int)'\n'-' '; - - for (j=0; j 60) - { - fprintf(stderr,"uuencoded line length too long\n"); - return(-1); - } - j++; - - for (i=0; i 63) || (x > 63) || (y > 63) || (z > 63)) - { - k=0; - if (w == blank) k=1; - if (x == blank) k=2; - if (y == blank) k=3; - if (z == blank) k=4; - space=1; - switch (k) { - case 1: w=0; in--; - case 2: x=0; in--; - case 3: y=0; in--; - case 4: z=0; in--; - break; - case 0: - space=0; - fprintf(stderr,"bad uuencoded data values\n"); - w=x=y=z=0; - return(-1); - break; - } - } - l=(w<<18)|(x<<12)|(y<< 6)|(z ); - l2ccc(l,out); - } - if (*(in++) != '\n') - { - fprintf(stderr,"missing nl in uuencoded line\n"); - w=x=y=z=0; - return(-1); - } - j++; - } - *out='\0'; - w=x=y=z=0; - return(n); - } diff --git a/secure/lib/libdes/des.doc b/secure/lib/libdes/des.doc deleted file mode 100644 index ec3a4c1737c1e..0000000000000 --- a/secure/lib/libdes/des.doc +++ /dev/null @@ -1,480 +0,0 @@ -The DES library. - -Please note that this library was originally written to operate with -eBones, a version of Kerberos that had had encryption removed when it left -the USA and then put back in. As such there are some routines that I will -advise not using but they are still in the library for historical reasons. -For all calls that have an 'input' and 'output' variables, they can be the -same. - -This library requires the inclusion of 'des.h'. - -All of the encryption functions take what is called a des_key_schedule as an -argument. A des_key_schedule is an expanded form of the des key. -A des_key is 8 bytes of odd parity, the type used to hold the key is a -des_cblock. A des_cblock is an array of 8 bytes, often in this library -description I will refer to input bytes when the function specifies -des_cblock's as input or output, this just means that the variable should -be a multiple of 8 bytes. - -The define DES_ENCRYPT is passed to specify encryption, DES_DECRYPT to -specify decryption. The functions and global variable are as follows: - -int des_check_key; - DES keys are supposed to be odd parity. If this variable is set to - a non-zero value, des_set_key() will check that the key has odd - parity and is not one of the known weak DES keys. By default this - variable is turned off; - -void des_set_odd_parity( -des_cblock *key ); - This function takes a DES key (8 bytes) and sets the parity to odd. - -int des_is_weak_key( -des_cblock *key ); - This function returns a non-zero value if the DES key passed is a - weak, DES key. If it is a weak key, don't use it, try a different - one. If you are using 'random' keys, the chances of hitting a weak - key are 1/2^52 so it is probably not worth checking for them. - -int des_set_key( -des_cblock *key, -des_key_schedule schedule); - Des_set_key converts an 8 byte DES key into a des_key_schedule. - A des_key_schedule is an expanded form of the key which is used to - perform actual encryption. It can be regenerated from the DES key - so it only needs to be kept when encryption or decryption is about - to occur. Don't save or pass around des_key_schedule's since they - are CPU architecture dependent, DES keys are not. If des_check_key - is non zero, zero is returned if the key has the wrong parity or - the key is a weak key, else 1 is returned. - -int des_key_sched( -des_cblock *key, -des_key_schedule schedule); - An alternative name for des_set_key(). - -int des_rw_mode; /* defaults to DES_PCBC_MODE */ - This flag holds either DES_CBC_MODE or DES_PCBC_MODE (default). - This specifies the function to use in the enc_read() and enc_write() - functions. - -void des_encrypt( -unsigned long *data, -des_key_schedule ks, -int enc); - This is the DES encryption function that gets called by just about - every other DES routine in the library. You should not use this - function except to implement 'modes' of DES. I say this because the - functions that call this routine do the conversion from 'char *' to - long, and this needs to be done to make sure 'non-aligned' memory - access do not occur. The characters are loaded 'little endian', - have a look at my source code for more details on how I use this - function. - Data is a pointer to 2 unsigned long's and ks is the - des_key_schedule to use. enc, is non zero specifies encryption, - zero if decryption. - -void des_encrypt2( -unsigned long *data, -des_key_schedule ks, -int enc); - This functions is the same as des_encrypt() except that the DES - initial permutation (IP) and final permutation (FP) have been left - out. As for des_encrypt(), you should not use this function. - It is used by the routines in my library that implement triple DES. - IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same - as des_encrypt() des_encrypt() des_encrypt() except faster :-). - -void des_ecb_encrypt( -des_cblock *input, -des_cblock *output, -des_key_schedule ks, -int enc); - This is the basic Electronic Code Book form of DES, the most basic - form. Input is encrypted into output using the key represented by - ks. If enc is non zero (DES_ENCRYPT), encryption occurs, otherwise - decryption occurs. Input is 8 bytes long and output is 8 bytes. - (the des_cblock structure is 8 chars). - -void des_ecb3_encrypt( -des_cblock *input, -des_cblock *output, -des_key_schedule ks1, -des_key_schedule ks2, -des_key_schedule ks3, -int enc); - This is the 3 key EDE mode of ECB DES. What this means is that - the 8 bytes of input is encrypted with ks1, decrypted with ks2 and - then encrypted again with ks3, before being put into output; - C=E(ks3,D(ks2,E(ks1,M))). There is a macro, des_ecb2_encrypt() - that only takes 2 des_key_schedules that implements, - C=E(ks1,D(ks2,E(ks1,M))) in that the final encrypt is done with ks1. - -void des_cbc_encrypt( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule ks, -des_cblock *ivec, -int enc); - This routine implements DES in Cipher Block Chaining mode. - Input, which should be a multiple of 8 bytes is encrypted - (or decrypted) to output which will also be a multiple of 8 bytes. - The number of bytes is in length (and from what I've said above, - should be a multiple of 8). If length is not a multiple of 8, I'm - not being held responsible :-). ivec is the initialisation vector. - This function does not modify this variable. To correctly implement - cbc mode, you need to do one of 2 things; copy the last 8 bytes of - cipher text for use as the next ivec in your application, - or use des_ncbc_encrypt(). - Only this routine has this problem with updating the ivec, all - other routines that are implementing cbc mode update ivec. - -void des_ncbc_encrypt( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule sk, -des_cblock *ivec, -int enc); - For historical reasons, des_cbc_encrypt() did not update the - ivec with the value requires so that subsequent calls to - des_cbc_encrypt() would 'chain'. This was needed so that the same - 'length' values would not need to be used when decrypting. - des_ncbc_encrypt() does the right thing. It is the same as - des_cbc_encrypt accept that ivec is updates with the correct value - to pass in subsequent calls to des_ncbc_encrypt(). I advise using - des_ncbc_encrypt() instead of des_cbc_encrypt(); - -void des_3cbc_encrypt( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule sk1, -des_key_schedule sk2, -des_cblock *ivec1, -des_cblock *ivec2, -int enc); - This function is flawed, do not use it. I have left it in the - library because it is used in my des(1) program and will function - correctly when used by des(1). If I removed the function, people - could end up unable to decrypt files. - This routine implements outer triple cbc encryption using 2 ks and - 2 ivec's. Use des_ede2_cbc_encrypt() instead. - -void des_ede3_cbc_encrypt( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule ks1, -des_key_schedule ks2, -des_key_schedule ks3, -des_cblock *ivec, -int enc); - This function implements inner triple CBC DES encryption with 3 - keys. What this means is that each 'DES' operation - inside the cbc mode is really an C=E(ks3,D(ks2,E(ks1,M))). - Again, this is cbc mode so an ivec is requires. - This mode is used by SSL. - There is also a des_ede2_cbc_encrypt() that only uses 2 - des_key_schedule's, the first being reused for the final - encryption. C=E(ks1,D(ks2,E(ks1,M))). This form of triple DES - is used by the RSAref library. - -void des_pcbc_encrypt( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule ks, -des_cblock *ivec, -int enc); - This is Propagating Cipher Block Chaining mode of DES. It is used - by Kerberos v4. It's parameters are the same as des_ncbc_encrypt(). - -void des_cfb_encrypt( -unsigned char *in, -unsigned char *out, -int numbits, -long length, -des_key_schedule ks, -des_cblock *ivec, -int enc); - Cipher Feedback Back mode of DES. This implementation 'feeds back' - in numbit blocks. The input (and output) is in multiples of numbits - bits. numbits should to be a multiple of 8 bits. Length is the - number of bytes input. If numbits is not a multiple of 8 bits, - the extra bits in the bytes will be considered padding. So if - numbits is 12, for each 2 input bytes, the 4 high bits of the - second byte will be ignored. So to encode 72 bits when using - a numbits of 12 take 12 bytes. To encode 72 bits when using - numbits of 9 will take 16 bytes. To encode 80 bits when using - numbits of 16 will take 10 bytes. etc, etc. This padding will - apply to both input and output. - - -void des_cfb64_encrypt( -unsigned char *in, -unsigned char *out, -long length, -des_key_schedule ks, -des_cblock *ivec, -int *num, -int enc); - This is one of the more useful functions in this DES library, it - implements CFB mode of DES with 64bit feedback. Why is this - useful you ask? Because this routine will allow you to encrypt an - arbitrary number of bytes, no 8 byte padding. Each call to this - routine will encrypt the input bytes to output and then update ivec - and num. num contains 'how far' we are though ivec. If this does - not make much sense, read more about cfb mode of DES :-). - -void des_ede3_cfb64_encrypt( -unsigned char *in, -unsigned char *out, -long length, -des_key_schedule ks1, -des_key_schedule ks2, -des_key_schedule ks3, -des_cblock *ivec, -int *num, -int enc); - Same as des_cfb64_encrypt() accept that the DES operation is - triple DES. As usual, there is a macro for - des_ede2_cfb64_encrypt() which reuses ks1. - -void des_ofb_encrypt( -unsigned char *in, -unsigned char *out, -int numbits, -long length, -des_key_schedule ks, -des_cblock *ivec); - This is a implementation of Output Feed Back mode of DES. It is - the same as des_cfb_encrypt() in that numbits is the size of the - units dealt with during input and output (in bits). - -void des_ofb64_encrypt( -unsigned char *in, -unsigned char *out, -long length, -des_key_schedule ks, -des_cblock *ivec, -int *num); - The same as des_cfb64_encrypt() except that it is Output Feed Back - mode. - -void des_ede3_ofb64_encrypt( -unsigned char *in, -unsigned char *out, -long length, -des_key_schedule ks1, -des_key_schedule ks2, -des_key_schedule ks3, -des_cblock *ivec, -int *num); - Same as des_ofb64_encrypt() accept that the DES operation is - triple DES. As usual, there is a macro for - des_ede2_ofb64_encrypt() which reuses ks1. - -int des_read_pw_string( -char *buf, -int length, -char *prompt, -int verify); - This routine is used to get a password from the terminal with echo - turned off. Buf is where the string will end up and length is the - size of buf. Prompt is a string presented to the 'user' and if - verify is set, the key is asked for twice and unless the 2 copies - match, an error is returned. A return code of -1 indicates a - system error, 1 failure due to use interaction, and 0 is success. - -unsigned long des_cbc_cksum( -des_cblock *input, -des_cblock *output, -long length, -des_key_schedule ks, -des_cblock *ivec); - This function produces an 8 byte checksum from input that it puts in - output and returns the last 4 bytes as a long. The checksum is - generated via cbc mode of DES in which only the last 8 byes are - kept. I would recommend not using this function but instead using - the EVP_Digest routines, or at least using MD5 or SHA. This - function is used by Kerberos v4 so that is why it stays in the - library. - -char *crypt( -const char *buf, -const char *salt); - This is my fast version of the unix crypt(3) function. This version - takes only a small amount of space relative to other fast - crypt() implementations. - -void des_string_to_key( -char *str, -des_cblock *key); - This function takes str and converts it into a DES key. I would - recommend using MD5 instead and use the first 8 bytes of output. - When I wrote the first version of these routines back in 1990, MD5 - did not exist but I feel these routines are still sound. This - routines is compatible with the one in MIT's libdes. - -void des_string_to_2keys( -char *str, -des_cblock *key1, -des_cblock *key2); - This function takes str and converts it into 2 DES keys. - I would recommend using MD5 and using the 16 bytes as the 2 keys. - I have nothing against these 2 'string_to_key' routines, it's just - that if you say that your encryption key is generated by using the - 16 bytes of an MD5 hash, every-one knows how you generated your - keys. - -int des_read_password( -des_cblock *key, -char *prompt, -int verify); - This routine combines des_read_pw_string() with des_string_to_key(). - -int des_read_2passwords( -des_cblock *key1, -des_cblock *key2, -char *prompt, -int verify); - This routine combines des_read_pw_string() with des_string_to_2key(). - -void des_random_seed( -des_cblock key); - This routine sets a starting point for des_random_key(). - -void des_random_key( -des_cblock ret); - This function return a random key. Make sure to 'seed' the random - number generator (with des_random_seed()) before using this function. - I personally now use a MD5 based random number system. - -int des_enc_read( -int fd, -char *buf, -int len, -des_key_schedule ks, -des_cblock *iv); - This function will write to a file descriptor the encrypted data - from buf. This data will be preceded by a 4 byte 'byte count' and - will be padded out to 8 bytes. The encryption is either CBC of - PCBC depending on the value of des_rw_mode. If it is DES_PCBC_MODE, - pcbc is used, if DES_CBC_MODE, cbc is used. The default is to use - DES_PCBC_MODE. - -int des_enc_write( -int fd, -char *buf, -int len, -des_key_schedule ks, -des_cblock *iv); - This routines read stuff written by des_enc_read() and decrypts it. - I have used these routines quite a lot but I don't believe they are - suitable for non-blocking io. If you are after a full - authentication/encryption over networks, have a look at SSL instead. - -unsigned long des_quad_cksum( -des_cblock *input, -des_cblock *output, -long length, -int out_count, -des_cblock *seed); - This is a function from Kerberos v4 that is not anything to do with - DES but was needed. It is a cksum that is quicker to generate than - des_cbc_cksum(); I personally would use MD5 routines now. -===== -Modes of DES -Quite a bit of the following information has been taken from - AS 2805.5.2 - Australian Standard - Electronic funds transfer - Requirements for interfaces, - Part 5.2: Modes of operation for an n-bit block cipher algorithm - Appendix A - -There are several different modes in which DES can be used, they are -as follows. - -Electronic Codebook Mode (ECB) (des_ecb_encrypt()) -- 64 bits are enciphered at a time. -- The order of the blocks can be rearranged without detection. -- The same plaintext block always produces the same ciphertext block - (for the same key) making it vulnerable to a 'dictionary attack'. -- An error will only affect one ciphertext block. - -Cipher Block Chaining Mode (CBC) (des_cbc_encrypt()) -- a multiple of 64 bits are enciphered at a time. -- The CBC mode produces the same ciphertext whenever the same - plaintext is encrypted using the same key and starting variable. -- The chaining operation makes the ciphertext blocks dependent on the - current and all preceding plaintext blocks and therefore blocks can not - be rearranged. -- The use of different starting variables prevents the same plaintext - enciphering to the same ciphertext. -- An error will affect the current and the following ciphertext blocks. - -Cipher Feedback Mode (CFB) (des_cfb_encrypt()) -- a number of bits (j) <= 64 are enciphered at a time. -- The CFB mode produces the same ciphertext whenever the same - plaintext is encrypted using the same key and starting variable. -- The chaining operation makes the ciphertext variables dependent on the - current and all preceding variables and therefore j-bit variables are - chained together and can not be rearranged. -- The use of different starting variables prevents the same plaintext - enciphering to the same ciphertext. -- The strength of the CFB mode depends on the size of k (maximal if - j == k). In my implementation this is always the case. -- Selection of a small value for j will require more cycles through - the encipherment algorithm per unit of plaintext and thus cause - greater processing overheads. -- Only multiples of j bits can be enciphered. -- An error will affect the current and the following ciphertext variables. - -Output Feedback Mode (OFB) (des_ofb_encrypt()) -- a number of bits (j) <= 64 are enciphered at a time. -- The OFB mode produces the same ciphertext whenever the same - plaintext enciphered using the same key and starting variable. More - over, in the OFB mode the same key stream is produced when the same - key and start variable are used. Consequently, for security reasons - a specific start variable should be used only once for a given key. -- The absence of chaining makes the OFB more vulnerable to specific attacks. -- The use of different start variables values prevents the same - plaintext enciphering to the same ciphertext, by producing different - key streams. -- Selection of a small value for j will require more cycles through - the encipherment algorithm per unit of plaintext and thus cause - greater processing overheads. -- Only multiples of j bits can be enciphered. -- OFB mode of operation does not extend ciphertext errors in the - resultant plaintext output. Every bit error in the ciphertext causes - only one bit to be in error in the deciphered plaintext. -- OFB mode is not self-synchronising. If the two operation of - encipherment and decipherment get out of synchronism, the system needs - to be re-initialised. -- Each re-initialisation should use a value of the start variable - different from the start variable values used before with the same - key. The reason for this is that an identical bit stream would be - produced each time from the same parameters. This would be - susceptible to a ' known plaintext' attack. - -Triple ECB Mode (des_ecb3_encrypt()) -- Encrypt with key1, decrypt with key2 and encrypt with key3 again. -- As for ECB encryption but increases the key length to 168 bits. - There are theoretic attacks that can be used that make the effective - key length 112 bits, but this attack also requires 2^56 blocks of - memory, not very likely, even for the NSA. -- If both keys are the same it is equivalent to encrypting once with - just one key. -- If the first and last key are the same, the key length is 112 bits. - There are attacks that could reduce the key space to 55 bit's but it - requires 2^56 blocks of memory. -- If all 3 keys are the same, this is effectively the same as normal - ecb mode. - -Triple CBC Mode (des_ede3_cbc_encrypt()) -- Encrypt with key1, decrypt with key2 and then encrypt with key3. -- As for CBC encryption but increases the key length to 168 bits with - the same restrictions as for triple ecb mode. diff --git a/secure/lib/libdes/des.h b/secure/lib/libdes/des.h deleted file mode 100644 index 80b293b068866..0000000000000 --- a/secure/lib/libdes/des.h +++ /dev/null @@ -1,240 +0,0 @@ -/* lib/des/des.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#ifndef HEADER_DES_H -#define HEADER_DES_H - -#include - -typedef unsigned char des_cblock[8]; -typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; - -#define DES_KEY_SZ (sizeof(des_cblock)) -#define DES_SCHEDULE_SZ (sizeof(des_key_schedule)) - -#define DES_ENCRYPT 1 -#define DES_DECRYPT 0 - -#define DES_CBC_MODE 0 -#define DES_PCBC_MODE 1 - -#define des_ecb2_encrypt(i,o,k1,k2,e) \ - des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e)) - -#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \ - des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e)) - -#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \ - des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e)) - -#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ - des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) - -#define C_Block des_cblock -#define Key_schedule des_key_schedule -#define ENCRYPT DES_ENCRYPT -#define DECRYPT DES_DECRYPT -#define KEY_SZ DES_KEY_SZ -#define string_to_key des_string_to_key -#define read_pw_string des_read_pw_string -#define random_key des_random_key -#define pcbc_encrypt des_pcbc_encrypt -#define set_key des_set_key -#define key_sched des_key_sched -#define ecb_encrypt des_ecb_encrypt -#define cbc_encrypt des_cbc_encrypt -#define ncbc_encrypt des_ncbc_encrypt -#define cbc_cksum des_cbc_cksum -#define quad_cksum des_quad_cksum - -/* For compatibility with the MIT lib - eay 20/05/92 */ -typedef struct des_key_schedule bit_64; -#define des_fixup_key_parity des_set_odd_parity -#define des_check_key_parity check_parity - -extern int des_check_key; /* defaults to false */ -extern int des_rw_mode; /* defaults to DES_PCBC_MODE */ - -/* The next line is used to disable full ANSI prototypes, if your - * compiler has problems with the prototypes, make sure this line always - * evaluates to true :-) */ -#if defined(MSDOS) || defined(__STDC__) -#undef NOPROTO -#endif -#ifndef NOPROTO -void des_ecb3_encrypt(des_cblock *input,des_cblock *output, - des_key_schedule ks1,des_key_schedule ks2, - des_key_schedule ks3, int enc); -unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output, - long length,des_key_schedule schedule,des_cblock *ivec); -void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length, - des_key_schedule schedule,des_cblock *ivec,int enc); -void des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length, - des_key_schedule schedule,des_cblock *ivec,int enc); -void des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length, - des_key_schedule sk1,des_key_schedule sk2, - des_cblock *ivec1,des_cblock *ivec2,int enc); -void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits, - long length,des_key_schedule schedule,des_cblock *ivec,int enc); -void des_ecb_encrypt(des_cblock *input,des_cblock *output, - des_key_schedule ks,int enc); -void des_encrypt(unsigned long *data,des_key_schedule ks, int enc); -void des_encrypt2(unsigned long *data,des_key_schedule ks, int enc); -void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, - long length, des_key_schedule ks1, des_key_schedule ks2, - des_key_schedule ks3, des_cblock *ivec, int enc); -void des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out, - long length, des_key_schedule ks1, des_key_schedule ks2, - des_key_schedule ks3, des_cblock *ivec, int *num, int encrypt); -void des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out, - long length, des_key_schedule ks1, des_key_schedule ks2, - des_key_schedule ks3, des_cblock *ivec, int *num); - -int des_enc_read(int fd,char *buf,int len,des_key_schedule sched, - des_cblock *iv); -int des_enc_write(int fd,char *buf,int len,des_key_schedule sched, - des_cblock *iv); -#if 0 -#ifdef PERL5 -char *des_crypt(const char *buf,const char *salt); -#else -/* some stupid compilers complain because I have declared char instead - * of const char */ -#ifdef HEADER_DES_LOCL_H -char *crypt(const char *buf,const char *salt); -#else -char *crypt(); -#endif -#endif -#endif -void des_ofb_encrypt(unsigned char *in,unsigned char *out, - int numbits,long length,des_key_schedule schedule,des_cblock *ivec); -void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length, - des_key_schedule schedule,des_cblock *ivec,int enc); -unsigned long des_quad_cksum(des_cblock *input,des_cblock *output, - long length,int out_count,des_cblock *seed); -void des_random_seed(des_cblock key); -void des_random_key(des_cblock ret); -int des_read_password(des_cblock *key,char *prompt,int verify); -int des_read_2passwords(des_cblock *key1,des_cblock *key2, - char *prompt,int verify); -int des_read_pw_string(char *buf,int length,char *prompt,int verify); -void des_set_odd_parity(des_cblock *key); -int des_is_weak_key(des_cblock *key); -int des_set_key(des_cblock *key,des_key_schedule schedule); -int des_key_sched(des_cblock *key,des_key_schedule schedule); -void des_string_to_key(char *str,des_cblock *key); -void des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2); -void des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, - des_key_schedule schedule, des_cblock *ivec, int *num, int enc); -void des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, - des_key_schedule schedule, des_cblock *ivec, int *num); - -/* Extra functions from Mark Murray */ -void des_cblock_print_file(des_cblock *cb, FILE *fp); -/* The following functions are not in the normal unix build or the - * SSLeay build. When using the SSLeay build, use RAND_seed() - * and RAND_bytes() instead. */ -int des_new_random_key(des_cblock *key); -void des_init_random_number_generator(des_cblock *key); -void des_set_random_generator_seed(des_cblock *key); -void des_set_sequence_number(des_cblock new_sequence_number); -void des_generate_random_block(des_cblock *block); - -#else - -void des_ecb3_encrypt(); -unsigned long des_cbc_cksum(); -void des_cbc_encrypt(); -void des_ncbc_encrypt(); -void des_3cbc_encrypt(); -void des_cfb_encrypt(); -void des_ede3_cfb64_encrypt(); -void des_ede3_ofb64_encrypt(); -void des_ecb_encrypt(); -void des_encrypt(); -void des_encrypt2(); -void des_ede3_cbc_encrypt(); -int des_enc_read(); -int des_enc_write(); -#if 0 -#ifdef PERL5 -char *des_crypt(); -#else -char *crypt(); -#endif -#endif -void des_ofb_encrypt(); -void des_pcbc_encrypt(); -unsigned long des_quad_cksum(); -void des_random_seed(); -void des_random_key(); -int des_read_password(); -int des_read_2passwords(); -int des_read_pw_string(); -void des_set_odd_parity(); -int des_is_weak_key(); -int des_set_key(); -int des_key_sched(); -void des_string_to_key(); -void des_string_to_2keys(); -void des_cfb64_encrypt(); -void des_ofb64_encrypt(); - -/* Extra functions from Mark Murray */ -void des_cblock_print_file(); -/* The following functions are not in the normal unix build or the - * SSLeay build. When using the SSLeay build, use RAND_seed() - * and RAND_bytes() instead. */ -int des_new_random_key(); -void des_init_random_number_generator(); -void des_set_random_generator_seed(); -void des_set_sequence_number(); -void des_generate_random_block(); - -#endif -#endif diff --git a/secure/lib/libdes/des.man b/secure/lib/libdes/des.man deleted file mode 100644 index 734119906b8f1..0000000000000 --- a/secure/lib/libdes/des.man +++ /dev/null @@ -1,186 +0,0 @@ -.TH DES 1 -.SH NAME -des - encrypt or decrypt data using Data Encryption Standard -.SH SYNOPSIS -.B des -( -.B \-e -| -.B \-E -) | ( -.B \-d -| -.B \-D -) | ( -.B \-\fR[\fPcC\fR][\fPckname\fR]\fP -) | -[ -.B \-b3hfs -] [ -.B \-k -.I key -] -] [ -.B \-u\fR[\fIuuname\fR] -[ -.I input-file -[ -.I output-file -] ] -.SH DESCRIPTION -.B des -encrypts and decrypts data using the -Data Encryption Standard algorithm. -One of -.B \-e, \-E -(for encrypt) or -.B \-d, \-D -(for decrypt) must be specified. -It is also possible to use -.B \-c -or -.B \-C -in conjunction or instead of the a encrypt/decrypt option to generate -a 16 character hexadecimal checksum, generated via the -.I des_cbc_cksum. -.LP -Two standard encryption modes are supported by the -.B des -program, Cipher Block Chaining (the default) and Electronic Code Book -(specified with -.B \-b -). -.LP -The key used for the DES -algorithm is obtained by prompting the user unless the -.B `\-k -.I key' -option is given. -If the key is an argument to the -.B des -command, it is potentially visible to users executing -.BR ps (1) -or a derivative. To minimise this possibility, -.B des -takes care to destroy the key argument immediately upon entry. -If your shell keeps a history file be careful to make sure it is not -world readable. -.LP -Since this program attempts to maintain compatability with sunOS's -des(1) command, there are 2 different methods used to convert the user -supplied key to a des key. -Whenever and one or more of -.B \-E, \-D, \-C -or -.B \-3 -options are used, the key conversion procedure will not be compatible -with the sunOS des(1) version but will use all the user supplied -character to generate the des key. -.B des -command reads from standard input unless -.I input-file -is specified and writes to standard output unless -.I output-file -is given. -.SH OPTIONS -.TP -.B \-b -Select ECB -(eight bytes at a time) encryption mode. -.TP -.B \-3 -Encrypt using triple encryption. -By default triple cbc encryption is used but if the -.B \-b -option is used then triple ecb encryption is performed. -If the key is less than 8 characters long, the flag has no effect. -.TP -.B \-e -Encrypt data using an 8 byte key in a manner compatible with sunOS -des(1). -.TP -.B \-E -Encrypt data using a key of nearly unlimited length (1024 bytes). -This will product a more secure encryption. -.TP -.B \-d -Decrypt data that was encrypted with the \-e option. -.TP -.B \-D -Decrypt data that was encrypted with the \-E option. -.TP -.B \-c -Generate a 16 character hexadecimal cbc checksum and output this to -stderr. -If a filename was specified after the -.B \-c -option, the checksum is output to that file. -The checksum is generated using a key generated in a sunOS compatible -manner. -.TP -.B \-C -A cbc checksum is generated in the same manner as described for the -.B \-c -option but the DES key is generated in the same manner as used for the -.B \-E -and -.B \-D -options -.TP -.B \-f -Does nothing - allowed for compatibility with sunOS des(1) command. -.TP -.B \-s -Does nothing - allowed for compatibility with sunOS des(1) command. -.TP -.B "\-k \fIkey\fP" -Use the encryption -.I key -specified. -.TP -.B "\-h" -The -.I key -is assumed to be a 16 character hexadecimal number. -If the -.B "\-3" -option is used the key is assumed to be a 32 character hexadecimal -number. -.TP -.B \-u -This flag is used to read and write uuencoded files. If decrypting, -the input file is assumed to contain uuencoded, DES encrypted data. -If encrypting, the characters following the -u are used as the name of -the uuencoded file to embed in the begin line of the uuencoded -output. If there is no name specified after the -u, the name text.des -will be embedded in the header. -.SH SEE ALSO -.B ps (1) -.B des_crypt(3) -.SH BUGS -.LP -The problem with using the -.B -e -option is the short key length. -It would be better to use a real 56-bit key rather than an -ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII -radically reduces the time necessary for a brute-force cryptographic attack. -My attempt to remove this problem is to add an alternative text-key to -DES-key function. This alternative function (accessed via -.B -E, -D, -S -and -.B -3 -) -uses DES to help generate the key. -.LP -Be carefully when using the -u option. Doing des -ud will -not decrypt filename (the -u option will gobble the d option). -.LP -The VMS operating system operates in a world where files are always a -multiple of 512 bytes. This causes problems when encrypted data is -send from unix to VMS since a 88 byte file will suddenly be padded -with 424 null bytes. To get around this problem, use the -u option -to uuencode the data before it is send to the VMS system. -.SH AUTHOR -.LP -Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au) diff --git a/secure/lib/libdes/des.pl b/secure/lib/libdes/des.pl deleted file mode 100755 index 5ba5a9b1c9e8c..0000000000000 --- a/secure/lib/libdes/des.pl +++ /dev/null @@ -1,536 +0,0 @@ -#!/usr/local/bin/perl -# Copyright (C) 1993 Eric Young -# des.pl - eric young 22/11/1991 eay@mincom.oz.au or eay@psych.psy.uq.oz.au -# eay - 92/08/31 - I think I have fixed all problems for 64bit -# versions of perl but I could be wrong since I have not tested it yet :-). -# -# This is an implementation of DES in perl. -# The two routines (des_set_key and des_ecb_encrypt) -# take 8 byte objects as arguments. -# -# des_set_key takes an 8 byte string as a key and returns a key schedule -# for use in calls to des_ecb_encrypt. -# des_ecb_encrypt takes three arguments, the first is a key schedule -# (make sure to pass it by reference with the *), the second is 1 -# to encrypt, 0 to decrypt. The third argument is an 8 byte object -# to encrypt. The function returns an 8 byte object that has been -# DES encrypted. -# -# example: -# require 'des.pl' -# -# $key =pack("C8",0x12,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); -# @ks= &des_set_key($key); -# -# $outbytes= &des_ecb_encrypt(*ks,1,$data); -# @enc =unpack("C8",$outbytes); -# - -package des; - -# The following 8 arrays are used in des_set_key -@skb0=( -# for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 -0x00000000,0x00000010,0x20000000,0x20000010, -0x00010000,0x00010010,0x20010000,0x20010010, -0x00000800,0x00000810,0x20000800,0x20000810, -0x00010800,0x00010810,0x20010800,0x20010810, -0x00000020,0x00000030,0x20000020,0x20000030, -0x00010020,0x00010030,0x20010020,0x20010030, -0x00000820,0x00000830,0x20000820,0x20000830, -0x00010820,0x00010830,0x20010820,0x20010830, -0x00080000,0x00080010,0x20080000,0x20080010, -0x00090000,0x00090010,0x20090000,0x20090010, -0x00080800,0x00080810,0x20080800,0x20080810, -0x00090800,0x00090810,0x20090800,0x20090810, -0x00080020,0x00080030,0x20080020,0x20080030, -0x00090020,0x00090030,0x20090020,0x20090030, -0x00080820,0x00080830,0x20080820,0x20080830, -0x00090820,0x00090830,0x20090820,0x20090830, -); -@skb1=( -# for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 -0x00000000,0x02000000,0x00002000,0x02002000, -0x00200000,0x02200000,0x00202000,0x02202000, -0x00000004,0x02000004,0x00002004,0x02002004, -0x00200004,0x02200004,0x00202004,0x02202004, -0x00000400,0x02000400,0x00002400,0x02002400, -0x00200400,0x02200400,0x00202400,0x02202400, -0x00000404,0x02000404,0x00002404,0x02002404, -0x00200404,0x02200404,0x00202404,0x02202404, -0x10000000,0x12000000,0x10002000,0x12002000, -0x10200000,0x12200000,0x10202000,0x12202000, -0x10000004,0x12000004,0x10002004,0x12002004, -0x10200004,0x12200004,0x10202004,0x12202004, -0x10000400,0x12000400,0x10002400,0x12002400, -0x10200400,0x12200400,0x10202400,0x12202400, -0x10000404,0x12000404,0x10002404,0x12002404, -0x10200404,0x12200404,0x10202404,0x12202404, -); -@skb2=( -# for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 -0x00000000,0x00000001,0x00040000,0x00040001, -0x01000000,0x01000001,0x01040000,0x01040001, -0x00000002,0x00000003,0x00040002,0x00040003, -0x01000002,0x01000003,0x01040002,0x01040003, -0x00000200,0x00000201,0x00040200,0x00040201, -0x01000200,0x01000201,0x01040200,0x01040201, -0x00000202,0x00000203,0x00040202,0x00040203, -0x01000202,0x01000203,0x01040202,0x01040203, -0x08000000,0x08000001,0x08040000,0x08040001, -0x09000000,0x09000001,0x09040000,0x09040001, -0x08000002,0x08000003,0x08040002,0x08040003, -0x09000002,0x09000003,0x09040002,0x09040003, -0x08000200,0x08000201,0x08040200,0x08040201, -0x09000200,0x09000201,0x09040200,0x09040201, -0x08000202,0x08000203,0x08040202,0x08040203, -0x09000202,0x09000203,0x09040202,0x09040203, -); -@skb3=( -# for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 -0x00000000,0x00100000,0x00000100,0x00100100, -0x00000008,0x00100008,0x00000108,0x00100108, -0x00001000,0x00101000,0x00001100,0x00101100, -0x00001008,0x00101008,0x00001108,0x00101108, -0x04000000,0x04100000,0x04000100,0x04100100, -0x04000008,0x04100008,0x04000108,0x04100108, -0x04001000,0x04101000,0x04001100,0x04101100, -0x04001008,0x04101008,0x04001108,0x04101108, -0x00020000,0x00120000,0x00020100,0x00120100, -0x00020008,0x00120008,0x00020108,0x00120108, -0x00021000,0x00121000,0x00021100,0x00121100, -0x00021008,0x00121008,0x00021108,0x00121108, -0x04020000,0x04120000,0x04020100,0x04120100, -0x04020008,0x04120008,0x04020108,0x04120108, -0x04021000,0x04121000,0x04021100,0x04121100, -0x04021008,0x04121008,0x04021108,0x04121108, -); -@skb4=( -# for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 -0x00000000,0x10000000,0x00010000,0x10010000, -0x00000004,0x10000004,0x00010004,0x10010004, -0x20000000,0x30000000,0x20010000,0x30010000, -0x20000004,0x30000004,0x20010004,0x30010004, -0x00100000,0x10100000,0x00110000,0x10110000, -0x00100004,0x10100004,0x00110004,0x10110004, -0x20100000,0x30100000,0x20110000,0x30110000, -0x20100004,0x30100004,0x20110004,0x30110004, -0x00001000,0x10001000,0x00011000,0x10011000, -0x00001004,0x10001004,0x00011004,0x10011004, -0x20001000,0x30001000,0x20011000,0x30011000, -0x20001004,0x30001004,0x20011004,0x30011004, -0x00101000,0x10101000,0x00111000,0x10111000, -0x00101004,0x10101004,0x00111004,0x10111004, -0x20101000,0x30101000,0x20111000,0x30111000, -0x20101004,0x30101004,0x20111004,0x30111004, -); -@skb5=( -# for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 -0x00000000,0x08000000,0x00000008,0x08000008, -0x00000400,0x08000400,0x00000408,0x08000408, -0x00020000,0x08020000,0x00020008,0x08020008, -0x00020400,0x08020400,0x00020408,0x08020408, -0x00000001,0x08000001,0x00000009,0x08000009, -0x00000401,0x08000401,0x00000409,0x08000409, -0x00020001,0x08020001,0x00020009,0x08020009, -0x00020401,0x08020401,0x00020409,0x08020409, -0x02000000,0x0A000000,0x02000008,0x0A000008, -0x02000400,0x0A000400,0x02000408,0x0A000408, -0x02020000,0x0A020000,0x02020008,0x0A020008, -0x02020400,0x0A020400,0x02020408,0x0A020408, -0x02000001,0x0A000001,0x02000009,0x0A000009, -0x02000401,0x0A000401,0x02000409,0x0A000409, -0x02020001,0x0A020001,0x02020009,0x0A020009, -0x02020401,0x0A020401,0x02020409,0x0A020409, -); -@skb6=( -# for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 -0x00000000,0x00000100,0x00080000,0x00080100, -0x01000000,0x01000100,0x01080000,0x01080100, -0x00000010,0x00000110,0x00080010,0x00080110, -0x01000010,0x01000110,0x01080010,0x01080110, -0x00200000,0x00200100,0x00280000,0x00280100, -0x01200000,0x01200100,0x01280000,0x01280100, -0x00200010,0x00200110,0x00280010,0x00280110, -0x01200010,0x01200110,0x01280010,0x01280110, -0x00000200,0x00000300,0x00080200,0x00080300, -0x01000200,0x01000300,0x01080200,0x01080300, -0x00000210,0x00000310,0x00080210,0x00080310, -0x01000210,0x01000310,0x01080210,0x01080310, -0x00200200,0x00200300,0x00280200,0x00280300, -0x01200200,0x01200300,0x01280200,0x01280300, -0x00200210,0x00200310,0x00280210,0x00280310, -0x01200210,0x01200310,0x01280210,0x01280310, -); -@skb7=( -# for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 -0x00000000,0x04000000,0x00040000,0x04040000, -0x00000002,0x04000002,0x00040002,0x04040002, -0x00002000,0x04002000,0x00042000,0x04042000, -0x00002002,0x04002002,0x00042002,0x04042002, -0x00000020,0x04000020,0x00040020,0x04040020, -0x00000022,0x04000022,0x00040022,0x04040022, -0x00002020,0x04002020,0x00042020,0x04042020, -0x00002022,0x04002022,0x00042022,0x04042022, -0x00000800,0x04000800,0x00040800,0x04040800, -0x00000802,0x04000802,0x00040802,0x04040802, -0x00002800,0x04002800,0x00042800,0x04042800, -0x00002802,0x04002802,0x00042802,0x04042802, -0x00000820,0x04000820,0x00040820,0x04040820, -0x00000822,0x04000822,0x00040822,0x04040822, -0x00002820,0x04002820,0x00042820,0x04042820, -0x00002822,0x04002822,0x00042822,0x04042822, -); - -@shifts2=(0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0); - -# used in ecb_encrypt -@SP0=( -0x00410100, 0x00010000, 0x40400000, 0x40410100, -0x00400000, 0x40010100, 0x40010000, 0x40400000, -0x40010100, 0x00410100, 0x00410000, 0x40000100, -0x40400100, 0x00400000, 0x00000000, 0x40010000, -0x00010000, 0x40000000, 0x00400100, 0x00010100, -0x40410100, 0x00410000, 0x40000100, 0x00400100, -0x40000000, 0x00000100, 0x00010100, 0x40410000, -0x00000100, 0x40400100, 0x40410000, 0x00000000, -0x00000000, 0x40410100, 0x00400100, 0x40010000, -0x00410100, 0x00010000, 0x40000100, 0x00400100, -0x40410000, 0x00000100, 0x00010100, 0x40400000, -0x40010100, 0x40000000, 0x40400000, 0x00410000, -0x40410100, 0x00010100, 0x00410000, 0x40400100, -0x00400000, 0x40000100, 0x40010000, 0x00000000, -0x00010000, 0x00400000, 0x40400100, 0x00410100, -0x40000000, 0x40410000, 0x00000100, 0x40010100, -); -@SP1=( -0x08021002, 0x00000000, 0x00021000, 0x08020000, -0x08000002, 0x00001002, 0x08001000, 0x00021000, -0x00001000, 0x08020002, 0x00000002, 0x08001000, -0x00020002, 0x08021000, 0x08020000, 0x00000002, -0x00020000, 0x08001002, 0x08020002, 0x00001000, -0x00021002, 0x08000000, 0x00000000, 0x00020002, -0x08001002, 0x00021002, 0x08021000, 0x08000002, -0x08000000, 0x00020000, 0x00001002, 0x08021002, -0x00020002, 0x08021000, 0x08001000, 0x00021002, -0x08021002, 0x00020002, 0x08000002, 0x00000000, -0x08000000, 0x00001002, 0x00020000, 0x08020002, -0x00001000, 0x08000000, 0x00021002, 0x08001002, -0x08021000, 0x00001000, 0x00000000, 0x08000002, -0x00000002, 0x08021002, 0x00021000, 0x08020000, -0x08020002, 0x00020000, 0x00001002, 0x08001000, -0x08001002, 0x00000002, 0x08020000, 0x00021000, -); -@SP2=( -0x20800000, 0x00808020, 0x00000020, 0x20800020, -0x20008000, 0x00800000, 0x20800020, 0x00008020, -0x00800020, 0x00008000, 0x00808000, 0x20000000, -0x20808020, 0x20000020, 0x20000000, 0x20808000, -0x00000000, 0x20008000, 0x00808020, 0x00000020, -0x20000020, 0x20808020, 0x00008000, 0x20800000, -0x20808000, 0x00800020, 0x20008020, 0x00808000, -0x00008020, 0x00000000, 0x00800000, 0x20008020, -0x00808020, 0x00000020, 0x20000000, 0x00008000, -0x20000020, 0x20008000, 0x00808000, 0x20800020, -0x00000000, 0x00808020, 0x00008020, 0x20808000, -0x20008000, 0x00800000, 0x20808020, 0x20000000, -0x20008020, 0x20800000, 0x00800000, 0x20808020, -0x00008000, 0x00800020, 0x20800020, 0x00008020, -0x00800020, 0x00000000, 0x20808000, 0x20000020, -0x20800000, 0x20008020, 0x00000020, 0x00808000, -); -@SP3=( -0x00080201, 0x02000200, 0x00000001, 0x02080201, -0x00000000, 0x02080000, 0x02000201, 0x00080001, -0x02080200, 0x02000001, 0x02000000, 0x00000201, -0x02000001, 0x00080201, 0x00080000, 0x02000000, -0x02080001, 0x00080200, 0x00000200, 0x00000001, -0x00080200, 0x02000201, 0x02080000, 0x00000200, -0x00000201, 0x00000000, 0x00080001, 0x02080200, -0x02000200, 0x02080001, 0x02080201, 0x00080000, -0x02080001, 0x00000201, 0x00080000, 0x02000001, -0x00080200, 0x02000200, 0x00000001, 0x02080000, -0x02000201, 0x00000000, 0x00000200, 0x00080001, -0x00000000, 0x02080001, 0x02080200, 0x00000200, -0x02000000, 0x02080201, 0x00080201, 0x00080000, -0x02080201, 0x00000001, 0x02000200, 0x00080201, -0x00080001, 0x00080200, 0x02080000, 0x02000201, -0x00000201, 0x02000000, 0x02000001, 0x02080200, -); -@SP4=( -0x01000000, 0x00002000, 0x00000080, 0x01002084, -0x01002004, 0x01000080, 0x00002084, 0x01002000, -0x00002000, 0x00000004, 0x01000004, 0x00002080, -0x01000084, 0x01002004, 0x01002080, 0x00000000, -0x00002080, 0x01000000, 0x00002004, 0x00000084, -0x01000080, 0x00002084, 0x00000000, 0x01000004, -0x00000004, 0x01000084, 0x01002084, 0x00002004, -0x01002000, 0x00000080, 0x00000084, 0x01002080, -0x01002080, 0x01000084, 0x00002004, 0x01002000, -0x00002000, 0x00000004, 0x01000004, 0x01000080, -0x01000000, 0x00002080, 0x01002084, 0x00000000, -0x00002084, 0x01000000, 0x00000080, 0x00002004, -0x01000084, 0x00000080, 0x00000000, 0x01002084, -0x01002004, 0x01002080, 0x00000084, 0x00002000, -0x00002080, 0x01002004, 0x01000080, 0x00000084, -0x00000004, 0x00002084, 0x01002000, 0x01000004, -); -@SP5=( -0x10000008, 0x00040008, 0x00000000, 0x10040400, -0x00040008, 0x00000400, 0x10000408, 0x00040000, -0x00000408, 0x10040408, 0x00040400, 0x10000000, -0x10000400, 0x10000008, 0x10040000, 0x00040408, -0x00040000, 0x10000408, 0x10040008, 0x00000000, -0x00000400, 0x00000008, 0x10040400, 0x10040008, -0x10040408, 0x10040000, 0x10000000, 0x00000408, -0x00000008, 0x00040400, 0x00040408, 0x10000400, -0x00000408, 0x10000000, 0x10000400, 0x00040408, -0x10040400, 0x00040008, 0x00000000, 0x10000400, -0x10000000, 0x00000400, 0x10040008, 0x00040000, -0x00040008, 0x10040408, 0x00040400, 0x00000008, -0x10040408, 0x00040400, 0x00040000, 0x10000408, -0x10000008, 0x10040000, 0x00040408, 0x00000000, -0x00000400, 0x10000008, 0x10000408, 0x10040400, -0x10040000, 0x00000408, 0x00000008, 0x10040008, -); -@SP6=( -0x00000800, 0x00000040, 0x00200040, 0x80200000, -0x80200840, 0x80000800, 0x00000840, 0x00000000, -0x00200000, 0x80200040, 0x80000040, 0x00200800, -0x80000000, 0x00200840, 0x00200800, 0x80000040, -0x80200040, 0x00000800, 0x80000800, 0x80200840, -0x00000000, 0x00200040, 0x80200000, 0x00000840, -0x80200800, 0x80000840, 0x00200840, 0x80000000, -0x80000840, 0x80200800, 0x00000040, 0x00200000, -0x80000840, 0x00200800, 0x80200800, 0x80000040, -0x00000800, 0x00000040, 0x00200000, 0x80200800, -0x80200040, 0x80000840, 0x00000840, 0x00000000, -0x00000040, 0x80200000, 0x80000000, 0x00200040, -0x00000000, 0x80200040, 0x00200040, 0x00000840, -0x80000040, 0x00000800, 0x80200840, 0x00200000, -0x00200840, 0x80000000, 0x80000800, 0x80200840, -0x80200000, 0x00200840, 0x00200800, 0x80000800, -); -@SP7=( -0x04100010, 0x04104000, 0x00004010, 0x00000000, -0x04004000, 0x00100010, 0x04100000, 0x04104010, -0x00000010, 0x04000000, 0x00104000, 0x00004010, -0x00104010, 0x04004010, 0x04000010, 0x04100000, -0x00004000, 0x00104010, 0x00100010, 0x04004000, -0x04104010, 0x04000010, 0x00000000, 0x00104000, -0x04000000, 0x00100000, 0x04004010, 0x04100010, -0x00100000, 0x00004000, 0x04104000, 0x00000010, -0x00100000, 0x00004000, 0x04000010, 0x04104010, -0x00004010, 0x04000000, 0x00000000, 0x00104000, -0x04100010, 0x04004010, 0x04004000, 0x00100010, -0x04104000, 0x00000010, 0x00100010, 0x04004000, -0x04104010, 0x00100000, 0x04100000, 0x04000010, -0x00104000, 0x00004010, 0x04004010, 0x04100000, -0x00000010, 0x04104000, 0x00104010, 0x00000000, -0x04000000, 0x04100010, 0x00004000, 0x00104010, -); - -sub main'des_set_key - { - local($param)=@_; - local(@key); - local($c,$d,$i,$s,$t); - local(@ks)=(); - - # Get the bytes in the order we want. - @key=unpack("C8",$param); - - $c= ($key[0] )| - ($key[1]<< 8)| - ($key[2]<<16)| - ($key[3]<<24); - $d= ($key[4] )| - ($key[5]<< 8)| - ($key[6]<<16)| - ($key[7]<<24); - - &doPC1(*c,*d); - - for $i (@shifts2) - { - if ($i) - { - $c=($c>>2)|($c<<26); - $d=($d>>2)|($d<<26); - } - else - { - $c=($c>>1)|($c<<27); - $d=($d>>1)|($d<<27); - } - $c&=0x0fffffff; - $d&=0x0fffffff; - $s= $skb0[ ($c )&0x3f ]| - $skb1[(($c>> 6)&0x03)|(($c>> 7)&0x3c)]| - $skb2[(($c>>13)&0x0f)|(($c>>14)&0x30)]| - $skb3[(($c>>20)&0x01)|(($c>>21)&0x06) | - (($c>>22)&0x38)]; - $t= $skb4[ ($d )&0x3f ]| - $skb5[(($d>> 7)&0x03)|(($d>> 8)&0x3c)]| - $skb6[ ($d>>15)&0x3f ]| - $skb7[(($d>>21)&0x0f)|(($d>>22)&0x30)]; - push(@ks,(($t<<16)|($s&0x0000ffff))&0xffffffff); - $s= ($s>>16)|($t&0xffff0000) ; - push(@ks,(($s<<4)|($s>>28))&0xffffffff); - } - @ks; - } - -sub doPC1 - { - local(*a,*b)=@_; - local($t); - - $t=(($b>>4)^$a)&0x0f0f0f0f; - $b^=($t<<4); $a^=$t; - # do $a first - $t=(($a<<18)^$a)&0xcccc0000; - $a=$a^$t^($t>>18); - $t=(($a<<17)^$a)&0xaaaa0000; - $a=$a^$t^($t>>17); - $t=(($a<< 8)^$a)&0x00ff0000; - $a=$a^$t^($t>> 8); - $t=(($a<<17)^$a)&0xaaaa0000; - $a=$a^$t^($t>>17); - - # now do $b - $t=(($b<<24)^$b)&0xff000000; - $b=$b^$t^($t>>24); - $t=(($b<< 8)^$b)&0x00ff0000; - $b=$b^$t^($t>> 8); - $t=(($b<<14)^$b)&0x33330000; - $b=$b^$t^($t>>14); - $b=(($b&0x00aa00aa)<<7)|(($b&0x55005500)>>7)|($b&0xaa55aa55); - $b=($b>>8)|(($a&0xf0000000)>>4); - $a&=0x0fffffff; - } - -sub doIP - { - local(*a,*b)=@_; - local($t); - - $t=(($b>> 4)^$a)&0x0f0f0f0f; - $b^=($t<< 4); $a^=$t; - $t=(($a>>16)^$b)&0x0000ffff; - $a^=($t<<16); $b^=$t; - $t=(($b>> 2)^$a)&0x33333333; - $b^=($t<< 2); $a^=$t; - $t=(($a>> 8)^$b)&0x00ff00ff; - $a^=($t<< 8); $b^=$t; - $t=(($b>> 1)^$a)&0x55555555; - $b^=($t<< 1); $a^=$t; - $t=$a; - $a=$b&0xffffffff; - $b=$t&0xffffffff; - } - -sub doFP - { - local(*a,*b)=@_; - local($t); - - $t=(($b>> 1)^$a)&0x55555555; - $b^=($t<< 1); $a^=$t; - $t=(($a>> 8)^$b)&0x00ff00ff; - $a^=($t<< 8); $b^=$t; - $t=(($b>> 2)^$a)&0x33333333; - $b^=($t<< 2); $a^=$t; - $t=(($a>>16)^$b)&0x0000ffff; - $a^=($t<<16); $b^=$t; - $t=(($b>> 4)^$a)&0x0f0f0f0f; - $b^=($t<< 4); $a^=$t; - $a&=0xffffffff; - $b&=0xffffffff; - } - -sub main'des_ecb_encrypt - { - local(*ks,$encrypt,$in)=@_; - local($l,$r,$i,$t,$u,@input); - - @input=unpack("C8",$in); - # Get the bytes in the order we want. - $l= ($input[0] )| - ($input[1]<< 8)| - ($input[2]<<16)| - ($input[3]<<24); - $r= ($input[4] )| - ($input[5]<< 8)| - ($input[6]<<16)| - ($input[7]<<24); - - $l&=0xffffffff; - $r&=0xffffffff; - &doIP(*l,*r); - if ($encrypt) - { - for ($i=0; $i<32; $i+=4) - { - $t=(($r<<1)|($r>>31))&0xffffffff; - $u=$t^$ks[$i ]; - $t=$t^$ks[$i+1]; - $t=(($t>>4)|($t<<28))&0xffffffff; - $l^= $SP1[ $t &0x3f]| - $SP3[($t>> 8)&0x3f]| - $SP5[($t>>16)&0x3f]| - $SP7[($t>>24)&0x3f]| - $SP0[ $u &0x3f]| - $SP2[($u>> 8)&0x3f]| - $SP4[($u>>16)&0x3f]| - $SP6[($u>>24)&0x3f]; - - $t=(($l<<1)|($l>>31))&0xffffffff; - $u=$t^$ks[$i+2]; - $t=$t^$ks[$i+3]; - $t=(($t>>4)|($t<<28))&0xffffffff; - $r^= $SP1[ $t &0x3f]| - $SP3[($t>> 8)&0x3f]| - $SP5[($t>>16)&0x3f]| - $SP7[($t>>24)&0x3f]| - $SP0[ $u &0x3f]| - $SP2[($u>> 8)&0x3f]| - $SP4[($u>>16)&0x3f]| - $SP6[($u>>24)&0x3f]; - } - } - else - { - for ($i=30; $i>0; $i-=4) - { - $t=(($r<<1)|($r>>31))&0xffffffff; - $u=$t^$ks[$i ]; - $t=$t^$ks[$i+1]; - $t=(($t>>4)|($t<<28))&0xffffffff; - $l^= $SP1[ $t &0x3f]| - $SP3[($t>> 8)&0x3f]| - $SP5[($t>>16)&0x3f]| - $SP7[($t>>24)&0x3f]| - $SP0[ $u &0x3f]| - $SP2[($u>> 8)&0x3f]| - $SP4[($u>>16)&0x3f]| - $SP6[($u>>24)&0x3f]; - - $t=(($l<<1)|($l>>31))&0xffffffff; - $u=$t^$ks[$i-2]; - $t=$t^$ks[$i-1]; - $t=(($t>>4)|($t<<28))&0xffffffff; - $r^= $SP1[ $t &0x3f]| - $SP3[($t>> 8)&0x3f]| - $SP5[($t>>16)&0x3f]| - $SP7[($t>>24)&0x3f]| - $SP0[ $u &0x3f]| - $SP2[($u>> 8)&0x3f]| - $SP4[($u>>16)&0x3f]| - $SP6[($u>>24)&0x3f]; - } - } - &doFP(*l,*r); - pack("C8",$l&0xff,$l>>8,$l>>16,$l>>24, - $r&0xff,$r>>8,$r>>16,$r>>24); - } diff --git a/secure/lib/libdes/des_crypt.man b/secure/lib/libdes/des_crypt.man deleted file mode 100644 index 9feb447129eba..0000000000000 --- a/secure/lib/libdes/des_crypt.man +++ /dev/null @@ -1,508 +0,0 @@ -.TH DES_CRYPT 3 -.SH NAME -des_read_password, des_read_2password, -des_string_to_key, des_string_to_2key, des_read_pw_string, -des_random_key, des_set_key, -des_key_sched, des_ecb_encrypt, des_3ecb_encrypt, des_cbc_encrypt, -des_3cbc_encrypt, -des_pcbc_encrypt, des_cfb_encrypt, des_ofb_encrypt, -des_cbc_cksum, des_quad_cksum, -des_enc_read, des_enc_write, des_set_odd_parity, -des_is_weak_key, crypt \- (non USA) DES encryption -.SH SYNOPSIS -.nf -.nj -.ft B -#include -.PP -.B int des_read_password(key,prompt,verify) -des_cblock *key; -char *prompt; -int verify; -.PP -.B int des_read_2password(key1,key2,prompt,verify) -des_cblock *key1,*key2; -char *prompt; -int verify; -.PP -.B int des_string_to_key(str,key) -char *str; -des_cblock *key; -.PP -.B int des_string_to_2keys(str,key1,key2) -char *str; -des_cblock *key1,*key2; -.PP -.B int des_read_pw_string(buf,length,prompt,verify) -char *buf; -int length; -char *prompt; -int verify; -.PP -.B int des_random_key(key) -des_cblock *key; -.PP -.B int des_set_key(key,schedule) -des_cblock *key; -des_key_schedule schedule; -.PP -.B int des_key_sched(key,schedule) -des_cblock *key; -des_key_schedule schedule; -.PP -.B int des_ecb_encrypt(input,output,schedule,encrypt) -des_cblock *input; -des_cblock *output; -des_key_schedule schedule; -int encrypt; -.PP -.B int des_3ecb_encrypt(input,output,ks1,ks2,encrypt) -des_cblock *input; -des_cblock *output; -des_key_schedule ks1,ks2; -int encrypt; -.PP -.B int des_cbc_encrypt(input,output,length,schedule,ivec,encrypt) -des_cblock *input; -des_cblock *output; -long length; -des_key_schedule schedule; -des_cblock *ivec; -int encrypt; -.PP -.B int des_3cbc_encrypt(input,output,length,sk1,sk2,ivec1,ivec2,encrypt) -des_cblock *input; -des_cblock *output; -long length; -des_key_schedule sk1; -des_key_schedule sk2; -des_cblock *ivec1; -des_cblock *ivec2; -int encrypt; -.PP -.B int des_pcbc_encrypt(input,output,length,schedule,ivec,encrypt) -des_cblock *input; -des_cblock *output; -long length; -des_key_schedule schedule; -des_cblock *ivec; -int encrypt; -.PP -.B int des_cfb_encrypt(input,output,numbits,length,schedule,ivec,encrypt) -unsigned char *input; -unsigned char *output; -int numbits; -long length; -des_key_schedule schedule; -des_cblock *ivec; -int encrypt; -.PP -.B int des_ofb_encrypt(input,output,numbits,length,schedule,ivec) -unsigned char *input,*output; -int numbits; -long length; -des_key_schedule schedule; -des_cblock *ivec; -.PP -.B unsigned long des_cbc_cksum(input,output,length,schedule,ivec) -des_cblock *input; -des_cblock *output; -long length; -des_key_schedule schedule; -des_cblock *ivec; -.PP -.B unsigned long des_quad_cksum(input,output,length,out_count,seed) -des_cblock *input; -des_cblock *output; -long length; -int out_count; -des_cblock *seed; -.PP -.B int des_check_key; -.PP -.B int des_enc_read(fd,buf,len,sched,iv) -int fd; -char *buf; -int len; -des_key_schedule sched; -des_cblock *iv; -.PP -.B int des_enc_write(fd,buf,len,sched,iv) -int fd; -char *buf; -int len; -des_key_schedule sched; -des_cblock *iv; -.PP -.B extern int des_rw_mode; -.PP -.B void des_set_odd_parity(key) -des_cblock *key; -.PP -.B int des_is_weak_key(key) -des_cblock *key; -.PP -.B char *crypt(passwd,salt) -char *passwd; -char *salt; -.PP -.fi -.SH DESCRIPTION -This library contains a fast implementation of the DES encryption -algorithm. -.PP -There are two phases to the use of DES encryption. -The first is the generation of a -.I des_key_schedule -from a key, -the second is the actual encryption. -A des key is of type -.I des_cblock. -This type is made from 8 characters with odd parity. -The least significant bit in the character is the parity bit. -The key schedule is an expanded form of the key; it is used to speed the -encryption process. -.PP -.I des_read_password -writes the string specified by prompt to the standard output, -turns off echo and reads an input string from standard input -until terminated with a newline. -If verify is non-zero, it prompts and reads the input again and verifies -that both entered passwords are the same. -The entered string is converted into a des key by using the -.I des_string_to_key -routine. -The new key is placed in the -.I des_cblock -that was passed (by reference) to the routine. -If there were no errors, -.I des_read_password -returns 0, --1 is returned if there was a terminal error and 1 is returned for -any other error. -.PP -.I des_read_2password -operates in the same way as -.I des_read_password -except that it generates 2 keys by using the -.I des_string_to_2key -function. -.PP -.I des_read_pw_string -is called by -.I des_read_password -to read and verify a string from a terminal device. -The string is returned in -.I buf. -The size of -.I buf -is passed to the routine via the -.I length -parameter. -.PP -.I des_string_to_key -converts a string into a valid des key. -.PP -.I des_string_to_2key -converts a string into 2 valid des keys. -This routine is best suited for used to generate keys for use with -.I des_3ecb_encrypt. -.PP -.I des_random_key -returns a random key that is made of a combination of process id, -time and an increasing counter. -.PP -Before a des key can be used it is converted into a -.I des_key_schedule -via the -.I des_set_key -routine. -If the -.I des_check_key -flag is non-zero, -.I des_set_key -will check that the key passed is of odd parity and is not a week or -semi-weak key. -If the parity is wrong, -then -1 is returned. -If the key is a weak key, -then -2 is returned. -If an error is returned, -the key schedule is not generated. -.PP -.I des_key_sched -is another name for the -.I des_set_key -function. -.PP -The following routines mostly operate on an input and output stream of -.I des_cblock's. -.PP -.I des_ecb_encrypt -is the basic DES encryption routine that encrypts or decrypts a single 8-byte -.I des_cblock -in -.I electronic code book -mode. -It always transforms the input data, pointed to by -.I input, -into the output data, -pointed to by the -.I output -argument. -If the -.I encrypt -argument is non-zero (DES_ENCRYPT), -the -.I input -(cleartext) is encrypted in to the -.I output -(ciphertext) using the key_schedule specified by the -.I schedule -argument, -previously set via -.I des_set_key. -If -.I encrypt -is zero (DES_DECRYPT), -the -.I input -(now ciphertext) -is decrypted into the -.I output -(now cleartext). -Input and output may overlap. -No meaningful value is returned. -.PP -.I des_3ecb_encrypt -encrypts/decrypts the -.I input -block by using triple ecb DES encryption. -This involves encrypting the input with -.I ks1, -decryption with the key schedule -.I ks2, -and then encryption with the first again. -This routine greatly reduces the chances of brute force breaking of -DES and has the advantage of if -.I ks1 -and -.I ks2 -are the same, it is equivalent to just encryption using ecb mode and -.I ks1 -as the key. -.PP -.I des_cbc_encrypt -encrypts/decrypts using the -.I cipher-block-chaining -mode of DES. -If the -.I encrypt -argument is non-zero, -the routine cipher-block-chain encrypts the cleartext data pointed to by the -.I input -argument into the ciphertext pointed to by the -.I output -argument, -using the key schedule provided by the -.I schedule -argument, -and initialisation vector provided by the -.I ivec -argument. -If the -.I length -argument is not an integral multiple of eight bytes, -the last block is copied to a temporary area and zero filled. -The output is always -an integral multiple of eight bytes. -To make multiple cbc encrypt calls on a large amount of data appear to -be one -.I des_cbc_encrypt -call, the -.I ivec -of subsequent calls should be the last 8 bytes of the output. -.PP -.I des_3cbc_encrypt -encrypts/decrypts the -.I input -block by using triple cbc DES encryption. -This involves encrypting the input with key schedule -.I ks1, -decryption with the key schedule -.I ks2, -and then encryption with the first again. -2 initialisation vectors are required, -.I ivec1 -and -.I ivec2. -Unlike -.I des_cbc_encrypt, -these initialisation vectors are modified by the subroutine. -This routine greatly reduces the chances of brute force breaking of -DES and has the advantage of if -.I ks1 -and -.I ks2 -are the same, it is equivalent to just encryption using cbc mode and -.I ks1 -as the key. -.PP -.I des_pcbc_encrypt -encrypt/decrypts using a modified block chaining mode. -It provides better error propagation characteristics than cbc -encryption. -.PP -.I des_cfb_encrypt -encrypt/decrypts using cipher feedback mode. This method takes an -array of characters as input and outputs and array of characters. It -does not require any padding to 8 character groups. Note: the ivec -variable is changed and the new changed value needs to be passed to -the next call to this function. Since this function runs a complete -DES ecb encryption per numbits, this function is only suggested for -use when sending small numbers of characters. -.PP -.I des_ofb_encrypt -encrypt using output feedback mode. This method takes an -array of characters as input and outputs and array of characters. It -does not require any padding to 8 character groups. Note: the ivec -variable is changed and the new changed value needs to be passed to -the next call to this function. Since this function runs a complete -DES ecb encryption per numbits, this function is only suggested for -use when sending small numbers of characters. -.PP -.I des_cbc_cksum -produces an 8 byte checksum based on the input stream (via cbc encryption). -The last 4 bytes of the checksum is returned and the complete 8 bytes is -placed in -.I output. -.PP -.I des_quad_cksum -returns a 4 byte checksum from the input bytes. -The algorithm can be iterated over the input, -depending on -.I out_count, -1, 2, 3 or 4 times. -If -.I output -is non-NULL, -the 8 bytes generated by each pass are written into -.I output. -.PP -.I des_enc_write -is used to write -.I len -bytes -to file descriptor -.I fd -from buffer -.I buf. -The data is encrypted via -.I pcbc_encrypt -(default) using -.I sched -for the key and -.I iv -as a starting vector. -The actual data send down -.I fd -consists of 4 bytes (in network byte order) containing the length of the -following encrypted data. The encrypted data then follows, padded with random -data out to a multiple of 8 bytes. -.PP -.I des_enc_read -is used to read -.I len -bytes -from file descriptor -.I fd -into buffer -.I buf. -The data being read from -.I fd -is assumed to have come from -.I des_enc_write -and is decrypted using -.I sched -for the key schedule and -.I iv -for the initial vector. -The -.I des_enc_read/des_enc_write -pair can be used to read/write to files, pipes and sockets. -I have used them in implementing a version of rlogin in which all -data is encrypted. -.PP -.I des_rw_mode -is used to specify the encryption mode to use with -.I des_enc_read -and -.I des_end_write. -If set to -.I DES_PCBC_MODE -(the default), des_pcbc_encrypt is used. -If set to -.I DES_CBC_MODE -des_cbc_encrypt is used. -These two routines and the variable are not part of the normal MIT library. -.PP -.I des_set_odd_parity -sets the parity of the passed -.I key -to odd. This routine is not part of the standard MIT library. -.PP -.I des_is_weak_key -returns 1 is the passed key is a weak key (pick again :-), -0 if it is ok. -This routine is not part of the standard MIT library. -.PP -.I crypt -is a replacement for the normal system crypt. -It is much faster than the system crypt. -.PP -.SH FILES -/usr/include/des.h -.br -/usr/lib/libdes.a -.PP -The encryption routines have been tested on 16bit, 32bit and 64bit -machines of various endian and even works under VMS. -.PP -.SH BUGS -.PP -If you think this manual is sparse, -read the des_crypt(3) manual from the MIT kerberos (or bones outside -of the USA) distribution. -.PP -.I des_cfb_encrypt -and -.I des_ofb_encrypt -operates on input of 8 bits. What this means is that if you set -numbits to 12, and length to 2, the first 12 bits will come from the 1st -input byte and the low half of the second input byte. The second 12 -bits will have the low 8 bits taken from the 3rd input byte and the -top 4 bits taken from the 4th input byte. The same holds for output. -This function has been implemented this way because most people will -be using a multiple of 8 and because once you get into pulling bytes input -bytes apart things get ugly! -.PP -.I des_read_pw_string -is the most machine/OS dependent function and normally generates the -most problems when porting this code. -.PP -.I des_string_to_key -is probably different from the MIT version since there are lots -of fun ways to implement one-way encryption of a text string. -.PP -The routines are optimised for 32 bit machines and so are not efficient -on IBM PCs. -.PP -NOTE: extensive work has been done on this library since this document -was origionally written. Please try to read des.doc from the libdes -distribution since it is far more upto date and documents more of the -functions. Libdes is now also being shipped as part of SSLeay, a -general cryptographic library that amonst other things implements -netscapes SSL protocoll. The most recent version can be found in -SSLeay distributions. -.SH AUTHOR -Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au) diff --git a/secure/lib/libdes/des_locl.h b/secure/lib/libdes/des_locl.h deleted file mode 100644 index 80a4ccdcf0037..0000000000000 --- a/secure/lib/libdes/des_locl.h +++ /dev/null @@ -1,276 +0,0 @@ -/* lib/des/des_locl.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#ifndef HEADER_DES_LOCL_H -#define HEADER_DES_LOCL_H -#include -#include -#ifndef MSDOS -#include -#endif -#include "des.h" - -/* the following is tweaked from a config script, that is why it is a - * protected undef/define */ -#ifndef DES_USE_PTR -#undef DES_USE_PTR -#endif - -#ifdef MSDOS /* Visual C++ 2.1 (Windows NT/95) */ -#include -#include -#include -#ifndef RAND -#define RAND -#endif -#undef NOPROTO -#endif - -#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) -#include -#endif - -#ifndef RAND -#define RAND -#endif - -#ifdef linux -#undef RAND -#endif - -#ifdef MSDOS -#define getpid() 2 -extern int errno; -#define RAND -#undef NOPROTO -#endif - -#if defined(NOCONST) -#define const -#endif - -#ifdef __STDC__ -#undef NOPROTO -#endif - -#ifdef RAND -#define srandom(s) srand(s) -#define random rand -#endif - -#define ITERATIONS 16 -#define HALF_ITERATIONS 8 - -/* used in des_read and des_write */ -#define MAXWRITE (1024*16) -#define BSIZE (MAXWRITE+4) - -#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ - l|=((unsigned long)(*((c)++)))<< 8L, \ - l|=((unsigned long)(*((c)++)))<<16L, \ - l|=((unsigned long)(*((c)++)))<<24L) - -/* NOTE - c is not incremented as per c2l */ -#define c2ln(c,l1,l2,n) { \ - c+=n; \ - l1=l2=0; \ - switch (n) { \ - case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ - case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ - case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ - case 5: l2|=((unsigned long)(*(--(c)))); \ - case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ - case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ - case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ - case 1: l1|=((unsigned long)(*(--(c)))); \ - } \ - } - -#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>24L)&0xff)) - -/* replacements for htonl and ntohl since I have no idea what to do - * when faced with machines with 8 byte longs. */ -#define HDRSIZE 4 - -#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \ - l|=((unsigned long)(*((c)++)))<<16L, \ - l|=((unsigned long)(*((c)++)))<< 8L, \ - l|=((unsigned long)(*((c)++)))) - -#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ - *((c)++)=(unsigned char)(((l) )&0xff)) - -/* NOTE - c is not incremented as per l2c */ -#define l2cn(l1,l2,c,n) { \ - c+=n; \ - switch (n) { \ - case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ - case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ - case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ - case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ - case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ - case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ - case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ - case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ - } \ - } - -/* The changes to this macro may help or hinder, depending on the - * compiler and the achitecture. gcc2 always seems to do well :-). - * Inspired by Dana How - * DO NOT use the alternative version on machines with 8 byte longs. */ -#ifdef DES_USR_PTR -#define D_ENCRYPT(L,R,S) { \ - u=((R^s[S ])<<2); \ - t= R^s[S+1]; \ - t=((t>>2)+(t<<30)); \ - L^= \ - *(unsigned long *)(des_SP+0x0100+((t )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0300+((t>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0500+((t>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0700+((t>>24)&0xfc))+ \ - *(unsigned long *)(des_SP+ ((u )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0200+((u>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0400+((u>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0600+((u>>24)&0xfc)); } -#else /* original version */ -#ifdef MSDOS -#define D_ENCRYPT(L,R,S) \ - U.l=R^s[S+1]; \ - T.s[0]=((U.s[0]>>4)|(U.s[1]<<12))&0x3f3f; \ - T.s[1]=((U.s[1]>>4)|(U.s[0]<<12))&0x3f3f; \ - U.l=(R^s[S ])&0x3f3f3f3fL; \ - L^= des_SPtrans[1][(T.c[0])]| \ - des_SPtrans[3][(T.c[1])]| \ - des_SPtrans[5][(T.c[2])]| \ - des_SPtrans[7][(T.c[3])]| \ - des_SPtrans[0][(U.c[0])]| \ - des_SPtrans[2][(U.c[1])]| \ - des_SPtrans[4][(U.c[2])]| \ - des_SPtrans[6][(U.c[3])]; -#else -#define D_ENCRYPT(Q,R,S) {\ - u=(R^s[S ]); \ - t=R^s[S+1]; \ - t=((t>>4L)+(t<<28L)); \ - Q^= des_SPtrans[1][(t )&0x3f]| \ - des_SPtrans[3][(t>> 8L)&0x3f]| \ - des_SPtrans[5][(t>>16L)&0x3f]| \ - des_SPtrans[7][(t>>24L)&0x3f]| \ - des_SPtrans[0][(u )&0x3f]| \ - des_SPtrans[2][(u>> 8L)&0x3f]| \ - des_SPtrans[4][(u>>16L)&0x3f]| \ - des_SPtrans[6][(u>>24L)&0x3f]; } -#endif -#endif - - /* IP and FP - * The problem is more of a geometric problem that random bit fiddling. - 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6 - 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4 - 16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2 - 24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0 - - 32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7 - 40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5 - 48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3 - 56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1 - - The output has been subject to swaps of the form - 0 1 -> 3 1 but the odd and even bits have been put into - 2 3 2 0 - different words. The main trick is to remember that - t=((l>>size)^r)&(mask); - r^=t; - l^=(t<>(n))^(b))&(m)),\ - (b)^=(t),\ - (a)^=((t)<<(n))) - -#define IP(l,r) \ - { \ - register unsigned long tt; \ - PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \ - PERM_OP(l,r,tt,16,0x0000ffffL); \ - PERM_OP(r,l,tt, 2,0x33333333L); \ - PERM_OP(l,r,tt, 8,0x00ff00ffL); \ - PERM_OP(r,l,tt, 1,0x55555555L); \ - } - -#define FP(l,r) \ - { \ - register unsigned long tt; \ - PERM_OP(l,r,tt, 1,0x55555555L); \ - PERM_OP(r,l,tt, 8,0x00ff00ffL); \ - PERM_OP(l,r,tt, 2,0x33333333L); \ - PERM_OP(r,l,tt,16,0x0000ffffL); \ - PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ - } -#endif diff --git a/secure/lib/libdes/des_locl.org b/secure/lib/libdes/des_locl.org deleted file mode 100644 index 80a4ccdcf0037..0000000000000 --- a/secure/lib/libdes/des_locl.org +++ /dev/null @@ -1,276 +0,0 @@ -/* lib/des/des_locl.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#ifndef HEADER_DES_LOCL_H -#define HEADER_DES_LOCL_H -#include -#include -#ifndef MSDOS -#include -#endif -#include "des.h" - -/* the following is tweaked from a config script, that is why it is a - * protected undef/define */ -#ifndef DES_USE_PTR -#undef DES_USE_PTR -#endif - -#ifdef MSDOS /* Visual C++ 2.1 (Windows NT/95) */ -#include -#include -#include -#ifndef RAND -#define RAND -#endif -#undef NOPROTO -#endif - -#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) -#include -#endif - -#ifndef RAND -#define RAND -#endif - -#ifdef linux -#undef RAND -#endif - -#ifdef MSDOS -#define getpid() 2 -extern int errno; -#define RAND -#undef NOPROTO -#endif - -#if defined(NOCONST) -#define const -#endif - -#ifdef __STDC__ -#undef NOPROTO -#endif - -#ifdef RAND -#define srandom(s) srand(s) -#define random rand -#endif - -#define ITERATIONS 16 -#define HALF_ITERATIONS 8 - -/* used in des_read and des_write */ -#define MAXWRITE (1024*16) -#define BSIZE (MAXWRITE+4) - -#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ - l|=((unsigned long)(*((c)++)))<< 8L, \ - l|=((unsigned long)(*((c)++)))<<16L, \ - l|=((unsigned long)(*((c)++)))<<24L) - -/* NOTE - c is not incremented as per c2l */ -#define c2ln(c,l1,l2,n) { \ - c+=n; \ - l1=l2=0; \ - switch (n) { \ - case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ - case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ - case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ - case 5: l2|=((unsigned long)(*(--(c)))); \ - case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ - case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ - case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ - case 1: l1|=((unsigned long)(*(--(c)))); \ - } \ - } - -#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>24L)&0xff)) - -/* replacements for htonl and ntohl since I have no idea what to do - * when faced with machines with 8 byte longs. */ -#define HDRSIZE 4 - -#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \ - l|=((unsigned long)(*((c)++)))<<16L, \ - l|=((unsigned long)(*((c)++)))<< 8L, \ - l|=((unsigned long)(*((c)++)))) - -#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ - *((c)++)=(unsigned char)(((l) )&0xff)) - -/* NOTE - c is not incremented as per l2c */ -#define l2cn(l1,l2,c,n) { \ - c+=n; \ - switch (n) { \ - case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ - case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ - case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ - case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ - case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ - case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ - case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ - case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ - } \ - } - -/* The changes to this macro may help or hinder, depending on the - * compiler and the achitecture. gcc2 always seems to do well :-). - * Inspired by Dana How - * DO NOT use the alternative version on machines with 8 byte longs. */ -#ifdef DES_USR_PTR -#define D_ENCRYPT(L,R,S) { \ - u=((R^s[S ])<<2); \ - t= R^s[S+1]; \ - t=((t>>2)+(t<<30)); \ - L^= \ - *(unsigned long *)(des_SP+0x0100+((t )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0300+((t>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0500+((t>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0700+((t>>24)&0xfc))+ \ - *(unsigned long *)(des_SP+ ((u )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0200+((u>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0400+((u>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0600+((u>>24)&0xfc)); } -#else /* original version */ -#ifdef MSDOS -#define D_ENCRYPT(L,R,S) \ - U.l=R^s[S+1]; \ - T.s[0]=((U.s[0]>>4)|(U.s[1]<<12))&0x3f3f; \ - T.s[1]=((U.s[1]>>4)|(U.s[0]<<12))&0x3f3f; \ - U.l=(R^s[S ])&0x3f3f3f3fL; \ - L^= des_SPtrans[1][(T.c[0])]| \ - des_SPtrans[3][(T.c[1])]| \ - des_SPtrans[5][(T.c[2])]| \ - des_SPtrans[7][(T.c[3])]| \ - des_SPtrans[0][(U.c[0])]| \ - des_SPtrans[2][(U.c[1])]| \ - des_SPtrans[4][(U.c[2])]| \ - des_SPtrans[6][(U.c[3])]; -#else -#define D_ENCRYPT(Q,R,S) {\ - u=(R^s[S ]); \ - t=R^s[S+1]; \ - t=((t>>4L)+(t<<28L)); \ - Q^= des_SPtrans[1][(t )&0x3f]| \ - des_SPtrans[3][(t>> 8L)&0x3f]| \ - des_SPtrans[5][(t>>16L)&0x3f]| \ - des_SPtrans[7][(t>>24L)&0x3f]| \ - des_SPtrans[0][(u )&0x3f]| \ - des_SPtrans[2][(u>> 8L)&0x3f]| \ - des_SPtrans[4][(u>>16L)&0x3f]| \ - des_SPtrans[6][(u>>24L)&0x3f]; } -#endif -#endif - - /* IP and FP - * The problem is more of a geometric problem that random bit fiddling. - 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6 - 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4 - 16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2 - 24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0 - - 32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7 - 40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5 - 48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3 - 56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1 - - The output has been subject to swaps of the form - 0 1 -> 3 1 but the odd and even bits have been put into - 2 3 2 0 - different words. The main trick is to remember that - t=((l>>size)^r)&(mask); - r^=t; - l^=(t<>(n))^(b))&(m)),\ - (b)^=(t),\ - (a)^=((t)<<(n))) - -#define IP(l,r) \ - { \ - register unsigned long tt; \ - PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \ - PERM_OP(l,r,tt,16,0x0000ffffL); \ - PERM_OP(r,l,tt, 2,0x33333333L); \ - PERM_OP(l,r,tt, 8,0x00ff00ffL); \ - PERM_OP(r,l,tt, 1,0x55555555L); \ - } - -#define FP(l,r) \ - { \ - register unsigned long tt; \ - PERM_OP(l,r,tt, 1,0x55555555L); \ - PERM_OP(r,l,tt, 8,0x00ff00ffL); \ - PERM_OP(l,r,tt, 2,0x33333333L); \ - PERM_OP(r,l,tt,16,0x0000ffffL); \ - PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ - } -#endif diff --git a/secure/lib/libdes/destest.c b/secure/lib/libdes/destest.c deleted file mode 100644 index fec39905087d4..0000000000000 --- a/secure/lib/libdes/destest.c +++ /dev/null @@ -1,794 +0,0 @@ -/* lib/des/destest.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include -#ifndef MSDOS -#include -#else -#include -#endif -#include -#include "des.h" - -/* tisk tisk - the test keys don't all have odd parity :-( */ -/* test data */ -#define NUM_TESTS 34 -static unsigned char key_data[NUM_TESTS][8]={ - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}, - {0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}, - {0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57}, - {0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E}, - {0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86}, - {0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E}, - {0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6}, - {0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE}, - {0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6}, - {0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE}, - {0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16}, - {0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F}, - {0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46}, - {0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E}, - {0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76}, - {0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07}, - {0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F}, - {0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7}, - {0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF}, - {0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6}, - {0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF}, - {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01}, - {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E}, - {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}}; - -static unsigned char plain_data[NUM_TESTS][8]={ - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}, - {0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, - {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11}, - {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42}, - {0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA}, - {0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72}, - {0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A}, - {0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2}, - {0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A}, - {0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2}, - {0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A}, - {0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02}, - {0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A}, - {0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32}, - {0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA}, - {0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62}, - {0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2}, - {0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA}, - {0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92}, - {0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A}, - {0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2}, - {0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF}, - {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; - -static unsigned char cipher_data[NUM_TESTS][8]={ - {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7}, - {0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58}, - {0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B}, - {0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33}, - {0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D}, - {0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD}, - {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7}, - {0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4}, - {0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B}, - {0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71}, - {0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A}, - {0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A}, - {0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95}, - {0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B}, - {0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09}, - {0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A}, - {0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F}, - {0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88}, - {0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77}, - {0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A}, - {0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56}, - {0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56}, - {0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56}, - {0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC}, - {0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A}, - {0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41}, - {0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93}, - {0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00}, - {0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06}, - {0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7}, - {0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51}, - {0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE}, - {0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D}, - {0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2}}; - -static unsigned char cipher_ecb2[NUM_TESTS-1][8]={ - {0x92,0x95,0xB5,0x9B,0xB3,0x84,0x73,0x6E}, - {0x19,0x9E,0x9D,0x6D,0xF3,0x9A,0xA8,0x16}, - {0x2A,0x4B,0x4D,0x24,0x52,0x43,0x84,0x27}, - {0x35,0x84,0x3C,0x01,0x9D,0x18,0xC5,0xB6}, - {0x4A,0x5B,0x2F,0x42,0xAA,0x77,0x19,0x25}, - {0xA0,0x6B,0xA9,0xB8,0xCA,0x5B,0x17,0x8A}, - {0xAB,0x9D,0xB7,0xFB,0xED,0x95,0xF2,0x74}, - {0x3D,0x25,0x6C,0x23,0xA7,0x25,0x2F,0xD6}, - {0xB7,0x6F,0xAB,0x4F,0xBD,0xBD,0xB7,0x67}, - {0x8F,0x68,0x27,0xD6,0x9C,0xF4,0x1A,0x10}, - {0x82,0x57,0xA1,0xD6,0x50,0x5E,0x81,0x85}, - {0xA2,0x0F,0x0A,0xCD,0x80,0x89,0x7D,0xFA}, - {0xCD,0x2A,0x53,0x3A,0xDB,0x0D,0x7E,0xF3}, - {0xD2,0xC2,0xBE,0x27,0xE8,0x1B,0x68,0xE3}, - {0xE9,0x24,0xCF,0x4F,0x89,0x3C,0x5B,0x0A}, - {0xA7,0x18,0xC3,0x9F,0xFA,0x9F,0xD7,0x69}, - {0x77,0x2C,0x79,0xB1,0xD2,0x31,0x7E,0xB1}, - {0x49,0xAB,0x92,0x7F,0xD0,0x22,0x00,0xB7}, - {0xCE,0x1C,0x6C,0x7D,0x85,0xE3,0x4A,0x6F}, - {0xBE,0x91,0xD6,0xE1,0x27,0xB2,0xE9,0x87}, - {0x70,0x28,0xAE,0x8F,0xD1,0xF5,0x74,0x1A}, - {0xAA,0x37,0x80,0xBB,0xF3,0x22,0x1D,0xDE}, - {0xA6,0xC4,0xD2,0x5E,0x28,0x93,0xAC,0xB3}, - {0x22,0x07,0x81,0x5A,0xE4,0xB7,0x1A,0xAD}, - {0xDC,0xCE,0x05,0xE7,0x07,0xBD,0xF5,0x84}, - {0x26,0x1D,0x39,0x2C,0xB3,0xBA,0xA5,0x85}, - {0xB4,0xF7,0x0F,0x72,0xFB,0x04,0xF0,0xDC}, - {0x95,0xBA,0xA9,0x4E,0x87,0x36,0xF2,0x89}, - {0xD4,0x07,0x3A,0xF1,0x5A,0x17,0x82,0x0E}, - {0xEF,0x6F,0xAF,0xA7,0x66,0x1A,0x7E,0x89}, - {0xC1,0x97,0xF5,0x58,0x74,0x8A,0x20,0xE7}, - {0x43,0x34,0xCF,0xDA,0x22,0xC4,0x86,0xC8}, - {0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}}; - -static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; -static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87}; -static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10}; -static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10}; -static char cbc_data[40]="7654321 Now is the time for "; - -static unsigned char cbc_ok[32]={ - 0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4, - 0xac,0xd8,0xae,0xfd,0xdf,0xd8,0xa1,0xeb, - 0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68, - 0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4}; - -static unsigned char cbc3_ok[32]={ - 0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0, - 0x22,0x13,0x76,0x3C,0x1C,0xBD,0x4C,0xDC, - 0x79,0x96,0x57,0xC0,0x64,0xEC,0xF5,0xD4, - 0x1C,0x67,0x38,0x12,0xCF,0xDE,0x96,0x75}; - -static unsigned char pcbc_ok[32]={ - 0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4, - 0x6d,0xec,0xb4,0x70,0xa0,0xe5,0x6b,0x15, - 0xae,0xa6,0xbf,0x61,0xed,0x7d,0x9c,0x9f, - 0xf7,0x17,0x46,0x3b,0x8a,0xb3,0xcc,0x88}; - -static unsigned char cfb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; -static unsigned char cfb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef}; -static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8]; -static unsigned char plain[24]= - { - 0x4e,0x6f,0x77,0x20,0x69,0x73, - 0x20,0x74,0x68,0x65,0x20,0x74, - 0x69,0x6d,0x65,0x20,0x66,0x6f, - 0x72,0x20,0x61,0x6c,0x6c,0x20 - }; -static unsigned char cfb_cipher8[24]= { - 0xf3,0x1f,0xda,0x07,0x01,0x14, 0x62,0xee,0x18,0x7f,0x43,0xd8, - 0x0a,0x7c,0xd9,0xb5,0xb0,0xd2, 0x90,0xda,0x6e,0x5b,0x9a,0x87 }; -static unsigned char cfb_cipher16[24]={ - 0xF3,0x09,0x87,0x87,0x7F,0x57, 0xF7,0x3C,0x36,0xB6,0xDB,0x70, - 0xD8,0xD5,0x34,0x19,0xD3,0x86, 0xB2,0x23,0xB7,0xB2,0xAD,0x1B }; -static unsigned char cfb_cipher32[24]={ - 0xF3,0x09,0x62,0x49,0xA4,0xDF, 0xA4,0x9F,0x33,0xDC,0x7B,0xAD, - 0x4C,0xC8,0x9F,0x64,0xE4,0x53, 0xE5,0xEC,0x67,0x20,0xDA,0xB6 }; -static unsigned char cfb_cipher48[24]={ - 0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x30,0xB5,0x15,0xEC,0xBB,0x85, - 0x97,0x5A,0x13,0x8C,0x68,0x60, 0xE2,0x38,0x34,0x3C,0xDC,0x1F }; -static unsigned char cfb_cipher64[24]={ - 0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x6E,0x51,0xA6,0x9E,0x83,0x9B, - 0x1A,0x92,0xF7,0x84,0x03,0x46, 0x71,0x33,0x89,0x8E,0xA6,0x22 }; - -static unsigned char ofb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; -static unsigned char ofb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef}; -static unsigned char ofb_buf1[24],ofb_buf2[24],ofb_tmp[8]; -static unsigned char ofb_cipher[24]= - { - 0xf3,0x09,0x62,0x49,0xc7,0xf4,0x6e,0x51, - 0x35,0xf2,0x4a,0x24,0x2e,0xeb,0x3d,0x3f, - 0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3 - }; - -unsigned long cbc_cksum_ret=0xB462FEF7L; -unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4}; - -#ifndef NOPROTO -static char *pt(unsigned char *p); -static int cfb_test(int bits, unsigned char *cfb_cipher); -static int cfb64_test(unsigned char *cfb_cipher); -static int ede_cfb64_test(unsigned char *cfb_cipher); -#else -static char *pt(); -static int cfb_test(); -static int cfb64_test(); -static int ede_cfb64_test(); -#endif - -int main(argc,argv) -int argc; -char *argv[]; - { - int i,j,err=0; - des_cblock in,out,outin,iv3; - des_key_schedule ks,ks2,ks3; - unsigned char cbc_in[40]; - unsigned char cbc_out[40]; - unsigned long cs; - unsigned char qret[4][4],cret[8]; - unsigned long lqret[4]; - int num; - char *str; - - printf("Doing ecb\n"); - for (i=0; i>4)&0xf]; - ret[i*2+1]=f[p[i]&0xf]; - } - ret[16]='\0'; - return(ret); - } - -static int cfb_test(bits, cfb_cipher) -int bits; -unsigned char *cfb_cipher; - { - des_key_schedule ks; - int i,err=0; - - key_sched((C_Block *)cfb_key,ks); - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - des_cfb_encrypt(plain,cfb_buf1,bits,(long)sizeof(plain),ks, - (C_Block *)cfb_tmp,DES_ENCRYPT); - if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0) - { - err=1; - printf("cfb_encrypt encrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf1[i]))); - } - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,(long)sizeof(plain),ks, - (C_Block *)cfb_tmp,DES_DECRYPT); - if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0) - { - err=1; - printf("cfb_encrypt decrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf1[i]))); - } - return(err); - } - -static int cfb64_test(cfb_cipher) -unsigned char *cfb_cipher; - { - des_key_schedule ks; - int err=0,i,n; - - key_sched((C_Block *)cfb_key,ks); - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - n=0; - des_cfb64_encrypt(plain,cfb_buf1,(long)12,ks, - (C_Block *)cfb_tmp,&n,DES_ENCRYPT); - des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]), - (long)sizeof(plain)-12,ks, - (C_Block *)cfb_tmp,&n,DES_ENCRYPT); - if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0) - { - err=1; - printf("cfb_encrypt encrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf1[i]))); - } - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - n=0; - des_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks, - (C_Block *)cfb_tmp,&n,DES_DECRYPT); - des_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]), - (long)sizeof(plain)-17,ks, - (C_Block *)cfb_tmp,&n,DES_DECRYPT); - if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0) - { - err=1; - printf("cfb_encrypt decrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf2[i]))); - } - return(err); - } - -static int ede_cfb64_test(cfb_cipher) -unsigned char *cfb_cipher; - { - des_key_schedule ks; - int err=0,i,n; - - key_sched((C_Block *)cfb_key,ks); - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - n=0; - des_ede3_cfb64_encrypt(plain,cfb_buf1,(long)12,ks,ks,ks, - (C_Block *)cfb_tmp,&n,DES_ENCRYPT); - des_ede3_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]), - (long)sizeof(plain)-12,ks,ks,ks, - (C_Block *)cfb_tmp,&n,DES_ENCRYPT); - if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0) - { - err=1; - printf("ede_cfb_encrypt encrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf1[i]))); - } - memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv)); - n=0; - des_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,ks,ks, - (C_Block *)cfb_tmp,&n,DES_DECRYPT); - des_ede3_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]), - (long)sizeof(plain)-17,ks,ks,ks, - (C_Block *)cfb_tmp,&n,DES_DECRYPT); - if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0) - { - err=1; - printf("ede_cfb_encrypt decrypt error\n"); - for (i=0; i<24; i+=8) - printf("%s\n",pt(&(cfb_buf2[i]))); - } - return(err); - } diff --git a/secure/lib/libdes/doIP b/secure/lib/libdes/doIP deleted file mode 100644 index 18cf23130364b..0000000000000 --- a/secure/lib/libdes/doIP +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/local/bin/perl - -@l=( - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9,10,11,12,13,14,15, - 16,17,18,19,20,21,22,23, - 24,25,26,27,28,29,30,31 - ); -@r=( - 32,33,34,35,36,37,38,39, - 40,41,42,43,44,45,46,47, - 48,49,50,51,52,53,54,55, - 56,57,58,59,60,61,62,63 - ); - -require 'shifts.pl'; - -sub PERM_OP - { - local(*a,*b,*t,$n,$m)=@_; - - @z=&shift(*a,-$n); - @z=&xor(*b,*z); - @z=&and(*z,$m); - @b=&xor(*b,*z); - @z=&shift(*z,$n); - @a=&xor(*a,*z); - } - - -@L=@l; -@R=@r; -&PERM_OP(*R,*L,*T,4,0x0f0f0f0f); -&PERM_OP(*L,*R,*T,16,0x0000ffff); -&PERM_OP(*R,*L,*T,2,0x33333333); -&PERM_OP(*L,*R,*T,8,0x00ff00ff); -&PERM_OP(*R,*L,*T,1,0x55555555); - &printit(@L); - &printit(@R); -&PERM_OP(*R,*L,*T,1,0x55555555); -&PERM_OP(*L,*R,*T,8,0x00ff00ff); -&PERM_OP(*R,*L,*T,2,0x33333333); -&PERM_OP(*L,*R,*T,16,0x0000ffff); -&PERM_OP(*R,*L,*T,4,0x0f0f0f0f); - &printit(@L); - &printit(@R); diff --git a/secure/lib/libdes/doPC1 b/secure/lib/libdes/doPC1 deleted file mode 100644 index 096afd8c4614e..0000000000000 --- a/secure/lib/libdes/doPC1 +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/local/bin/perl - -@l=( - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9,10,11,12,13,14,15, - 16,17,18,19,20,21,22,23, - 24,25,26,27,28,29,30,31 - ); -@r=( - 32,33,34,35,36,37,38,39, - 40,41,42,43,44,45,46,47, - 48,49,50,51,52,53,54,55, - 56,57,58,59,60,61,62,63 - ); - -require 'shifts.pl'; - -sub PERM_OP - { - local(*a,*b,*t,$n,$m)=@_; - - @z=&shift(*a,-$n); - @z=&xor(*b,*z); - @z=&and(*z,$m); - @b=&xor(*b,*z); - @z=&shift(*z,$n); - @a=&xor(*a,*z); - } - -sub HPERM_OP2 - { - local(*a,*t,$n,$m)=@_; - local(@x,@y,$i); - - @z=&shift(*a,16-$n); - @z=&xor(*a,*z); - @z=&and(*z,$m); - @a=&xor(*a,*z); - @z=&shift(*z,$n-16); - @a=&xor(*a,*z); - } - -sub HPERM_OP - { - local(*a,*t,$n,$m)=@_; - local(@x,@y,$i); - - for ($i=0; $i<16; $i++) - { - $x[$i]=$a[$i]; - $y[$i]=$a[16+$i]; - } - @z=&shift(*x,-$n); - @z=&xor(*y,*z); - @z=&and(*z,$m); - @y=&xor(*y,*z); - @z=&shift(*z,$n); - @x=&xor(*x,*z); - for ($i=0; $i<16; $i++) - { - $a[$i]=$x[$i]; - $a[16+$i]=$y[$i]; - } - } - -@L=@l; -@R=@r; - - print "---\n"; &printit(@R); -&PERM_OP(*R,*L,*T,4,0x0f0f0f0f); - print "---\n"; &printit(@R); -&HPERM_OP2(*L,*T,-2,0xcccc0000); -&HPERM_OP2(*R,*T,-2,0xcccc0000); - print "---\n"; &printit(@R); -&PERM_OP(*R,*L,*T,1,0x55555555); - print "---\n"; &printit(@R); -&PERM_OP(*L,*R,*T,8,0x00ff00ff); - print "---\n"; &printit(@R); -&PERM_OP(*R,*L,*T,1,0x55555555); - print "---\n"; &printit(@R); -# &printit(@L); - &printit(@R); -print <<"EOF"; -============================== -63 55 47 39 31 23 15 7 -62 54 46 38 30 22 14 6 -61 53 45 37 29 21 13 5 -60 52 44 36 -- -- -- -- - -57 49 41 33 25 17 9 1 -58 50 42 34 26 18 10 2 -59 51 43 35 27 19 11 3 -28 20 12 4 -- -- -- -- -EOF -exit(1); -@A=&and(*R,0x000000ff); -@A=&shift(*A,16); -@B=&and(*R,0x0000ff00); -@C=&and(*R,0x00ff0000); -@C=&shift(*C,-16); -@D=&and(*L,0xf0000000); -@D=&shift(*D,-4); -@A=&or(*A,*B); -@B=&or(*D,*C); -@R=&or(*A,*B); -@L=&and(*L,0x0fffffff); - - &printit(@L); - &printit(@R); - diff --git a/secure/lib/libdes/doPC2 b/secure/lib/libdes/doPC2 deleted file mode 100644 index fa5cf74cf7131..0000000000000 --- a/secure/lib/libdes/doPC2 +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/local/bin/perl - -@PC2_C=(14,17,11,24, 1, 5, - 3,28,15, 6,21,10, - 23,19,12, 4,26, 8, - 16, 7,27,20,13, 2, - ); - -@PC2_D=(41,52,31,37,47,55, - 30,40,51,45,33,48, - 44,49,39,56,34,53, - 46,42,50,36,29,32, - ); - -$i=0; -foreach (@PC2_C) { - $_--; -# printf "%2d,",$_; - $C{$_}=$i; - ++$i; -# print "\n" if ((($i) % 8) == 0); - } -$i=0; -#print "\n"; -foreach (@PC2_D) { - $_-=28; - $_--; -# printf "%2d,",$_; - $D{$_}=$i; - $i++; -# print "\n" if ((($i) % 8) == 0); - } - -#print "\n"; -foreach $i (0 .. 27) - { - $_=$C{$i}; -# printf "%2d,",$_; - $i++; -# print "\n" if ((($i) % 8) == 0); - } -#print "\n"; - -#print "\n"; -foreach $i (0 .. 27) - { - $_=$D{$i}; -# printf "%2d,",$_; - $i++; -# print "\n" if ((($i) % 8) == 0); - } -#print "\n"; - -print "static ulong skb[8][64]={\n"; -&doit("C",*C, 0, 1, 2, 3, 4, 5); -&doit("C",*C, 6, 7, 9,10,11,12); -&doit("C",*C,13,14,15,16,18,19); -&doit("C",*C,20,22,23,25,26,27); - -&doit("D",*D, 0, 1, 2, 3, 4, 5); -&doit("D",*D, 7, 8,10,11,12,13); -&doit("D",*D,15,16,17,18,19,20); -&doit("D",*D,21,22,23,24,26,27); -print "};\n"; - -sub doit - { - local($l,*A,@b)=@_; - local(@out); - - printf("/* for $l bits (numbered as per FIPS 46) %d %d %d %d %d %d */\n", - $b[0]+1, $b[1]+1, $b[2]+1, $b[3]+1, $b[4]+1, $b[5]+1); - for ($i=0; $i<64; $i++) - { - $out[$i]=0; - $j=1; -#print "\n"; - for ($k=0; $k<6; $k++) - { - $l=$A{$b[$k]}; -#print"$l - "; - if ((1<<$k) & $i) - { - $ll=int($l/6)*8+($l%6); - $out[$i]|=1<<($ll); - } - } - $pp=$out[$i]; - $pp=($pp&0xff0000ff)| (($pp&0x00ff0000)>>8)| - (($pp&0x0000ff00)<<8); - printf("0x%08X,",$pp); - print "\n" if (($i+1) % 4 == 0); - } - } diff --git a/secure/lib/libdes/ecb3_enc.c b/secure/lib/libdes/ecb3_enc.c deleted file mode 100644 index ca0ac176342eb..0000000000000 --- a/secure/lib/libdes/ecb3_enc.c +++ /dev/null @@ -1,77 +0,0 @@ -/* lib/des/ecb3_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -void des_ecb3_encrypt(input, output, ks1, ks2, ks3, encrypt) -des_cblock (*input); -des_cblock (*output); -des_key_schedule ks1; -des_key_schedule ks2; -des_key_schedule ks3; -int encrypt; - { - register unsigned long l0,l1; - register unsigned char *in,*out; - unsigned long ll[2]; - - in=(unsigned char *)input; - out=(unsigned char *)output; - c2l(in,l0); - c2l(in,l1); - IP(l0,l1); - ll[0]=l0; - ll[1]=l1; - des_encrypt2(ll,ks1,encrypt); - des_encrypt2(ll,ks2,!encrypt); - des_encrypt2(ll,ks3,encrypt); - l0=ll[0]; - l1=ll[1]; - FP(l1,l0); - l2c(l0,out); - l2c(l1,out); - } diff --git a/secure/lib/libdes/ecb_enc.c b/secure/lib/libdes/ecb_enc.c deleted file mode 100644 index d7eaa96aeb04b..0000000000000 --- a/secure/lib/libdes/ecb_enc.c +++ /dev/null @@ -1,203 +0,0 @@ -/* lib/des/ecb_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" -#include "spr.h" - -const char *DES_version="libdes v 3.22 - 95/11/29 - eay"; - -void des_ecb_encrypt(input, output, ks, encrypt) -des_cblock (*input); -des_cblock (*output); -des_key_schedule ks; -int encrypt; - { - register unsigned long l0,l1; - register unsigned char *in,*out; - unsigned long ll[2]; - - in=(unsigned char *)input; - out=(unsigned char *)output; - c2l(in,l0); ll[0]=l0; - c2l(in,l1); ll[1]=l1; - des_encrypt(ll,ks,encrypt); - l0=ll[0]; l2c(l0,out); - l1=ll[1]; l2c(l1,out); - l0=l1=ll[0]=ll[1]=0; - } - -void des_encrypt(data, ks, encrypt) -unsigned long *data; -des_key_schedule ks; -int encrypt; - { - register unsigned long l,r,t,u; -#ifdef DES_USE_PTR - register unsigned char *des_SP=(unsigned char *)des_SPtrans; -#endif -#ifdef MSDOS - union fudge { - unsigned long l; - unsigned short s[2]; - unsigned char c[4]; - } U,T; -#endif - register int i; - register unsigned long *s; - - u=data[0]; - r=data[1]; - - IP(u,r); - /* Things have been modified so that the initial rotate is - * done outside the loop. This required the - * des_SPtrans values in sp.h to be rotated 1 bit to the right. - * One perl script later and things have a 5% speed up on a sparc2. - * Thanks to Richard Outerbridge <71755.204@CompuServe.COM> - * for pointing this out. */ - l=(r<<1)|(r>>31); - r=(u<<1)|(u>>31); - - /* clear the top bits on machines with 8byte longs */ - l&=0xffffffffL; - r&=0xffffffffL; - - s=(unsigned long *)ks; - /* I don't know if it is worth the effort of loop unrolling the - * inner loop */ - if (encrypt) - { - for (i=0; i<32; i+=4) - { - D_ENCRYPT(l,r,i+0); /* 1 */ - D_ENCRYPT(r,l,i+2); /* 2 */ - } - } - else - { - for (i=30; i>0; i-=4) - { - D_ENCRYPT(l,r,i-0); /* 16 */ - D_ENCRYPT(r,l,i-2); /* 15 */ - } - } - l=(l>>1)|(l<<31); - r=(r>>1)|(r<<31); - /* clear the top bits on machines with 8byte longs */ - l&=0xffffffffL; - r&=0xffffffffL; - - FP(r,l); - data[0]=l; - data[1]=r; - l=r=t=u=0; - } - -void des_encrypt2(data, ks, encrypt) -unsigned long *data; -des_key_schedule ks; -int encrypt; - { - register unsigned long l,r,t,u; -#ifdef DES_USE_PTR - register unsigned char *des_SP=(unsigned char *)des_SPtrans; -#endif -#ifdef MSDOS - union fudge { - unsigned long l; - unsigned short s[2]; - unsigned char c[4]; - } U,T; -#endif - register int i; - register unsigned long *s; - - u=data[0]; - r=data[1]; - - /* Things have been modified so that the initial rotate is - * done outside the loop. This required the - * des_SPtrans values in sp.h to be rotated 1 bit to the right. - * One perl script later and things have a 5% speed up on a sparc2. - * Thanks to Richard Outerbridge <71755.204@CompuServe.COM> - * for pointing this out. */ - l=(r<<1)|(r>>31); - r=(u<<1)|(u>>31); - - /* clear the top bits on machines with 8byte longs */ - l&=0xffffffffL; - r&=0xffffffffL; - - s=(unsigned long *)ks; - /* I don't know if it is worth the effort of loop unrolling the - * inner loop */ - if (encrypt) - { - for (i=0; i<32; i+=4) - { - D_ENCRYPT(l,r,i+0); /* 1 */ - D_ENCRYPT(r,l,i+2); /* 2 */ - } - } - else - { - for (i=30; i>0; i-=4) - { - D_ENCRYPT(l,r,i-0); /* 16 */ - D_ENCRYPT(r,l,i-2); /* 15 */ - } - } - l=(l>>1)|(l<<31); - r=(r>>1)|(r<<31); - /* clear the top bits on machines with 8byte longs */ - l&=0xffffffffL; - r&=0xffffffffL; - - data[0]=l; - data[1]=r; - l=r=t=u=0; - } diff --git a/secure/lib/libdes/ede_enc.c b/secure/lib/libdes/ede_enc.c deleted file mode 100644 index 5084e94947851..0000000000000 --- a/secure/lib/libdes/ede_enc.c +++ /dev/null @@ -1,163 +0,0 @@ -/* lib/des/ede_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -void des_ede3_cbc_encrypt(input, output, length, ks1, ks2, ks3, ivec, encrypt) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule ks1; -des_key_schedule ks2; -des_key_schedule ks3; -des_cblock (*ivec); -int encrypt; - { - register unsigned long tin0,tin1; - register unsigned long tout0,tout1,xor0,xor1; - register unsigned char *in,*out; - register long l=length; - unsigned long tin[2]; - unsigned char *iv; - - in=(unsigned char *)input; - out=(unsigned char *)output; - iv=(unsigned char *)ivec; - - if (encrypt) - { - c2l(iv,tout0); - c2l(iv,tout1); - for (; l>0; l-=8) - { - if (l >= 8) - { - c2l(in,tin0); - c2l(in,tin1); - } - else - c2ln(in,tin0,tin1,l); - tin0^=tout0; - tin1^=tout1; - - IP(tin0,tin1); - - tin[0]=tin0; - tin[1]=tin1; - des_encrypt2((unsigned long *)tin,ks1,DES_ENCRYPT); - des_encrypt2((unsigned long *)tin,ks2,DES_DECRYPT); - des_encrypt2((unsigned long *)tin,ks3,DES_ENCRYPT); - tout0=tin[0]; - tout1=tin[1]; - - FP(tout1,tout0); - - l2c(tout0,out); - l2c(tout1,out); - } - iv=(unsigned char *)ivec; - l2c(tout0,iv); - l2c(tout1,iv); - } - else - { - c2l(iv,xor0); - c2l(iv,xor1); - for (; l>0; l-=8) - { - register unsigned long t0,t1; - - c2l(in,tin0); - c2l(in,tin1); - - t0=tin0; - t1=tin1; - IP(tin0,tin1); - - tin[0]=tin0; - tin[1]=tin1; - des_encrypt2((unsigned long *)tin,ks3,DES_DECRYPT); - des_encrypt2((unsigned long *)tin,ks2,DES_ENCRYPT); - des_encrypt2((unsigned long *)tin,ks1,DES_DECRYPT); - tout0=tin[0]; - tout1=tin[1]; - - FP(tout1,tout0); /**/ - - tout0^=xor0; - tout1^=xor1; - if (l >= 8) - { - l2c(tout0,out); - l2c(tout1,out); - } - else - l2cn(tout0,tout1,out,l); - xor0=t0; - xor1=t1; - } - iv=(unsigned char *)ivec; - l2c(xor0,iv); - l2c(xor1,iv); - } - tin0=tin1=tout0=tout1=xor0=xor1=0; - tin[0]=tin[1]=0; - } - -#ifdef undef /* MACRO */ -void des_ede2_cbc_encrypt(input, output, length, ks1, ks2, ivec, enc) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule ks1; -des_key_schedule ks2; -des_cblock (*ivec); -int enc; - { - des_ede3_cbc_encrypt(input,output,length,ks1,ks2,ks1,ivec,enc); - } -#endif diff --git a/secure/lib/libdes/enc_read.c b/secure/lib/libdes/enc_read.c deleted file mode 100644 index 11a6c5a82544f..0000000000000 --- a/secure/lib/libdes/enc_read.c +++ /dev/null @@ -1,189 +0,0 @@ -/* lib/des/enc_read.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include -#include "des_locl.h" - -/* This has some uglies in it but it works - even over sockets. */ -extern int errno; -int des_rw_mode=DES_PCBC_MODE; - -int des_enc_read(fd, buf, len, sched, iv) -int fd; -char *buf; -int len; -des_key_schedule sched; -des_cblock (*iv); - { - /* data to be unencrypted */ - int net_num=0; - unsigned char net[BSIZE]; - /* extra unencrypted data - * for when a block of 100 comes in but is des_read one byte at - * a time. */ - static char unnet[BSIZE]; - static int unnet_start=0; - static int unnet_left=0; - int i; - long num=0,rnum; - unsigned char *p; - - /* left over data from last decrypt */ - if (unnet_left != 0) - { - if (unnet_left < len) - { - /* we still still need more data but will return - * with the number of bytes we have - should always - * check the return value */ - memcpy(buf,&(unnet[unnet_start]), - (unsigned int)unnet_left); - /* eay 26/08/92 I had the next 2 lines - * reversed :-( */ - i=unnet_left; - unnet_start=unnet_left=0; - } - else - { - memcpy(buf,&(unnet[unnet_start]),(unsigned int)len); - unnet_start+=len; - unnet_left-=len; - i=len; - } - return(i); - } - - /* We need to get more data. */ - if (len > MAXWRITE) len=MAXWRITE; - - /* first - get the length */ - net_num=0; - while (net_num < HDRSIZE) - { - i=read(fd,&(net[net_num]),(unsigned int)HDRSIZE-net_num); - if ((i == -1) && (errno == EINTR)) continue; - if (i <= 0) return(0); - net_num+=i; - } - - /* we now have at net_num bytes in net */ - p=net; - num=0; - n2l(p,num); - /* num should be rounded up to the next group of eight - * we make sure that we have read a multiple of 8 bytes from the net. - */ - if ((num > MAXWRITE) || (num < 0)) /* error */ - return(-1); - rnum=(num < 8)?8:((num+7)/8*8); - - net_num=0; - while (net_num < rnum) - { - i=read(fd,&(net[net_num]),(unsigned int)rnum-net_num); - if ((i == -1) && (errno == EINTR)) continue; - if (i <= 0) return(0); - net_num+=i; - } - - /* Check if there will be data left over. */ - if (len < num) - { - if (des_rw_mode & DES_PCBC_MODE) - pcbc_encrypt((des_cblock *)net,(des_cblock *)unnet, - num,sched,iv,DES_DECRYPT); - else - cbc_encrypt((des_cblock *)net,(des_cblock *)unnet, - num,sched,iv,DES_DECRYPT); - memcpy(buf,unnet,(unsigned int)len); - unnet_start=len; - unnet_left=num-len; - - /* The following line is done because we return num - * as the number of bytes read. */ - num=len; - } - else - { - /* >output is a multiple of 8 byes, if len < rnum - * >we must be careful. The user must be aware that this - * >routine will write more bytes than he asked for. - * >The length of the buffer must be correct. - * FIXED - Should be ok now 18-9-90 - eay */ - if (len < rnum) - { - char tmpbuf[BSIZE]; - - if (des_rw_mode & DES_PCBC_MODE) - pcbc_encrypt((des_cblock *)net, - (des_cblock *)tmpbuf, - num,sched,iv,DES_DECRYPT); - else - cbc_encrypt((des_cblock *)net, - (des_cblock *)tmpbuf, - num,sched,iv,DES_DECRYPT); - - /* eay 26/08/92 fix a bug that returned more - * bytes than you asked for (returned len bytes :-( */ - memcpy(buf,tmpbuf,(unsigned int)num); - } - else - { - if (des_rw_mode & DES_PCBC_MODE) - pcbc_encrypt((des_cblock *)net, - (des_cblock *)buf,num,sched,iv, - DES_DECRYPT); - else - cbc_encrypt((des_cblock *)net, - (des_cblock *)buf,num,sched,iv, - DES_DECRYPT); - } - } - return(num); - } - diff --git a/secure/lib/libdes/enc_writ.c b/secure/lib/libdes/enc_writ.c deleted file mode 100644 index e0d50751f7edf..0000000000000 --- a/secure/lib/libdes/enc_writ.c +++ /dev/null @@ -1,142 +0,0 @@ -/* lib/des/enc_writ.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include -#include "des_locl.h" - -int des_enc_write(fd, buf, len, sched, iv) -int fd; -char *buf; -int len; -des_key_schedule sched; -des_cblock (*iv); - { -#ifdef _LIBC - extern int srandom(); - extern unsigned long time(); - extern int random(); - extern int write(); -#endif - - long rnum; - int i,j,k,outnum; - char outbuf[BSIZE+HDRSIZE]; - char shortbuf[8]; - char *p; - static int start=1; - - /* If we are sending less than 8 bytes, the same char will look - * the same if we don't pad it out with random bytes */ - if (start) - { - start=0; - srandom((unsigned int)time(NULL)); - } - - /* lets recurse if we want to send the data in small chunks */ - if (len > MAXWRITE) - { - j=0; - for (i=0; i MAXWRITE)?MAXWRITE:(len-i),sched,iv); - if (k < 0) - return(k); - else - j+=k; - } - return(j); - } - - /* write length first */ - p=outbuf; - l2n(len,p); - - /* pad short strings */ - if (len < 8) - { - p=shortbuf; - memcpy(shortbuf,buf,(unsigned int)len); - for (i=len; i<8; i++) - shortbuf[i]=random(); - rnum=8; - } - else - { - p=buf; - rnum=((len+7)/8*8); /* round up to nearest eight */ - } - - if (des_rw_mode & DES_PCBC_MODE) - pcbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]), - (long)((len<8)?8:len),sched,iv,DES_ENCRYPT); - else - cbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]), - (long)((len<8)?8:len),sched,iv,DES_ENCRYPT); - - /* output */ - outnum=rnum+HDRSIZE; - - for (j=0; j - -/* Eric Young. - * This version of crypt has been developed from my MIT compatable - * DES library. - * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au - * eay@mincom.oz.au or eay@psych.psy.uq.oz.au - */ - -#if !defined(_LIBC) || defined(NOCONST) -#define const -#endif - -typedef unsigned char des_cblock[8]; - -typedef struct des_ks_struct - { - union { - des_cblock _; - /* make sure things are correct size on machines with - * 8 byte longs */ - unsigned long pad[2]; - } ks; -#define _ ks._ - } des_key_schedule[16]; - -#define DES_KEY_SZ (sizeof(des_cblock)) -#define DES_ENCRYPT 1 -#define DES_DECRYPT 0 - -#define ITERATIONS 16 -#define HALF_ITERATIONS 8 - -#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ - l|=((unsigned long)(*((c)++)))<< 8, \ - l|=((unsigned long)(*((c)++)))<<16, \ - l|=((unsigned long)(*((c)++)))<<24) - -#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16)&0xff), \ - *((c)++)=(unsigned char)(((l)>>24)&0xff)) - -static const unsigned long SPtrans[8][64]={ -{ -/* nibble 0 */ -0x00820200L, 0x00020000L, 0x80800000L, 0x80820200L, -0x00800000L, 0x80020200L, 0x80020000L, 0x80800000L, -0x80020200L, 0x00820200L, 0x00820000L, 0x80000200L, -0x80800200L, 0x00800000L, 0x00000000L, 0x80020000L, -0x00020000L, 0x80000000L, 0x00800200L, 0x00020200L, -0x80820200L, 0x00820000L, 0x80000200L, 0x00800200L, -0x80000000L, 0x00000200L, 0x00020200L, 0x80820000L, -0x00000200L, 0x80800200L, 0x80820000L, 0x00000000L, -0x00000000L, 0x80820200L, 0x00800200L, 0x80020000L, -0x00820200L, 0x00020000L, 0x80000200L, 0x00800200L, -0x80820000L, 0x00000200L, 0x00020200L, 0x80800000L, -0x80020200L, 0x80000000L, 0x80800000L, 0x00820000L, -0x80820200L, 0x00020200L, 0x00820000L, 0x80800200L, -0x00800000L, 0x80000200L, 0x80020000L, 0x00000000L, -0x00020000L, 0x00800000L, 0x80800200L, 0x00820200L, -0x80000000L, 0x80820000L, 0x00000200L, 0x80020200L, -},{ -/* nibble 1 */ -0x10042004L, 0x00000000L, 0x00042000L, 0x10040000L, -0x10000004L, 0x00002004L, 0x10002000L, 0x00042000L, -0x00002000L, 0x10040004L, 0x00000004L, 0x10002000L, -0x00040004L, 0x10042000L, 0x10040000L, 0x00000004L, -0x00040000L, 0x10002004L, 0x10040004L, 0x00002000L, -0x00042004L, 0x10000000L, 0x00000000L, 0x00040004L, -0x10002004L, 0x00042004L, 0x10042000L, 0x10000004L, -0x10000000L, 0x00040000L, 0x00002004L, 0x10042004L, -0x00040004L, 0x10042000L, 0x10002000L, 0x00042004L, -0x10042004L, 0x00040004L, 0x10000004L, 0x00000000L, -0x10000000L, 0x00002004L, 0x00040000L, 0x10040004L, -0x00002000L, 0x10000000L, 0x00042004L, 0x10002004L, -0x10042000L, 0x00002000L, 0x00000000L, 0x10000004L, -0x00000004L, 0x10042004L, 0x00042000L, 0x10040000L, -0x10040004L, 0x00040000L, 0x00002004L, 0x10002000L, -0x10002004L, 0x00000004L, 0x10040000L, 0x00042000L, -},{ -/* nibble 2 */ -0x41000000L, 0x01010040L, 0x00000040L, 0x41000040L, -0x40010000L, 0x01000000L, 0x41000040L, 0x00010040L, -0x01000040L, 0x00010000L, 0x01010000L, 0x40000000L, -0x41010040L, 0x40000040L, 0x40000000L, 0x41010000L, -0x00000000L, 0x40010000L, 0x01010040L, 0x00000040L, -0x40000040L, 0x41010040L, 0x00010000L, 0x41000000L, -0x41010000L, 0x01000040L, 0x40010040L, 0x01010000L, -0x00010040L, 0x00000000L, 0x01000000L, 0x40010040L, -0x01010040L, 0x00000040L, 0x40000000L, 0x00010000L, -0x40000040L, 0x40010000L, 0x01010000L, 0x41000040L, -0x00000000L, 0x01010040L, 0x00010040L, 0x41010000L, -0x40010000L, 0x01000000L, 0x41010040L, 0x40000000L, -0x40010040L, 0x41000000L, 0x01000000L, 0x41010040L, -0x00010000L, 0x01000040L, 0x41000040L, 0x00010040L, -0x01000040L, 0x00000000L, 0x41010000L, 0x40000040L, -0x41000000L, 0x40010040L, 0x00000040L, 0x01010000L, -},{ -/* nibble 3 */ -0x00100402L, 0x04000400L, 0x00000002L, 0x04100402L, -0x00000000L, 0x04100000L, 0x04000402L, 0x00100002L, -0x04100400L, 0x04000002L, 0x04000000L, 0x00000402L, -0x04000002L, 0x00100402L, 0x00100000L, 0x04000000L, -0x04100002L, 0x00100400L, 0x00000400L, 0x00000002L, -0x00100400L, 0x04000402L, 0x04100000L, 0x00000400L, -0x00000402L, 0x00000000L, 0x00100002L, 0x04100400L, -0x04000400L, 0x04100002L, 0x04100402L, 0x00100000L, -0x04100002L, 0x00000402L, 0x00100000L, 0x04000002L, -0x00100400L, 0x04000400L, 0x00000002L, 0x04100000L, -0x04000402L, 0x00000000L, 0x00000400L, 0x00100002L, -0x00000000L, 0x04100002L, 0x04100400L, 0x00000400L, -0x04000000L, 0x04100402L, 0x00100402L, 0x00100000L, -0x04100402L, 0x00000002L, 0x04000400L, 0x00100402L, -0x00100002L, 0x00100400L, 0x04100000L, 0x04000402L, -0x00000402L, 0x04000000L, 0x04000002L, 0x04100400L, -},{ -/* nibble 4 */ -0x02000000L, 0x00004000L, 0x00000100L, 0x02004108L, -0x02004008L, 0x02000100L, 0x00004108L, 0x02004000L, -0x00004000L, 0x00000008L, 0x02000008L, 0x00004100L, -0x02000108L, 0x02004008L, 0x02004100L, 0x00000000L, -0x00004100L, 0x02000000L, 0x00004008L, 0x00000108L, -0x02000100L, 0x00004108L, 0x00000000L, 0x02000008L, -0x00000008L, 0x02000108L, 0x02004108L, 0x00004008L, -0x02004000L, 0x00000100L, 0x00000108L, 0x02004100L, -0x02004100L, 0x02000108L, 0x00004008L, 0x02004000L, -0x00004000L, 0x00000008L, 0x02000008L, 0x02000100L, -0x02000000L, 0x00004100L, 0x02004108L, 0x00000000L, -0x00004108L, 0x02000000L, 0x00000100L, 0x00004008L, -0x02000108L, 0x00000100L, 0x00000000L, 0x02004108L, -0x02004008L, 0x02004100L, 0x00000108L, 0x00004000L, -0x00004100L, 0x02004008L, 0x02000100L, 0x00000108L, -0x00000008L, 0x00004108L, 0x02004000L, 0x02000008L, -},{ -/* nibble 5 */ -0x20000010L, 0x00080010L, 0x00000000L, 0x20080800L, -0x00080010L, 0x00000800L, 0x20000810L, 0x00080000L, -0x00000810L, 0x20080810L, 0x00080800L, 0x20000000L, -0x20000800L, 0x20000010L, 0x20080000L, 0x00080810L, -0x00080000L, 0x20000810L, 0x20080010L, 0x00000000L, -0x00000800L, 0x00000010L, 0x20080800L, 0x20080010L, -0x20080810L, 0x20080000L, 0x20000000L, 0x00000810L, -0x00000010L, 0x00080800L, 0x00080810L, 0x20000800L, -0x00000810L, 0x20000000L, 0x20000800L, 0x00080810L, -0x20080800L, 0x00080010L, 0x00000000L, 0x20000800L, -0x20000000L, 0x00000800L, 0x20080010L, 0x00080000L, -0x00080010L, 0x20080810L, 0x00080800L, 0x00000010L, -0x20080810L, 0x00080800L, 0x00080000L, 0x20000810L, -0x20000010L, 0x20080000L, 0x00080810L, 0x00000000L, -0x00000800L, 0x20000010L, 0x20000810L, 0x20080800L, -0x20080000L, 0x00000810L, 0x00000010L, 0x20080010L, -},{ -/* nibble 6 */ -0x00001000L, 0x00000080L, 0x00400080L, 0x00400001L, -0x00401081L, 0x00001001L, 0x00001080L, 0x00000000L, -0x00400000L, 0x00400081L, 0x00000081L, 0x00401000L, -0x00000001L, 0x00401080L, 0x00401000L, 0x00000081L, -0x00400081L, 0x00001000L, 0x00001001L, 0x00401081L, -0x00000000L, 0x00400080L, 0x00400001L, 0x00001080L, -0x00401001L, 0x00001081L, 0x00401080L, 0x00000001L, -0x00001081L, 0x00401001L, 0x00000080L, 0x00400000L, -0x00001081L, 0x00401000L, 0x00401001L, 0x00000081L, -0x00001000L, 0x00000080L, 0x00400000L, 0x00401001L, -0x00400081L, 0x00001081L, 0x00001080L, 0x00000000L, -0x00000080L, 0x00400001L, 0x00000001L, 0x00400080L, -0x00000000L, 0x00400081L, 0x00400080L, 0x00001080L, -0x00000081L, 0x00001000L, 0x00401081L, 0x00400000L, -0x00401080L, 0x00000001L, 0x00001001L, 0x00401081L, -0x00400001L, 0x00401080L, 0x00401000L, 0x00001001L, -},{ -/* nibble 7 */ -0x08200020L, 0x08208000L, 0x00008020L, 0x00000000L, -0x08008000L, 0x00200020L, 0x08200000L, 0x08208020L, -0x00000020L, 0x08000000L, 0x00208000L, 0x00008020L, -0x00208020L, 0x08008020L, 0x08000020L, 0x08200000L, -0x00008000L, 0x00208020L, 0x00200020L, 0x08008000L, -0x08208020L, 0x08000020L, 0x00000000L, 0x00208000L, -0x08000000L, 0x00200000L, 0x08008020L, 0x08200020L, -0x00200000L, 0x00008000L, 0x08208000L, 0x00000020L, -0x00200000L, 0x00008000L, 0x08000020L, 0x08208020L, -0x00008020L, 0x08000000L, 0x00000000L, 0x00208000L, -0x08200020L, 0x08008020L, 0x08008000L, 0x00200020L, -0x08208000L, 0x00000020L, 0x00200020L, 0x08008000L, -0x08208020L, 0x00200000L, 0x08200000L, 0x08000020L, -0x00208000L, 0x00008020L, 0x08008020L, 0x08200000L, -0x00000020L, 0x08208000L, 0x00208020L, 0x00000000L, -0x08000000L, 0x08200020L, 0x00008000L, 0x00208020L}}; -static const unsigned long skb[8][64]={ -{ -/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ -0x00000000L,0x00000010L,0x20000000L,0x20000010L, -0x00010000L,0x00010010L,0x20010000L,0x20010010L, -0x00000800L,0x00000810L,0x20000800L,0x20000810L, -0x00010800L,0x00010810L,0x20010800L,0x20010810L, -0x00000020L,0x00000030L,0x20000020L,0x20000030L, -0x00010020L,0x00010030L,0x20010020L,0x20010030L, -0x00000820L,0x00000830L,0x20000820L,0x20000830L, -0x00010820L,0x00010830L,0x20010820L,0x20010830L, -0x00080000L,0x00080010L,0x20080000L,0x20080010L, -0x00090000L,0x00090010L,0x20090000L,0x20090010L, -0x00080800L,0x00080810L,0x20080800L,0x20080810L, -0x00090800L,0x00090810L,0x20090800L,0x20090810L, -0x00080020L,0x00080030L,0x20080020L,0x20080030L, -0x00090020L,0x00090030L,0x20090020L,0x20090030L, -0x00080820L,0x00080830L,0x20080820L,0x20080830L, -0x00090820L,0x00090830L,0x20090820L,0x20090830L, -},{ -/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ -0x00000000L,0x02000000L,0x00002000L,0x02002000L, -0x00200000L,0x02200000L,0x00202000L,0x02202000L, -0x00000004L,0x02000004L,0x00002004L,0x02002004L, -0x00200004L,0x02200004L,0x00202004L,0x02202004L, -0x00000400L,0x02000400L,0x00002400L,0x02002400L, -0x00200400L,0x02200400L,0x00202400L,0x02202400L, -0x00000404L,0x02000404L,0x00002404L,0x02002404L, -0x00200404L,0x02200404L,0x00202404L,0x02202404L, -0x10000000L,0x12000000L,0x10002000L,0x12002000L, -0x10200000L,0x12200000L,0x10202000L,0x12202000L, -0x10000004L,0x12000004L,0x10002004L,0x12002004L, -0x10200004L,0x12200004L,0x10202004L,0x12202004L, -0x10000400L,0x12000400L,0x10002400L,0x12002400L, -0x10200400L,0x12200400L,0x10202400L,0x12202400L, -0x10000404L,0x12000404L,0x10002404L,0x12002404L, -0x10200404L,0x12200404L,0x10202404L,0x12202404L, -},{ -/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ -0x00000000L,0x00000001L,0x00040000L,0x00040001L, -0x01000000L,0x01000001L,0x01040000L,0x01040001L, -0x00000002L,0x00000003L,0x00040002L,0x00040003L, -0x01000002L,0x01000003L,0x01040002L,0x01040003L, -0x00000200L,0x00000201L,0x00040200L,0x00040201L, -0x01000200L,0x01000201L,0x01040200L,0x01040201L, -0x00000202L,0x00000203L,0x00040202L,0x00040203L, -0x01000202L,0x01000203L,0x01040202L,0x01040203L, -0x08000000L,0x08000001L,0x08040000L,0x08040001L, -0x09000000L,0x09000001L,0x09040000L,0x09040001L, -0x08000002L,0x08000003L,0x08040002L,0x08040003L, -0x09000002L,0x09000003L,0x09040002L,0x09040003L, -0x08000200L,0x08000201L,0x08040200L,0x08040201L, -0x09000200L,0x09000201L,0x09040200L,0x09040201L, -0x08000202L,0x08000203L,0x08040202L,0x08040203L, -0x09000202L,0x09000203L,0x09040202L,0x09040203L, -},{ -/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ -0x00000000L,0x00100000L,0x00000100L,0x00100100L, -0x00000008L,0x00100008L,0x00000108L,0x00100108L, -0x00001000L,0x00101000L,0x00001100L,0x00101100L, -0x00001008L,0x00101008L,0x00001108L,0x00101108L, -0x04000000L,0x04100000L,0x04000100L,0x04100100L, -0x04000008L,0x04100008L,0x04000108L,0x04100108L, -0x04001000L,0x04101000L,0x04001100L,0x04101100L, -0x04001008L,0x04101008L,0x04001108L,0x04101108L, -0x00020000L,0x00120000L,0x00020100L,0x00120100L, -0x00020008L,0x00120008L,0x00020108L,0x00120108L, -0x00021000L,0x00121000L,0x00021100L,0x00121100L, -0x00021008L,0x00121008L,0x00021108L,0x00121108L, -0x04020000L,0x04120000L,0x04020100L,0x04120100L, -0x04020008L,0x04120008L,0x04020108L,0x04120108L, -0x04021000L,0x04121000L,0x04021100L,0x04121100L, -0x04021008L,0x04121008L,0x04021108L,0x04121108L, -},{ -/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ -0x00000000L,0x10000000L,0x00010000L,0x10010000L, -0x00000004L,0x10000004L,0x00010004L,0x10010004L, -0x20000000L,0x30000000L,0x20010000L,0x30010000L, -0x20000004L,0x30000004L,0x20010004L,0x30010004L, -0x00100000L,0x10100000L,0x00110000L,0x10110000L, -0x00100004L,0x10100004L,0x00110004L,0x10110004L, -0x20100000L,0x30100000L,0x20110000L,0x30110000L, -0x20100004L,0x30100004L,0x20110004L,0x30110004L, -0x00001000L,0x10001000L,0x00011000L,0x10011000L, -0x00001004L,0x10001004L,0x00011004L,0x10011004L, -0x20001000L,0x30001000L,0x20011000L,0x30011000L, -0x20001004L,0x30001004L,0x20011004L,0x30011004L, -0x00101000L,0x10101000L,0x00111000L,0x10111000L, -0x00101004L,0x10101004L,0x00111004L,0x10111004L, -0x20101000L,0x30101000L,0x20111000L,0x30111000L, -0x20101004L,0x30101004L,0x20111004L,0x30111004L, -},{ -/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ -0x00000000L,0x08000000L,0x00000008L,0x08000008L, -0x00000400L,0x08000400L,0x00000408L,0x08000408L, -0x00020000L,0x08020000L,0x00020008L,0x08020008L, -0x00020400L,0x08020400L,0x00020408L,0x08020408L, -0x00000001L,0x08000001L,0x00000009L,0x08000009L, -0x00000401L,0x08000401L,0x00000409L,0x08000409L, -0x00020001L,0x08020001L,0x00020009L,0x08020009L, -0x00020401L,0x08020401L,0x00020409L,0x08020409L, -0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, -0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, -0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, -0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, -0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, -0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, -0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, -0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, -},{ -/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ -0x00000000L,0x00000100L,0x00080000L,0x00080100L, -0x01000000L,0x01000100L,0x01080000L,0x01080100L, -0x00000010L,0x00000110L,0x00080010L,0x00080110L, -0x01000010L,0x01000110L,0x01080010L,0x01080110L, -0x00200000L,0x00200100L,0x00280000L,0x00280100L, -0x01200000L,0x01200100L,0x01280000L,0x01280100L, -0x00200010L,0x00200110L,0x00280010L,0x00280110L, -0x01200010L,0x01200110L,0x01280010L,0x01280110L, -0x00000200L,0x00000300L,0x00080200L,0x00080300L, -0x01000200L,0x01000300L,0x01080200L,0x01080300L, -0x00000210L,0x00000310L,0x00080210L,0x00080310L, -0x01000210L,0x01000310L,0x01080210L,0x01080310L, -0x00200200L,0x00200300L,0x00280200L,0x00280300L, -0x01200200L,0x01200300L,0x01280200L,0x01280300L, -0x00200210L,0x00200310L,0x00280210L,0x00280310L, -0x01200210L,0x01200310L,0x01280210L,0x01280310L, -},{ -/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ -0x00000000L,0x04000000L,0x00040000L,0x04040000L, -0x00000002L,0x04000002L,0x00040002L,0x04040002L, -0x00002000L,0x04002000L,0x00042000L,0x04042000L, -0x00002002L,0x04002002L,0x00042002L,0x04042002L, -0x00000020L,0x04000020L,0x00040020L,0x04040020L, -0x00000022L,0x04000022L,0x00040022L,0x04040022L, -0x00002020L,0x04002020L,0x00042020L,0x04042020L, -0x00002022L,0x04002022L,0x00042022L,0x04042022L, -0x00000800L,0x04000800L,0x00040800L,0x04040800L, -0x00000802L,0x04000802L,0x00040802L,0x04040802L, -0x00002800L,0x04002800L,0x00042800L,0x04042800L, -0x00002802L,0x04002802L,0x00042802L,0x04042802L, -0x00000820L,0x04000820L,0x00040820L,0x04040820L, -0x00000822L,0x04000822L,0x00040822L,0x04040822L, -0x00002820L,0x04002820L,0x00042820L,0x04042820L, -0x00002822L,0x04002822L,0x00042822L,0x04042822L, -} }; - -/* See ecb_encrypt.c for a pseudo description of these macros. */ -#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ - (b)^=(t),\ - (a)^=((t)<<(n))) - -#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ - (a)=(a)^(t)^(t>>(16-(n))))\ - -static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; - -#ifndef NOPROTO -static int body(unsigned long *out0, unsigned long *out1, - des_key_schedule ks, unsigned long Eswap0, unsigned long Eswap1); -static int des_set_key(des_cblock (*key), des_key_schedule schedule); -#else -static int body(); -static int des_set_key(); -#endif - -static int des_set_key(key, schedule) -des_cblock (*key); -des_key_schedule schedule; - { - register unsigned long c,d,t,s; - register unsigned char *in; - register unsigned long *k; - register int i; - - k=(unsigned long *)schedule; - in=(unsigned char *)key; - - c2l(in,c); - c2l(in,d); - - /* I now do it in 47 simple operations :-) - * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) - * for the inspiration. :-) */ - PERM_OP (d,c,t,4,0x0f0f0f0fL); - HPERM_OP(c,t,-2,0xcccc0000L); - HPERM_OP(d,t,-2,0xcccc0000L); - PERM_OP (d,c,t,1,0x55555555L); - PERM_OP (c,d,t,8,0x00ff00ffL); - PERM_OP (d,c,t,1,0x55555555L); - d= (((d&0x000000ffL)<<16)| (d&0x0000ff00L) | - ((d&0x00ff0000L)>>16)|((c&0xf0000000L)>>4)); - c&=0x0fffffffL; - - for (i=0; i>2)|(c<<26)); d=((d>>2)|(d<<26)); } - else - { c=((c>>1)|(c<<27)); d=((d>>1)|(d<<27)); } - c&=0x0fffffffL; - d&=0x0fffffffL; - /* could be a few less shifts but I am to lazy at this - * point in time to investigate */ - s= skb[0][ (c )&0x3f ]| - skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]| - skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]| - skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) | - ((c>>22L)&0x38)]; - t= skb[4][ (d )&0x3f ]| - skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| - skb[6][ (d>>15L)&0x3f ]| - skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)]; - - /* table contained 0213 4657 */ - *(k++)=((t<<16)|(s&0x0000ffffL))&0xffffffffL; - s= ((s>>16)|(t&0xffff0000L)); - - s=(s<<4)|(s>>28); - *(k++)=s&0xffffffffL; - } - return(0); - } - -/****************************************************************** - * modified stuff for crypt. - ******************************************************************/ - -/* The changes to this macro may help or hinder, depending on the - * compiler and the achitecture. gcc2 always seems to do well :-). - * Inspired by Dana How - * DO NOT use the alternative version on machines with 8 byte longs. - */ -#ifdef DES_USE_PTR -#define D_ENCRYPT(L,R,S) \ - t=(R^(R>>16)); \ - u=(t&E0); \ - t=(t&E1); \ - u=((u^(u<<16))^R^s[S ])<<2; \ - t=(t^(t<<16))^R^s[S+1]; \ - t=(t>>2)|(t<<30); \ - L^= \ - *(unsigned long *)(des_SP+0x0100+((t )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0300+((t>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0500+((t>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0700+((t>>24)&0xfc))+ \ - *(unsigned long *)(des_SP+ ((u )&0xfc))+ \ - *(unsigned long *)(des_SP+0x0200+((u>> 8)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0400+((u>>16)&0xfc))+ \ - *(unsigned long *)(des_SP+0x0600+((u>>24)&0xfc)); -#else /* original version */ -#define D_ENCRYPT(L,R,S) \ - t=(R^(R>>16)); \ - u=(t&E0); \ - t=(t&E1); \ - u=(u^(u<<16))^R^s[S ]; \ - t=(t^(t<<16))^R^s[S+1]; \ - t=(t>>4)|(t<<28); \ - L^= SPtrans[1][(t )&0x3f]| \ - SPtrans[3][(t>> 8)&0x3f]| \ - SPtrans[5][(t>>16)&0x3f]| \ - SPtrans[7][(t>>24)&0x3f]| \ - SPtrans[0][(u )&0x3f]| \ - SPtrans[2][(u>> 8)&0x3f]| \ - SPtrans[4][(u>>16)&0x3f]| \ - SPtrans[6][(u>>24)&0x3f]; -#endif - -static unsigned const char con_salt[128]={ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01, -0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, -0x0A,0x0B,0x05,0x06,0x07,0x08,0x09,0x0A, -0x0B,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12, -0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A, -0x1B,0x1C,0x1D,0x1E,0x1F,0x20,0x21,0x22, -0x23,0x24,0x25,0x20,0x21,0x22,0x23,0x24, -0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C, -0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34, -0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C, -0x3D,0x3E,0x3F,0x00,0x00,0x00,0x00,0x00, -}; - -static unsigned const char cov_2char[64]={ -0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, -0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44, -0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C, -0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54, -0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62, -0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A, -0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72, -0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A -}; - -#ifndef NOPROTO -#ifdef PERL5 -char *des_crypt(char *buf,char *salt); -#else -char *crypt(char *buf,char *salt); -#endif -#else -#ifdef PERL5 -char *des_crypt(); -#else -char *crypt(); -#endif -#endif - -#ifdef PERL5 -char *des_crypt(buf,salt) -#else -char *crypt(buf,salt) -#endif -char *buf; -char *salt; - { - unsigned int i,j,x,y; - unsigned long Eswap0=0,Eswap1=0; - unsigned long out[2],ll; - des_cblock key; - des_key_schedule ks; - static unsigned char buff[20]; - unsigned char bb[9]; - unsigned char *b=bb; - unsigned char c,u; - - /* eay 25/08/92 - * If you call crypt("pwd","*") as often happens when you - * have * as the pwd field in /etc/passwd, the function - * returns *\0XXXXXXXXX - * The \0 makes the string look like * so the pwd "*" would - * crypt to "*". This was found when replacing the crypt in - * our shared libraries. People found that the disbled - * accounts effectivly had no passwd :-(. */ - x=buff[0]=((salt[0] == '\0')?'A':salt[0]); - Eswap0=con_salt[x]; - x=buff[1]=((salt[1] == '\0')?'A':salt[1]); - Eswap1=con_salt[x]<<4; - - for (i=0; i<8; i++) - { - c= *(buf++); - if (!c) break; - key[i]=(c<<1); - } - for (; i<8; i++) - key[i]=0; - - des_set_key((des_cblock *)(key),ks); - body(&(out[0]),&(out[1]),ks,Eswap0,Eswap1); - - ll=out[0]; l2c(ll,b); - ll=out[1]; l2c(ll,b); - y=0; - u=0x80; - bb[8]=0; - for (i=2; i<13; i++) - { - c=0; - for (j=0; j<6; j++) - { - c<<=1; - if (bb[y] & u) c|=1; - u>>=1; - if (!u) - { - y++; - u=0x80; - } - } - buff[i]=cov_2char[c]; - } - buff[13]='\0'; - return((char *)buff); - } - -static int body(out0, out1, ks, Eswap0, Eswap1) -unsigned long *out0; -unsigned long *out1; -des_key_schedule ks; -unsigned long Eswap0; -unsigned long Eswap1; - { - register unsigned long l,r,t,u; -#ifdef DES_USE_PTR - register unsigned char *des_SP=(unsigned char *)SPtrans; -#endif - register unsigned long *s; - register int i,j; - register unsigned long E0,E1; - - l=0; - r=0; - - s=(unsigned long *)ks; - E0=Eswap0; - E1=Eswap1; - - for (j=0; j<25; j++) - { - for (i=0; i<(ITERATIONS*2); i+=4) - { - D_ENCRYPT(l,r, i); /* 1 */ - D_ENCRYPT(r,l, i+2); /* 2 */ - } - t=l; - l=r; - r=t; - } - t=r; - r=(l>>1L)|(l<<31L); - l=(t>>1L)|(t<<31L); - /* clear the top bits on machines with 8byte longs */ - l&=0xffffffffL; - r&=0xffffffffL; - - PERM_OP(r,l,t, 1,0x55555555L); - PERM_OP(l,r,t, 8,0x00ff00ffL); - PERM_OP(r,l,t, 2,0x33333333L); - PERM_OP(l,r,t,16,0x0000ffffL); - PERM_OP(r,l,t, 4,0x0f0f0f0fL); - - *out0=l; - *out1=r; - return(0); - } - diff --git a/secure/lib/libdes/makefile.bc b/secure/lib/libdes/makefile.bc deleted file mode 100644 index 1fe6d4915a919..0000000000000 --- a/secure/lib/libdes/makefile.bc +++ /dev/null @@ -1,50 +0,0 @@ -# -# Origional BC Makefile from Teun -# -# -CC = bcc -TLIB = tlib /0 /C -# note: the -3 flag produces code for 386, 486, Pentium etc; omit it for 286s -OPTIMIZE= -3 -O2 -#WINDOWS= -W -CFLAGS = -c -ml -d $(OPTIMIZE) $(WINDOWS) -DMSDOS -LFLAGS = -ml $(WINDOWS) - -.c.obj: - $(CC) $(CFLAGS) $*.c - -.obj.exe: - $(CC) $(LFLAGS) -e$*.exe $*.obj libdes.lib - -all: $(LIB) destest.exe rpw.exe des.exe speed.exe - -# "make clean": use a directory containing only libdes .exe and .obj files... -clean: - del *.exe - del *.obj - del libdes.lib - del libdes.rsp - -OBJS= cbc_cksm.obj cbc_enc.obj ecb_enc.obj pcbc_enc.obj \ - qud_cksm.obj rand_key.obj set_key.obj str2key.obj \ - enc_read.obj enc_writ.obj fcrypt.obj cfb_enc.obj \ - ecb3_enc.obj ofb_enc.obj cbc3_enc.obj read_pwd.obj\ - cfb64enc.obj ofb64enc.obj ede_enc.obj cfb64ede.obj\ - ofb64ede.obj supp.obj - -LIB= libdes.lib - -$(LIB): $(OBJS) - del $(LIB) - makersp "+%s &\n" &&| - $(OBJS) -| >libdes.rsp - $(TLIB) libdes.lib @libdes.rsp,nul - del libdes.rsp - -destest.exe: destest.obj libdes.lib -rpw.exe: rpw.obj libdes.lib -speed.exe: speed.obj libdes.lib -des.exe: des.obj libdes.lib - - diff --git a/secure/lib/libdes/ncbc_enc.c b/secure/lib/libdes/ncbc_enc.c deleted file mode 100644 index d307ae407a866..0000000000000 --- a/secure/lib/libdes/ncbc_enc.c +++ /dev/null @@ -1,120 +0,0 @@ -/* lib/des/ncbc_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -void des_ncbc_encrypt(input, output, length, schedule, ivec, encrypt) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int encrypt; - { - register unsigned long tin0,tin1; - register unsigned long tout0,tout1,xor0,xor1; - register unsigned char *in,*out; - register long l=length; - unsigned long tin[2]; - unsigned char *iv; - - in=(unsigned char *)input; - out=(unsigned char *)output; - iv=(unsigned char *)ivec; - - if (encrypt) - { - c2l(iv,tout0); - c2l(iv,tout1); - for (; l>0; l-=8) - { - if (l >= 8) - { - c2l(in,tin0); - c2l(in,tin1); - } - else - c2ln(in,tin0,tin1,l); - tin0^=tout0; tin[0]=tin0; - tin1^=tout1; tin[1]=tin1; - des_encrypt((unsigned long *)tin,schedule,DES_ENCRYPT); - tout0=tin[0]; l2c(tout0,out); - tout1=tin[1]; l2c(tout1,out); - } - iv=(unsigned char *)ivec; - l2c(tout0,iv); - l2c(tout1,iv); - } - else - { - c2l(iv,xor0); - c2l(iv,xor1); - for (; l>0; l-=8) - { - c2l(in,tin0); tin[0]=tin0; - c2l(in,tin1); tin[1]=tin1; - des_encrypt((unsigned long *)tin,schedule,DES_DECRYPT); - tout0=tin[0]^xor0; - tout1=tin[1]^xor1; - if (l >= 8) - { - l2c(tout0,out); - l2c(tout1,out); - } - else - l2cn(tout0,tout1,out,l); - xor0=tin0; - xor1=tin1; - } - iv=(unsigned char *)ivec; - l2c(xor0,iv); - l2c(xor1,iv); - } - tin0=tin1=tout0=tout1=xor0=xor1=0; - tin[0]=tin[1]=0; - } - diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c deleted file mode 100644 index d15e02ad90a8b..0000000000000 --- a/secure/lib/libdes/new_rkey.c +++ /dev/null @@ -1,227 +0,0 @@ -/* lib/des/new_rkey.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* - * Copyright (c) 1995 - * Mark Murray. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Murray - * and Eric Young - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY MARK MURRAY 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. - * - * $Id: new_rkey.c,v 1.2 1996/02/10 15:54:48 markm Exp $ - */ - -/* 21-Nov-95 - eay - I've finally put this into libdes, I have made a - * few changes since it need to compile on all version of unix and - * there were a few things that would not :-) */ - -#include -#include -#include -#include -#include -#include -#include - -#include "des_locl.h" - -/* This counter keeps track of the pseudo-random sequence */ -static union { - unsigned long ul0, ul1; - unsigned char uc[8]; -} counter; - -/* The current encryption schedule */ -static des_key_schedule current_key; - -/* - * des_set_random_generator_seed: starts a new pseudorandom sequence - * dependant on the supplied key - */ -void -des_set_random_generator_seed(new_key) - des_cblock *new_key; -{ - des_key_sched(new_key, current_key); - - /* reset the counter */ - counter.ul0 = counter.ul1 = 0; -} - -/* - * des_set_sequence_number: set the counter to a known value - */ -void -des_set_sequence_number(new_counter) - des_cblock new_counter; -{ - memcpy((char *)counter.uc,(char *)new_counter,sizeof(counter)); -} - -/* - * des_generate_random_block: returns the next 64 bit random number - */ - -void des_generate_random_block(random_block) - des_cblock *random_block; -{ - /* Encrypt the counter to get pseudo-random numbers */ - des_ecb_encrypt(&counter.uc, random_block, current_key, DES_ENCRYPT); - - /* increment the 64-bit counter - * (or that could be a 128 bit counter on a 64 bit box - eay */ - if (!++counter.ul0) counter.ul1++; -} - -/* - * des_new_random_key: Invents a new, random strong key with odd parity. - */ -int -des_new_random_key(new_key) - des_cblock *new_key; -{ - do { - des_generate_random_block(new_key); - des_set_odd_parity(new_key); - } while (des_is_weak_key(new_key)); - return(0); -} - -/* - * des_init_random_number_generator: intialises the random number generator - * to a truly nasty sequence using system - * supplied volatile variables. - */ -void -des_init_random_number_generator(key) - des_cblock *key; -{ - /* 64-bit structures */ - struct { - u_int32_t pid; - u_int32_t hostid; - } sysblock; - struct timeval timeblock; - struct { - u_int32_t tv_sec; - u_int32_t tv_usec; - } time64bit; - u_int32_t devrandom[2]; - des_cblock new_key; - int mib[2]; - size_t len; - int dr; - - /* Get host ID using official BSD 4.4 method */ - mib[0] = CTL_KERN; - mib[1] = KERN_HOSTID; - len = sizeof(sysblock.hostid); - sysctl(mib, 2, &sysblock.hostid, &len, NULL, 0); - - /* Get Process ID */ - sysblock.pid = getpid(); - - /* Generate a new key, and use it to seed the random generator */ - des_set_random_generator_seed(key); - des_set_sequence_number((unsigned char *)&sysblock); - des_new_random_key(&new_key); - des_set_random_generator_seed(&new_key); - - /* Try to confuse the sequence counter */ - gettimeofday(&timeblock, NULL); - time64bit.tv_sec = (u_int32_t)timeblock.tv_sec; - time64bit.tv_usec = (u_int32_t)timeblock.tv_usec; - /* If /dev/random is available, read some muck */ - dr = open("/dev/random", O_RDONLY); - if (dr >= 0) { - /* Set the descriptor into non-blocking mode. */ - fcntl(dr, F_SETFL, O_NONBLOCK); - len = read(dr, devrandom, sizeof(devrandom)); - close(dr); - if (len > 0) { - time64bit.tv_sec ^= devrandom[0]; - time64bit.tv_usec ^= devrandom[1]; - } -#ifdef DEBUG - printf("DEBUG: read from /dev/random %d %x %x\n", - len, devrandom[0], devrandom[1]); -#endif - } -#ifdef DEBUG - else printf("Cannot open /dev/random\n"); -#endif - des_set_sequence_number((unsigned char *)&time64bit); - - /* Do the work */ - des_new_random_key(&new_key); - des_set_random_generator_seed(&new_key); -} diff --git a/secure/lib/libdes/ofb64ede.c b/secure/lib/libdes/ofb64ede.c deleted file mode 100644 index 3868e76ee1f15..0000000000000 --- a/secure/lib/libdes/ofb64ede.c +++ /dev/null @@ -1,126 +0,0 @@ -/* lib/des/ofb64ede.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output encrypted as though 64bit ofb mode is being - * used. The extra state information to record how much of the - * 64bit block we have used is contained in *num; - */ -void des_ede3_ofb64_encrypt(in, out, length, k1,k2,k3, ivec, num) -register unsigned char *in; -register unsigned char *out; -long length; -des_key_schedule k1,k2,k3; -des_cblock (*ivec); -int *num; - { - register unsigned long v0,v1; - register int n=*num; - register long l=length; - des_cblock d; - register char *dp; - unsigned long ti[2]; - unsigned char *iv; - int save=0; - - iv=(unsigned char *)ivec; - c2l(iv,v0); - c2l(iv,v1); - ti[0]=v0; - ti[1]=v1; - dp=(char *)d; - l2c(v0,dp); - l2c(v1,dp); - while (l--) - { - if (n == 0) - { - IP(v0,v1); - - ti[0]=v0; - ti[1]=v1; - des_encrypt2((unsigned long *)ti,k1,DES_ENCRYPT); - des_encrypt2((unsigned long *)ti,k2,DES_DECRYPT); - des_encrypt2((unsigned long *)ti,k3,DES_ENCRYPT); - v0=ti[0]; - v1=ti[1]; - - FP(v1,v0); - - dp=(char *)d; - l2c(v0,dp); - l2c(v1,dp); - save++; - } - *(out++)=*(in++)^d[n]; - n=(n+1)&0x07; - } - if (save) - { -/* v0=ti[0]; - v1=ti[1];*/ - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - } - v0=v1=ti[0]=ti[1]=0; - *num=n; - } - -#ifdef undef /* MACRO */ -void des_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num) -register unsigned char *in; -register unsigned char *out; -long length; -des_key_schedule k1,k2; -des_cblock (*ivec); -int *num; - { - des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num); - } -#endif diff --git a/secure/lib/libdes/ofb64enc.c b/secure/lib/libdes/ofb64enc.c deleted file mode 100644 index bc8dd8c82716e..0000000000000 --- a/secure/lib/libdes/ofb64enc.c +++ /dev/null @@ -1,103 +0,0 @@ -/* lib/des/ofb64enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output encrypted as though 64bit ofb mode is being - * used. The extra state information to record how much of the - * 64bit block we have used is contained in *num; - */ -void des_ofb64_encrypt(in, out, length, schedule, ivec, num) -register unsigned char *in; -register unsigned char *out; -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int *num; - { - register unsigned long v0,v1,t; - register int n=*num; - register long l=length; - des_cblock d; - register char *dp; - unsigned long ti[2]; - unsigned char *iv; - int save=0; - - iv=(unsigned char *)ivec; - c2l(iv,v0); - c2l(iv,v1); - ti[0]=v0; - ti[1]=v1; - dp=(char *)d; - l2c(v0,dp); - l2c(v1,dp); - while (l--) - { - if (n == 0) - { - des_encrypt((unsigned long *)ti,schedule,DES_ENCRYPT); - dp=(char *)d; - t=ti[0]; l2c(t,dp); - t=ti[1]; l2c(t,dp); - save++; - } - *(out++)=*(in++)^d[n]; - n=(n+1)&0x07; - } - if (save) - { - v0=ti[0]; - v1=ti[1]; - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - } - t=v0=v1=ti[0]=ti[1]=0; - *num=n; - } - diff --git a/secure/lib/libdes/ofb_enc.c b/secure/lib/libdes/ofb_enc.c deleted file mode 100644 index e95caddd85c67..0000000000000 --- a/secure/lib/libdes/ofb_enc.c +++ /dev/null @@ -1,111 +0,0 @@ -/* lib/des/ofb_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -/* The input and output are loaded in multiples of 8 bits. - * What this means is that if you hame numbits=12 and length=2 - * the first 12 bits will be retrieved from the first byte and half - * the second. The second 12 bits will come from the 3rd and half the 4th - * byte. - */ -void des_ofb_encrypt(in, out, numbits, length, schedule, ivec) -unsigned char *in; -unsigned char *out; -int numbits; -long length; -des_key_schedule schedule; -des_cblock (*ivec); - { - register unsigned long d0,d1,v0,v1,n=(numbits+7)/8; - register unsigned long mask0,mask1; - register long l=length; - register int num=numbits; - unsigned long ti[2]; - unsigned char *iv; - - if (num > 64) return; - if (num > 32) - { - mask0=0xffffffffL; - if (num >= 64) - mask1=mask0; - else - mask1=(1L<<(num-32))-1; - } - else - { - if (num == 32) - mask0=0xffffffffL; - else - mask0=(1L< 0) - { - des_encrypt((unsigned long *)ti,schedule,DES_ENCRYPT); - c2ln(in,d0,d1,n); - in+=n; - d0=(d0^ti[0])&mask0; - d1=(d1^ti[1])&mask1; - l2cn(d0,d1,out,n); - out+=n; - } - v0=ti[0]; - v1=ti[1]; - iv=(unsigned char *)ivec; - l2c(v0,iv); - l2c(v1,iv); - v0=v1=d0=d1=ti[0]=ti[1]=0; - } - diff --git a/secure/lib/libdes/pcbc_enc.c b/secure/lib/libdes/pcbc_enc.c deleted file mode 100644 index b17a6d7020807..0000000000000 --- a/secure/lib/libdes/pcbc_enc.c +++ /dev/null @@ -1,115 +0,0 @@ -/* lib/des/pcbc_enc.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -void des_pcbc_encrypt(input, output, length, schedule, ivec, encrypt) -des_cblock (*input); -des_cblock (*output); -long length; -des_key_schedule schedule; -des_cblock (*ivec); -int encrypt; - { - register unsigned long sin0,sin1,xor0,xor1,tout0,tout1; - unsigned long tin[2]; - unsigned char *in,*out,*iv; - - in=(unsigned char *)input; - out=(unsigned char *)output; - iv=(unsigned char *)ivec; - - if (encrypt) - { - c2l(iv,xor0); - c2l(iv,xor1); - for (; length>0; length-=8) - { - if (length >= 8) - { - c2l(in,sin0); - c2l(in,sin1); - } - else - c2ln(in,sin0,sin1,length); - tin[0]=sin0^xor0; - tin[1]=sin1^xor1; - des_encrypt((unsigned long *)tin,schedule,DES_ENCRYPT); - tout0=tin[0]; - tout1=tin[1]; - xor0=sin0^tout0; - xor1=sin1^tout1; - l2c(tout0,out); - l2c(tout1,out); - } - } - else - { - c2l(iv,xor0); c2l(iv,xor1); - for (; length>0; length-=8) - { - c2l(in,sin0); - c2l(in,sin1); - tin[0]=sin0; - tin[1]=sin1; - des_encrypt((unsigned long *)tin,schedule,DES_DECRYPT); - tout0=tin[0]^xor0; - tout1=tin[1]^xor1; - if (length >= 8) - { - l2c(tout0,out); - l2c(tout1,out); - } - else - l2cn(tout0,tout1,out,length); - xor0=tout0^sin0; - xor1=tout1^sin1; - } - } - tin[0]=tin[1]=0; - sin0=sin1=xor0=xor1=tout0=tout1=0; - } diff --git a/secure/lib/libdes/podd.h b/secure/lib/libdes/podd.h deleted file mode 100644 index 96846d24ca479..0000000000000 --- a/secure/lib/libdes/podd.h +++ /dev/null @@ -1,64 +0,0 @@ -/* lib/des/podd.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -static const unsigned char odd_parity[256]={ - 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, - 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, - 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47, - 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62, - 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79, - 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94, - 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110, -112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127, -128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143, -145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158, -161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174, -176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191, -193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206, -208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223, -224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239, -241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254}; diff --git a/secure/lib/libdes/qud_cksm.c b/secure/lib/libdes/qud_cksm.c deleted file mode 100644 index e2c6ffd2ef854..0000000000000 --- a/secure/lib/libdes/qud_cksm.c +++ /dev/null @@ -1,133 +0,0 @@ -/* lib/des/qud_cksm.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* From "Message Authentication" R.R. Jueneman, S.M. Matyas, C.H. Meyer - * IEEE Communications Magazine Sept 1985 Vol. 23 No. 9 p 29-40 - * This module in only based on the code in this paper and is - * almost definitely not the same as the MIT implementation. - */ -#include "des_locl.h" - -/* bug fix for dos - 7/6/91 - Larry hughes@logos.ucs.indiana.edu */ -#define B0(a) (((unsigned long)(a))) -#define B1(a) (((unsigned long)(a))<<8) -#define B2(a) (((unsigned long)(a))<<16) -#define B3(a) (((unsigned long)(a))<<24) - -/* used to scramble things a bit */ -/* Got the value MIT uses via brute force :-) 2/10/90 eay */ -#define NOISE ((unsigned long)83653421L) - -unsigned long des_quad_cksum(input, output, length, out_count, seed) -des_cblock (*input); -des_cblock (*output); -long length; -int out_count; -des_cblock (*seed); - { - unsigned long z0,z1,t0,t1; - int i; - long l=0; - unsigned char *cp; - unsigned char *lp; - - if (out_count < 1) out_count=1; - lp=(unsigned char *)output; - - z0=B0((*seed)[0])|B1((*seed)[1])|B2((*seed)[2])|B3((*seed)[3]); - z1=B0((*seed)[4])|B1((*seed)[5])|B2((*seed)[6])|B3((*seed)[7]); - - for (i=0; ((i<4)&&(i 0) - { - if (l > 1) - { - t0= (unsigned long)(*(cp++)); - t0|=(unsigned long)B1(*(cp++)); - l--; - } - else - t0= (unsigned long)(*(cp++)); - l--; - /* add */ - t0+=z0; - t0&=0xffffffffL; - t1=z1; - /* square, well sort of square */ - z0=((((t0*t0)&0xffffffffL)+((t1*t1)&0xffffffffL)) - &0xffffffffL)%0x7fffffffL; - z1=((t0*((t1+NOISE)&0xffffffffL))&0xffffffffL)%0x7fffffffL; - } - if (lp != NULL) - { - /* I believe I finally have things worked out. - * The MIT library assumes that the checksum - * is one huge number and it is returned in a - * host dependant byte order. - */ - static unsigned long ltmp=1; - static unsigned char *c=(unsigned char *)<mp; - - if (c[0]) - { - l2c(z0,lp); - l2c(z1,lp); - } - else - { - lp=output[out_count-i-1]; - l2n(z1,lp); - l2n(z0,lp); - } - } - } - return(z0); - } - diff --git a/secure/lib/libdes/rand_key.c b/secure/lib/libdes/rand_key.c deleted file mode 100644 index c4c4caaf95caa..0000000000000 --- a/secure/lib/libdes/rand_key.c +++ /dev/null @@ -1,107 +0,0 @@ -/* lib/des/rand_key.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" -#include - -static int seed=0; -static des_cblock init; - -void des_random_seed(key) -des_cblock key; - { - memcpy(init,key,sizeof(des_cblock)); - seed=1; - } - -void des_random_key(ret) -unsigned char *ret; - { - des_key_schedule ks; - static unsigned long c=0; - static unsigned short pid=0; - static des_cblock data={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; - des_cblock key; - unsigned char *p; - unsigned long t; - int i; - -#ifdef MSDOS - pid=1; -#else - if (!pid) pid=getpid(); -#endif - p=key; - if (seed) - { - for (i=0; i<8; i++) - { - data[i] ^= init[i]; - init[i]=0; - } - seed=0; - } - t=(unsigned long)time(NULL); - l2c(t,p); - t=(unsigned long)((pid)|((c++)<<16)); - l2c(t,p); - - des_set_odd_parity((des_cblock *)data); - des_set_key((des_cblock *)data,ks); - des_cbc_cksum((des_cblock *)key,(des_cblock *)key, - (long)sizeof(key),ks,(des_cblock *)data); - - des_set_odd_parity((des_cblock *)key); - des_set_key((des_cblock *)key,ks); - des_cbc_cksum((des_cblock *)key,(des_cblock *)data, - (long)sizeof(key),ks,(des_cblock *)key); - - memcpy(ret,data,sizeof(key)); - memset(key,0,sizeof(key)); - memset(ks,0,sizeof(ks)); - t=0; - } diff --git a/secure/lib/libdes/read_pwd.c b/secure/lib/libdes/read_pwd.c deleted file mode 100644 index bebad0c1da978..0000000000000 --- a/secure/lib/libdes/read_pwd.c +++ /dev/null @@ -1,380 +0,0 @@ -/* lib/des/read_pwd.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* 06-Apr-92 Luke Brennan Support for VMS */ -#include "des_locl.h" -#include -#include -#include - -/* There are 5 types of terminal interface supported, - * TERMIO, TERMIOS, VMS, MSDOS and SGTTY - */ - -#if defined(sgi) || defined(__sgi) -#define TERMIOS -#undef TERMIO -#undef SGTTY -#endif - -#ifdef _LIBC -#define TERMIO -#endif - -#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) -#define SGTTY -#endif - -#ifdef TERMIOS -#include -#define TTY_STRUCT struct termios -#define TTY_FLAGS c_lflag -#define TTY_get(tty,data) tcgetattr(tty,data) -#define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data) -#endif - -#ifdef TERMIO -#include -#define TTY_STRUCT struct termio -#define TTY_FLAGS c_lflag -#define TTY_get(tty,data) ioctl(tty,TCGETA,data) -#define TTY_set(tty,data) ioctl(tty,TCSETA,data) -#endif - -#ifdef SGTTY -#include -#define TTY_STRUCT struct sgttyb -#define TTY_FLAGS sg_flags -#define TTY_get(tty,data) ioctl(tty,TIOCGETP,data) -#define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) -#endif - -#ifndef _LIBC -#include -#endif - -#ifdef MSDOS -#include -#define fgets(a,b,c) noecho_fgets(a,b,c) -#endif - -#ifdef VMS -#include -#include -#include -#include -struct IOSB { - short iosb$w_value; - short iosb$w_count; - long iosb$l_info; - }; -#endif - -#ifndef NX509_SIG -#define NX509_SIG 32 -#endif - -#ifndef NOPROTO -static void read_till_nl(FILE *); -static int read_pw(char *buf, char *buff, int size, char *prompt, int verify); -static void recsig(int); -static void pushsig(void); -static void popsig(void); -#ifdef MSDOS -static int noecho_fgets(char *buf, int size, FILE *tty); -#endif -#else -static void read_till_nl(); -static int read_pw(); -static void recsig(); -static void pushsig(); -static void popsig(); -#ifdef MSDOS -static int noecho_fgets(); -#endif -#endif - -static void (*savsig[NX509_SIG])(); -static jmp_buf save; - -int des_read_password(key, prompt, verify) -des_cblock (*key); -char *prompt; -int verify; - { - int ok; - char buf[BUFSIZ],buff[BUFSIZ]; - - if ((ok=read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0) - des_string_to_key(buf,key); - memset(buf,0,BUFSIZ); - memset(buff,0,BUFSIZ); - return(ok); - } - -int des_read_2passwords(key1, key2, prompt, verify) -des_cblock (*key1); -des_cblock (*key2); -char *prompt; -int verify; - { - int ok; - char buf[BUFSIZ],buff[BUFSIZ]; - - if ((ok=read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0) - des_string_to_2keys(buf,key1,key2); - memset(buf,0,BUFSIZ); - memset(buff,0,BUFSIZ); - return(ok); - } - -int des_read_pw_string(buf, length, prompt, verify) -char *buf; -int length; -char *prompt; -int verify; - { - char buff[BUFSIZ]; - int ret; - - ret=read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify); - memset(buff,0,BUFSIZ); - return(ret); - } - -static void read_till_nl(in) -FILE *in; - { -#define SIZE 4 - char buf[SIZE+1]; - - do { - fgets(buf,SIZE,in); - } while (strchr(buf,'\n') == NULL); - } - -/* return 0 if ok, 1 (or -1) otherwise */ -static int read_pw(buf, buff, size, prompt, verify) -char *buf; -char *buff; -int size; -char *prompt; -int verify; - { -#ifdef VMS - struct IOSB iosb; - $DESCRIPTOR(terminal,"TT"); - long tty_orig[3], tty_new[3]; - long status; - unsigned short channel = 0; -#else -#ifndef MSDOS - TTY_STRUCT tty_orig,tty_new; -#endif -#endif - int number=5; - int ok=0; - int ps=0; - FILE *tty=NULL; - char *p; - -#ifndef MSDOS - if ((tty=fopen("/dev/tty","r")) == NULL) - tty=stdin; -#else /* MSDOS */ - if ((tty=fopen("con","r")) == NULL) - tty=stdin; -#endif /* MSDOS */ - -#if defined(TTY_get) && !defined(VMS) - if (TTY_get(fileno(tty),&tty_orig) == -1) - return(-1); - memcpy(&(tty_new),&(tty_orig),sizeof(tty_orig)); -#endif -#ifdef VMS - status = SYS$ASSIGN(&terminal,&channel,0,0); - if (status != SS$_NORMAL) - return(-1); - status=SYS$QIOW(0,channel,IO$_SENSEMODE,&iosb,0,0,tty_orig,12,0,0,0,0); - if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) - return(-1); -#endif - - if (setjmp(save)) - { - ok=0; - goto error; - } - pushsig(); - ps=1; - -#ifdef TTY_FLAGS - tty_new.TTY_FLAGS &= ~ECHO; -#endif - -#if defined(TTY_set) && !defined(VMS) - if (TTY_set(fileno(tty),&tty_new) == -1) - return(-1); -#endif -#ifdef VMS - tty_new[0] = tty_orig[0]; - tty_new[1] = tty_orig[1] | TT$M_NOECHO; - tty_new[2] = tty_orig[2]; - status = SYS$QIOW(0,channel,IO$_SETMODE,&iosb,0,0,tty_new,12,0,0,0,0); - if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) - return(-1); -#endif - ps=2; - - while ((!ok) && (number--)) - { - fputs(prompt,stderr); - fflush(stderr); - - buf[0]='\0'; - fgets(buf,size,tty); - if (feof(tty)) goto error; - if ((p=(char *)strchr(buf,'\n')) != NULL) - *p='\0'; - else read_till_nl(tty); - if (verify) - { - fprintf(stderr,"\nVerifying password %s",prompt); - fflush(stderr); - buff[0]='\0'; - fgets(buff,size,tty); - if (feof(tty)) goto error; - if ((p=(char *)strchr(buff,'\n')) != NULL) - *p='\0'; - else read_till_nl(tty); - - if (strcmp(buf,buff) != 0) - { - fprintf(stderr,"\nVerify failure"); - fflush(stderr); - break; - /* continue; */ - } - } - ok=1; - } - -error: - fprintf(stderr,"\n"); - /* What can we do if there is an error? */ -#if defined(TTY_set) && !defined(VMS) - if (ps >= 2) TTY_set(fileno(tty),&tty_orig); -#endif -#ifdef VMS - if (ps >= 2) - status = SYS$QIOW(0,channel,IO$_SETMODE,&iosb,0,0 - ,tty_orig,12,0,0,0,0); -#endif - - if (ps >= 1) popsig(); - if (stdin != tty) fclose(tty); -#ifdef VMS - status = SYS$DASSGN(channel); -#endif - return(!ok); - } - -static void pushsig() - { - int i; - - for (i=1; ides_key,ks); - enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; - - if (desp->des_mode == CBC) - des_ecb_encrypt((des_cblock *)desp->UDES.UDES_buf, - (des_cblock *)desp->UDES.UDES_buf,ks,enc); - else - { - des_ncbc_encrypt((des_cblock *)desp->UDES.UDES_buf, - (des_cblock *)desp->UDES.UDES_buf, - (long)len,ks, - (des_cblock *)desp->des_ivec,enc); -#ifdef undef - /* len will always be %8 if called from common_crypt - * in secure_rpc. - * Libdes's cbc encrypt does not copy back the iv, - * so we have to do it here. */ - /* It does now :-) eay 20/09/95 */ - - a=(char *)&(desp->UDES.UDES_buf[len-8]); - b=(char *)&(desp->des_ivec[0]); - - *(a++)= *(b++); *(a++)= *(b++); - *(a++)= *(b++); *(a++)= *(b++); - *(a++)= *(b++); *(a++)= *(b++); - *(a++)= *(b++); *(a++)= *(b++); -#endif - } - return(1); - } - diff --git a/secure/lib/libdes/rpw.c b/secure/lib/libdes/rpw.c deleted file mode 100644 index 2213a56a93ce7..0000000000000 --- a/secure/lib/libdes/rpw.c +++ /dev/null @@ -1,90 +0,0 @@ -/* lib/des/rpw.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include "des.h" - -int main(argc,argv) -int argc; -char *argv[]; - { - des_cblock k,k1; - int i; - - printf("read passwd\n"); - if ((i=des_read_password((C_Block *)k,"Enter password:",0)) == 0) - { - printf("password = "); - for (i=0; i<8; i++) - printf("%02x ",k[i]); - } - else - printf("error %d\n",i); - printf("\n"); - printf("read 2passwds and verify\n"); - if ((i=des_read_2passwords((C_Block *)k,(C_Block *)k1, - "Enter verified password:",1)) == 0) - { - printf("password1 = "); - for (i=0; i<8; i++) - printf("%02x ",k[i]); - printf("\n"); - printf("password2 = "); - for (i=0; i<8; i++) - printf("%02x ",k1[i]); - printf("\n"); - exit(1); - } - else - { - printf("error %d\n",i); - exit(0); - } -#ifdef LINT - return(0); -#endif - } diff --git a/secure/lib/libdes/set_key.c b/secure/lib/libdes/set_key.c deleted file mode 100644 index 209a07d35726c..0000000000000 --- a/secure/lib/libdes/set_key.c +++ /dev/null @@ -1,234 +0,0 @@ -/* lib/des/set_key.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* set_key.c v 1.4 eay 24/9/91 - * 1.4 Speed up by 400% :-) - * 1.3 added register declarations. - * 1.2 unrolled make_key_sched a bit more - * 1.1 added norm_expand_bits - * 1.0 First working version - */ -#include "des_locl.h" -#include "podd.h" -#include "sk.h" - -#ifndef NOPROTO -static int check_parity(des_cblock (*key)); -#else -static int check_parity(); -#endif - -int des_check_key=0; - -void des_set_odd_parity(key) -des_cblock (*key); - { - int i; - - for (i=0; i>(n))^(b))&(m)),\ - * (b)^=(t),\ - * (a)=((a)^((t)<<(n)))) - */ - -#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ - (a)=(a)^(t)^(t>>(16-(n)))) - -static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; - -/* return 0 if key parity is odd (correct), - * return -1 if key parity error, - * return -2 if illegal weak key. - */ -int des_set_key(key, schedule) -des_cblock (*key); -des_key_schedule schedule; - { - register unsigned long c,d,t,s; - register unsigned char *in; - register unsigned long *k; - register int i; - - if (des_check_key) - { - if (!check_parity(key)) - return(-1); - - if (des_is_weak_key(key)) - return(-2); - } - - k=(unsigned long *)schedule; - in=(unsigned char *)key; - - c2l(in,c); - c2l(in,d); - - /* do PC1 in 60 simple operations */ -/* PERM_OP(d,c,t,4,0x0f0f0f0fL); - HPERM_OP(c,t,-2, 0xcccc0000L); - HPERM_OP(c,t,-1, 0xaaaa0000L); - HPERM_OP(c,t, 8, 0x00ff0000L); - HPERM_OP(c,t,-1, 0xaaaa0000L); - HPERM_OP(d,t,-8, 0xff000000L); - HPERM_OP(d,t, 8, 0x00ff0000L); - HPERM_OP(d,t, 2, 0x33330000L); - d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L); - d=(d>>8)|((c&0xf0000000L)>>4); - c&=0x0fffffffL; */ - - /* I now do it in 47 simple operations :-) - * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) - * for the inspiration. :-) */ - PERM_OP (d,c,t,4,0x0f0f0f0fL); - HPERM_OP(c,t,-2,0xcccc0000L); - HPERM_OP(d,t,-2,0xcccc0000L); - PERM_OP (d,c,t,1,0x55555555L); - PERM_OP (c,d,t,8,0x00ff00ffL); - PERM_OP (d,c,t,1,0x55555555L); - d= (((d&0x000000ffL)<<16L)| (d&0x0000ff00L) | - ((d&0x00ff0000L)>>16L)|((c&0xf0000000L)>>4L)); - c&=0x0fffffffL; - - for (i=0; i>2L)|(c<<26L)); d=((d>>2L)|(d<<26L)); } - else - { c=((c>>1L)|(c<<27L)); d=((d>>1L)|(d<<27L)); } - c&=0x0fffffffL; - d&=0x0fffffffL; - /* could be a few less shifts but I am to lazy at this - * point in time to investigate */ - s= des_skb[0][ (c )&0x3f ]| - des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]| - des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]| - des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) | - ((c>>22L)&0x38)]; - t= des_skb[4][ (d )&0x3f ]| - des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| - des_skb[6][ (d>>15L)&0x3f ]| - des_skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)]; - - /* table contained 0213 4657 */ - *(k++)=((t<<16L)|(s&0x0000ffffL))&0xffffffffL; - s= ((s>>16L)|(t&0xffff0000L)); - - s=(s<<4L)|(s>>28L); - *(k++)=s&0xffffffffL; - } - return(0); - } - -int des_key_sched(key, schedule) -des_cblock (*key); -des_key_schedule schedule; - { - return(des_set_key(key,schedule)); - } diff --git a/secure/lib/libdes/shifts.pl b/secure/lib/libdes/shifts.pl deleted file mode 100755 index 3c4039eb9c1ff..0000000000000 --- a/secure/lib/libdes/shifts.pl +++ /dev/null @@ -1,160 +0,0 @@ -sub lab_shift - { - local(*a,$n)=@_; - local(@r,$i,$j,$k,$d,@z); - - @r=&shift(*a,$n); - foreach $i (0 .. 31) - { - @z=split(/\^/,$r[$i]); - for ($j=0; $j <= $#z; $j++) - { - ($d)=($z[$j] =~ /^(..)/); - ($k)=($z[$j] =~ /\[(.*)\]$/); - $k.=",$n" if ($k ne ""); - $k="$n" if ($k eq ""); - $d="$d[$k]"; - $z[$j]=$d; - } - $r[$i]=join('^',@z); - } - return(@r); - } - -sub shift - { - local(*a,$n)=@_; - local(@f); - - if ($n > 0) - { - @f=&shiftl(*a,$n); - } - else - { - @f=&shiftr(*a,-$n); - } - return(@f); - } - -sub shiftr - { - local(*a,$n)=@_; - local(@r,$i); - - $#r=31; - foreach $i (0 .. 31) - { - if (($i+$n) > 31) - { - $r[$i]="--"; - } - else - { - $r[$i]=$a[$i+$n]; - } - } - return(@r); - } - -sub shiftl - { - local(*a,$n)=@_; - local(@r,$i); - - $#r=31; - foreach $i (0 .. 31) - { - if ($i < $n) - { - $r[$i]="--"; - } - else - { - $r[$i]=$a[$i-$n]; - } - } - return(@r); - } - -sub printit - { - local(@a)=@_; - local($i); - - foreach $i (0 .. 31) - { - printf "%2s ",$a[$i]; - print "\n" if (($i%8) == 7); - } - print "\n"; - } - -sub xor - { - local(*a,*b)=@_; - local(@r,$i); - - $#r=31; - foreach $i (0 .. 31) - { - $r[$i]=&compress($a[$i].'^'.$b[$i]); -# $r[$i]=$a[$i]."^".$b[$i]; - } - return(@r); - } - -sub and - { - local(*a,$m)=@_; - local(@r,$i); - - $#r=31; - foreach $i (0 .. 31) - { - $r[$i]=(($m & (1<<$i))?($a[$i]):('--')); - } - return(@r); - } - -sub or - { - local(*a,*b)=@_; - local(@r,$i); - - $#r=31; - foreach $i (0 .. 31) - { - $r[$i]='--' if (($a[$i] eq '--') && ($b[$i] eq '--')); - $r[$i]=$a[$i] if (($a[$i] ne '--') && ($b[$i] eq '--')); - $r[$i]=$b[$i] if (($a[$i] eq '--') && ($b[$i] ne '--')); - $r[$i]='++' if (($a[$i] ne '--') && ($b[$i] ne '--')); - } - return(@r); - } - -sub compress - { - local($s)=@_; - local($_,$i,@a,%a,$r); - - $s =~ s/\^\^/\^/g; - $s =~ s/^\^//; - $s =~ s/\^$//; - @a=split(/\^/,$s); - - while ($#a >= 0) - { - $_=shift(@a); - next unless /\d/; - $a{$_}++; - } - foreach $i (sort keys %a) - { - next if ($a{$i}%2 == 0); - $r.="$i^"; - } - chop($r); - return($r); - } -1; diff --git a/secure/lib/libdes/sk.h b/secure/lib/libdes/sk.h deleted file mode 100644 index e5997d93af6fe..0000000000000 --- a/secure/lib/libdes/sk.h +++ /dev/null @@ -1,193 +0,0 @@ -/* lib/des/sk.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -static const unsigned long des_skb[8][64]={ -{ -/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ -0x00000000L,0x00000010L,0x20000000L,0x20000010L, -0x00010000L,0x00010010L,0x20010000L,0x20010010L, -0x00000800L,0x00000810L,0x20000800L,0x20000810L, -0x00010800L,0x00010810L,0x20010800L,0x20010810L, -0x00000020L,0x00000030L,0x20000020L,0x20000030L, -0x00010020L,0x00010030L,0x20010020L,0x20010030L, -0x00000820L,0x00000830L,0x20000820L,0x20000830L, -0x00010820L,0x00010830L,0x20010820L,0x20010830L, -0x00080000L,0x00080010L,0x20080000L,0x20080010L, -0x00090000L,0x00090010L,0x20090000L,0x20090010L, -0x00080800L,0x00080810L,0x20080800L,0x20080810L, -0x00090800L,0x00090810L,0x20090800L,0x20090810L, -0x00080020L,0x00080030L,0x20080020L,0x20080030L, -0x00090020L,0x00090030L,0x20090020L,0x20090030L, -0x00080820L,0x00080830L,0x20080820L,0x20080830L, -0x00090820L,0x00090830L,0x20090820L,0x20090830L, -},{ -/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ -0x00000000L,0x02000000L,0x00002000L,0x02002000L, -0x00200000L,0x02200000L,0x00202000L,0x02202000L, -0x00000004L,0x02000004L,0x00002004L,0x02002004L, -0x00200004L,0x02200004L,0x00202004L,0x02202004L, -0x00000400L,0x02000400L,0x00002400L,0x02002400L, -0x00200400L,0x02200400L,0x00202400L,0x02202400L, -0x00000404L,0x02000404L,0x00002404L,0x02002404L, -0x00200404L,0x02200404L,0x00202404L,0x02202404L, -0x10000000L,0x12000000L,0x10002000L,0x12002000L, -0x10200000L,0x12200000L,0x10202000L,0x12202000L, -0x10000004L,0x12000004L,0x10002004L,0x12002004L, -0x10200004L,0x12200004L,0x10202004L,0x12202004L, -0x10000400L,0x12000400L,0x10002400L,0x12002400L, -0x10200400L,0x12200400L,0x10202400L,0x12202400L, -0x10000404L,0x12000404L,0x10002404L,0x12002404L, -0x10200404L,0x12200404L,0x10202404L,0x12202404L, -},{ -/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ -0x00000000L,0x00000001L,0x00040000L,0x00040001L, -0x01000000L,0x01000001L,0x01040000L,0x01040001L, -0x00000002L,0x00000003L,0x00040002L,0x00040003L, -0x01000002L,0x01000003L,0x01040002L,0x01040003L, -0x00000200L,0x00000201L,0x00040200L,0x00040201L, -0x01000200L,0x01000201L,0x01040200L,0x01040201L, -0x00000202L,0x00000203L,0x00040202L,0x00040203L, -0x01000202L,0x01000203L,0x01040202L,0x01040203L, -0x08000000L,0x08000001L,0x08040000L,0x08040001L, -0x09000000L,0x09000001L,0x09040000L,0x09040001L, -0x08000002L,0x08000003L,0x08040002L,0x08040003L, -0x09000002L,0x09000003L,0x09040002L,0x09040003L, -0x08000200L,0x08000201L,0x08040200L,0x08040201L, -0x09000200L,0x09000201L,0x09040200L,0x09040201L, -0x08000202L,0x08000203L,0x08040202L,0x08040203L, -0x09000202L,0x09000203L,0x09040202L,0x09040203L, -},{ -/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ -0x00000000L,0x00100000L,0x00000100L,0x00100100L, -0x00000008L,0x00100008L,0x00000108L,0x00100108L, -0x00001000L,0x00101000L,0x00001100L,0x00101100L, -0x00001008L,0x00101008L,0x00001108L,0x00101108L, -0x04000000L,0x04100000L,0x04000100L,0x04100100L, -0x04000008L,0x04100008L,0x04000108L,0x04100108L, -0x04001000L,0x04101000L,0x04001100L,0x04101100L, -0x04001008L,0x04101008L,0x04001108L,0x04101108L, -0x00020000L,0x00120000L,0x00020100L,0x00120100L, -0x00020008L,0x00120008L,0x00020108L,0x00120108L, -0x00021000L,0x00121000L,0x00021100L,0x00121100L, -0x00021008L,0x00121008L,0x00021108L,0x00121108L, -0x04020000L,0x04120000L,0x04020100L,0x04120100L, -0x04020008L,0x04120008L,0x04020108L,0x04120108L, -0x04021000L,0x04121000L,0x04021100L,0x04121100L, -0x04021008L,0x04121008L,0x04021108L,0x04121108L, -},{ -/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ -0x00000000L,0x10000000L,0x00010000L,0x10010000L, -0x00000004L,0x10000004L,0x00010004L,0x10010004L, -0x20000000L,0x30000000L,0x20010000L,0x30010000L, -0x20000004L,0x30000004L,0x20010004L,0x30010004L, -0x00100000L,0x10100000L,0x00110000L,0x10110000L, -0x00100004L,0x10100004L,0x00110004L,0x10110004L, -0x20100000L,0x30100000L,0x20110000L,0x30110000L, -0x20100004L,0x30100004L,0x20110004L,0x30110004L, -0x00001000L,0x10001000L,0x00011000L,0x10011000L, -0x00001004L,0x10001004L,0x00011004L,0x10011004L, -0x20001000L,0x30001000L,0x20011000L,0x30011000L, -0x20001004L,0x30001004L,0x20011004L,0x30011004L, -0x00101000L,0x10101000L,0x00111000L,0x10111000L, -0x00101004L,0x10101004L,0x00111004L,0x10111004L, -0x20101000L,0x30101000L,0x20111000L,0x30111000L, -0x20101004L,0x30101004L,0x20111004L,0x30111004L, -},{ -/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ -0x00000000L,0x08000000L,0x00000008L,0x08000008L, -0x00000400L,0x08000400L,0x00000408L,0x08000408L, -0x00020000L,0x08020000L,0x00020008L,0x08020008L, -0x00020400L,0x08020400L,0x00020408L,0x08020408L, -0x00000001L,0x08000001L,0x00000009L,0x08000009L, -0x00000401L,0x08000401L,0x00000409L,0x08000409L, -0x00020001L,0x08020001L,0x00020009L,0x08020009L, -0x00020401L,0x08020401L,0x00020409L,0x08020409L, -0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, -0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, -0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, -0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, -0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, -0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, -0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, -0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, -},{ -/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ -0x00000000L,0x00000100L,0x00080000L,0x00080100L, -0x01000000L,0x01000100L,0x01080000L,0x01080100L, -0x00000010L,0x00000110L,0x00080010L,0x00080110L, -0x01000010L,0x01000110L,0x01080010L,0x01080110L, -0x00200000L,0x00200100L,0x00280000L,0x00280100L, -0x01200000L,0x01200100L,0x01280000L,0x01280100L, -0x00200010L,0x00200110L,0x00280010L,0x00280110L, -0x01200010L,0x01200110L,0x01280010L,0x01280110L, -0x00000200L,0x00000300L,0x00080200L,0x00080300L, -0x01000200L,0x01000300L,0x01080200L,0x01080300L, -0x00000210L,0x00000310L,0x00080210L,0x00080310L, -0x01000210L,0x01000310L,0x01080210L,0x01080310L, -0x00200200L,0x00200300L,0x00280200L,0x00280300L, -0x01200200L,0x01200300L,0x01280200L,0x01280300L, -0x00200210L,0x00200310L,0x00280210L,0x00280310L, -0x01200210L,0x01200310L,0x01280210L,0x01280310L, -},{ -/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ -0x00000000L,0x04000000L,0x00040000L,0x04040000L, -0x00000002L,0x04000002L,0x00040002L,0x04040002L, -0x00002000L,0x04002000L,0x00042000L,0x04042000L, -0x00002002L,0x04002002L,0x00042002L,0x04042002L, -0x00000020L,0x04000020L,0x00040020L,0x04040020L, -0x00000022L,0x04000022L,0x00040022L,0x04040022L, -0x00002020L,0x04002020L,0x00042020L,0x04042020L, -0x00002022L,0x04002022L,0x00042022L,0x04042022L, -0x00000800L,0x04000800L,0x00040800L,0x04040800L, -0x00000802L,0x04000802L,0x00040802L,0x04040802L, -0x00002800L,0x04002800L,0x00042800L,0x04042800L, -0x00002802L,0x04002802L,0x00042802L,0x04042802L, -0x00000820L,0x04000820L,0x00040820L,0x04040820L, -0x00000822L,0x04000822L,0x00040822L,0x04040822L, -0x00002820L,0x04002820L,0x00042820L,0x04042820L, -0x00002822L,0x04002822L,0x00042822L,0x04042822L, -}}; diff --git a/secure/lib/libdes/speed.c b/secure/lib/libdes/speed.c deleted file mode 100644 index ee517b18650d7..0000000000000 --- a/secure/lib/libdes/speed.c +++ /dev/null @@ -1,310 +0,0 @@ -/* lib/des/speed.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ -/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ - -#ifndef MSDOS -#define TIMES -#endif - -#include -#ifndef MSDOS -#include -#else -#include -#endif -#include -#ifndef VMS -#ifndef _IRIX -#include -#endif -#ifdef TIMES -#include -#include -#endif -#else /* VMS */ -#include -struct tms { - time_t tms_utime; - time_t tms_stime; - time_t tms_uchild; /* I dunno... */ - time_t tms_uchildsys; /* so these names are a guess :-) */ - } -#endif -#ifndef TIMES -#include -#endif - -#ifdef sun -#include -#include -#endif - -#include "des.h" - -/* The following if from times(3) man page. It may need to be changed */ -#ifndef HZ -#ifndef CLK_TCK -#ifndef VMS -#define HZ 100.0 -#else /* VMS */ -#define HZ 100.0 -#endif -#else /* CLK_TCK */ -#define HZ ((double)CLK_TCK) -#endif -#endif - -#define BUFSIZE ((long)1024*8) -long run=0; - -#ifndef NOPROTO -double Time_F(int s); -#else -double Time_F(); -#endif - -#ifdef SIGALRM -#if defined(__STDC__) || defined(sgi) -#define SIGRETTYPE void -#else -#define SIGRETTYPE int -#endif - -#ifndef NOPROTO -SIGRETTYPE sig_done(int sig); -#else -SIGRETTYPE sig_done(); -#endif - -SIGRETTYPE sig_done(sig) -int sig; - { - signal(SIGALRM,sig_done); - run=0; -#ifdef LINT - sig=sig; -#endif - } -#endif - -#define START 0 -#define STOP 1 - -double Time_F(s) -int s; - { - double ret; -#ifdef TIMES - static struct tms tstart,tend; - - if (s == START) - { - times(&tstart); - return(0); - } - else - { - times(&tend); - ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; - return((ret == 0.0)?1e-6:ret); - } -#else /* !times() */ - static struct timeb tstart,tend; - long i; - - if (s == START) - { - ftime(&tstart); - return(0); - } - else - { - ftime(&tend); - i=(long)tend.millitm-(long)tstart.millitm; - ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; - return((ret == 0.0)?1e-6:ret); - } -#endif - } - -int main(argc,argv) -int argc; -char **argv; - { - long count; - static unsigned char buf[BUFSIZE]; - static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; - static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; - static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; - des_key_schedule sch,sch2,sch3; - double a,b,c,d,e; -#ifndef SIGALARM - long ca,cb,cc,cd,ce; -#endif - -#ifndef TIMES - printf("To get the most acurate results, try to run this\n"); - printf("program when this computer is idle.\n"); -#endif - - des_set_key((C_Block *)key2,sch2); - des_set_key((C_Block *)key3,sch3); - -#ifndef SIGALRM - printf("First we calculate the aproximate speed ...\n"); - des_set_key((C_Block *)key,sch); - count=10; - do { - long i; - - count*=2; - Time_F(START); - for (i=count; i; i--) - des_ecb_encrypt((C_Block *)buf,(C_Block *)buf, - &(sch[0]),DES_ENCRYPT); - d=Time_F(STOP); - } while (d < 3.0); - ca=count; - cb=count*3; - cc=count*3*8/BUFSIZE+1; - cd=count*8/BUFSIZE+1; - ce=count/20+1; - printf("Doing set_key %ld times\n",ca); -#define COND(d) (count != (d)) -#define COUNT(d) (d) -#else -#define COND(c) (run) -#define COUNT(d) (count) - signal(SIGALRM,sig_done); - printf("Doing set_key for 10 seconds\n"); - alarm(10); -#endif - - Time_F(START); - for (count=0,run=1; COND(ca); count++) - des_set_key((C_Block *)key,sch); - d=Time_F(STOP); - printf("%ld set_key's in %.2f seconds\n",count,d); - a=((double)COUNT(ca))/d; - -#ifdef SIGALRM - printf("Doing des_ecb_encrypt's for 10 seconds\n"); - alarm(10); -#else - printf("Doing des_ecb_encrypt %ld times\n",cb); -#endif - Time_F(START); - for (count=0,run=1; COND(cb); count++) - des_ecb_encrypt((C_Block *)buf,(C_Block *)buf, - &(sch[0]),DES_ENCRYPT); - d=Time_F(STOP); - printf("%ld des_ecb_encrypt's in %.2f second\n",count,d); - b=((double)COUNT(cb)*8)/d; - -#ifdef SIGALRM - printf("Doing des_cbc_encrypt on %ld byte blocks for 10 seconds\n", - BUFSIZE); - alarm(10); -#else - printf("Doing des_cbc_encrypt %ld times on %ld byte blocks\n",cc, - BUFSIZE); -#endif - Time_F(START); - for (count=0,run=1; COND(cc); count++) - des_cbc_encrypt((C_Block *)buf,(C_Block *)buf,BUFSIZE,&(sch[0]), - (C_Block *)&(key[0]),DES_ENCRYPT); - d=Time_F(STOP); - printf("%ld des_cbc_encrypt's of %ld byte blocks in %.2f second\n", - count,BUFSIZE,d); - c=((double)COUNT(cc)*BUFSIZE)/d; - -#ifdef SIGALRM - printf("Doing des_ede_cbc_encrypt on %ld byte blocks for 10 seconds\n", - BUFSIZE); - alarm(10); -#else - printf("Doing des_ede_cbc_encrypt %ld times on %ld byte blocks\n",cd, - BUFSIZE); -#endif - Time_F(START); - for (count=0,run=1; COND(cd); count++) - des_ede3_cbc_encrypt((C_Block *)buf,(C_Block *)buf,BUFSIZE, - &(sch[0]), - &(sch2[0]), - &(sch3[0]), - (C_Block *)&(key[0]), - DES_ENCRYPT); - d=Time_F(STOP); - printf("%ld des_ede_cbc_encrypt's of %ld byte blocks in %.2f second\n", - count,BUFSIZE,d); - d=((double)COUNT(cd)*BUFSIZE)/d; - -#ifdef SIGALRM - printf("Doing crypt for 10 seconds\n"); - alarm(10); -#else - printf("Doing crypt %ld times\n",ce); -#endif - Time_F(START); - for (count=0,run=1; COND(ce); count++) - crypt("testing1","ef"); - e=Time_F(STOP); - printf("%ld crypts in %.2f second\n",count,e); - e=((double)COUNT(ce))/e; - - printf("set_key per sec = %12.2f (%5.1fuS)\n",a,1.0e6/a); - printf("DES ecb bytes per sec = %12.2f (%5.1fuS)\n",b,8.0e6/b); - printf("DES cbc bytes per sec = %12.2f (%5.1fuS)\n",c,8.0e6/c); - printf("DES ede cbc bytes per sec = %12.2f (%5.1fuS)\n",d,8.0e6/d); - printf("crypt per sec = %12.2f (%5.1fuS)\n",e,1.0e6/e); - exit(0); -#ifdef LINT - return(0); -#endif - } diff --git a/secure/lib/libdes/spr.h b/secure/lib/libdes/spr.h deleted file mode 100644 index d9b81ce919d27..0000000000000 --- a/secure/lib/libdes/spr.h +++ /dev/null @@ -1,193 +0,0 @@ -/* lib/des/spr.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -static const unsigned long des_SPtrans[8][64]={ -{ -/* nibble 0 */ -0x00820200L, 0x00020000L, 0x80800000L, 0x80820200L, -0x00800000L, 0x80020200L, 0x80020000L, 0x80800000L, -0x80020200L, 0x00820200L, 0x00820000L, 0x80000200L, -0x80800200L, 0x00800000L, 0x00000000L, 0x80020000L, -0x00020000L, 0x80000000L, 0x00800200L, 0x00020200L, -0x80820200L, 0x00820000L, 0x80000200L, 0x00800200L, -0x80000000L, 0x00000200L, 0x00020200L, 0x80820000L, -0x00000200L, 0x80800200L, 0x80820000L, 0x00000000L, -0x00000000L, 0x80820200L, 0x00800200L, 0x80020000L, -0x00820200L, 0x00020000L, 0x80000200L, 0x00800200L, -0x80820000L, 0x00000200L, 0x00020200L, 0x80800000L, -0x80020200L, 0x80000000L, 0x80800000L, 0x00820000L, -0x80820200L, 0x00020200L, 0x00820000L, 0x80800200L, -0x00800000L, 0x80000200L, 0x80020000L, 0x00000000L, -0x00020000L, 0x00800000L, 0x80800200L, 0x00820200L, -0x80000000L, 0x80820000L, 0x00000200L, 0x80020200L, -},{ -/* nibble 1 */ -0x10042004L, 0x00000000L, 0x00042000L, 0x10040000L, -0x10000004L, 0x00002004L, 0x10002000L, 0x00042000L, -0x00002000L, 0x10040004L, 0x00000004L, 0x10002000L, -0x00040004L, 0x10042000L, 0x10040000L, 0x00000004L, -0x00040000L, 0x10002004L, 0x10040004L, 0x00002000L, -0x00042004L, 0x10000000L, 0x00000000L, 0x00040004L, -0x10002004L, 0x00042004L, 0x10042000L, 0x10000004L, -0x10000000L, 0x00040000L, 0x00002004L, 0x10042004L, -0x00040004L, 0x10042000L, 0x10002000L, 0x00042004L, -0x10042004L, 0x00040004L, 0x10000004L, 0x00000000L, -0x10000000L, 0x00002004L, 0x00040000L, 0x10040004L, -0x00002000L, 0x10000000L, 0x00042004L, 0x10002004L, -0x10042000L, 0x00002000L, 0x00000000L, 0x10000004L, -0x00000004L, 0x10042004L, 0x00042000L, 0x10040000L, -0x10040004L, 0x00040000L, 0x00002004L, 0x10002000L, -0x10002004L, 0x00000004L, 0x10040000L, 0x00042000L, -},{ -/* nibble 2 */ -0x41000000L, 0x01010040L, 0x00000040L, 0x41000040L, -0x40010000L, 0x01000000L, 0x41000040L, 0x00010040L, -0x01000040L, 0x00010000L, 0x01010000L, 0x40000000L, -0x41010040L, 0x40000040L, 0x40000000L, 0x41010000L, -0x00000000L, 0x40010000L, 0x01010040L, 0x00000040L, -0x40000040L, 0x41010040L, 0x00010000L, 0x41000000L, -0x41010000L, 0x01000040L, 0x40010040L, 0x01010000L, -0x00010040L, 0x00000000L, 0x01000000L, 0x40010040L, -0x01010040L, 0x00000040L, 0x40000000L, 0x00010000L, -0x40000040L, 0x40010000L, 0x01010000L, 0x41000040L, -0x00000000L, 0x01010040L, 0x00010040L, 0x41010000L, -0x40010000L, 0x01000000L, 0x41010040L, 0x40000000L, -0x40010040L, 0x41000000L, 0x01000000L, 0x41010040L, -0x00010000L, 0x01000040L, 0x41000040L, 0x00010040L, -0x01000040L, 0x00000000L, 0x41010000L, 0x40000040L, -0x41000000L, 0x40010040L, 0x00000040L, 0x01010000L, -},{ -/* nibble 3 */ -0x00100402L, 0x04000400L, 0x00000002L, 0x04100402L, -0x00000000L, 0x04100000L, 0x04000402L, 0x00100002L, -0x04100400L, 0x04000002L, 0x04000000L, 0x00000402L, -0x04000002L, 0x00100402L, 0x00100000L, 0x04000000L, -0x04100002L, 0x00100400L, 0x00000400L, 0x00000002L, -0x00100400L, 0x04000402L, 0x04100000L, 0x00000400L, -0x00000402L, 0x00000000L, 0x00100002L, 0x04100400L, -0x04000400L, 0x04100002L, 0x04100402L, 0x00100000L, -0x04100002L, 0x00000402L, 0x00100000L, 0x04000002L, -0x00100400L, 0x04000400L, 0x00000002L, 0x04100000L, -0x04000402L, 0x00000000L, 0x00000400L, 0x00100002L, -0x00000000L, 0x04100002L, 0x04100400L, 0x00000400L, -0x04000000L, 0x04100402L, 0x00100402L, 0x00100000L, -0x04100402L, 0x00000002L, 0x04000400L, 0x00100402L, -0x00100002L, 0x00100400L, 0x04100000L, 0x04000402L, -0x00000402L, 0x04000000L, 0x04000002L, 0x04100400L, -},{ -/* nibble 4 */ -0x02000000L, 0x00004000L, 0x00000100L, 0x02004108L, -0x02004008L, 0x02000100L, 0x00004108L, 0x02004000L, -0x00004000L, 0x00000008L, 0x02000008L, 0x00004100L, -0x02000108L, 0x02004008L, 0x02004100L, 0x00000000L, -0x00004100L, 0x02000000L, 0x00004008L, 0x00000108L, -0x02000100L, 0x00004108L, 0x00000000L, 0x02000008L, -0x00000008L, 0x02000108L, 0x02004108L, 0x00004008L, -0x02004000L, 0x00000100L, 0x00000108L, 0x02004100L, -0x02004100L, 0x02000108L, 0x00004008L, 0x02004000L, -0x00004000L, 0x00000008L, 0x02000008L, 0x02000100L, -0x02000000L, 0x00004100L, 0x02004108L, 0x00000000L, -0x00004108L, 0x02000000L, 0x00000100L, 0x00004008L, -0x02000108L, 0x00000100L, 0x00000000L, 0x02004108L, -0x02004008L, 0x02004100L, 0x00000108L, 0x00004000L, -0x00004100L, 0x02004008L, 0x02000100L, 0x00000108L, -0x00000008L, 0x00004108L, 0x02004000L, 0x02000008L, -},{ -/* nibble 5 */ -0x20000010L, 0x00080010L, 0x00000000L, 0x20080800L, -0x00080010L, 0x00000800L, 0x20000810L, 0x00080000L, -0x00000810L, 0x20080810L, 0x00080800L, 0x20000000L, -0x20000800L, 0x20000010L, 0x20080000L, 0x00080810L, -0x00080000L, 0x20000810L, 0x20080010L, 0x00000000L, -0x00000800L, 0x00000010L, 0x20080800L, 0x20080010L, -0x20080810L, 0x20080000L, 0x20000000L, 0x00000810L, -0x00000010L, 0x00080800L, 0x00080810L, 0x20000800L, -0x00000810L, 0x20000000L, 0x20000800L, 0x00080810L, -0x20080800L, 0x00080010L, 0x00000000L, 0x20000800L, -0x20000000L, 0x00000800L, 0x20080010L, 0x00080000L, -0x00080010L, 0x20080810L, 0x00080800L, 0x00000010L, -0x20080810L, 0x00080800L, 0x00080000L, 0x20000810L, -0x20000010L, 0x20080000L, 0x00080810L, 0x00000000L, -0x00000800L, 0x20000010L, 0x20000810L, 0x20080800L, -0x20080000L, 0x00000810L, 0x00000010L, 0x20080010L, -},{ -/* nibble 6 */ -0x00001000L, 0x00000080L, 0x00400080L, 0x00400001L, -0x00401081L, 0x00001001L, 0x00001080L, 0x00000000L, -0x00400000L, 0x00400081L, 0x00000081L, 0x00401000L, -0x00000001L, 0x00401080L, 0x00401000L, 0x00000081L, -0x00400081L, 0x00001000L, 0x00001001L, 0x00401081L, -0x00000000L, 0x00400080L, 0x00400001L, 0x00001080L, -0x00401001L, 0x00001081L, 0x00401080L, 0x00000001L, -0x00001081L, 0x00401001L, 0x00000080L, 0x00400000L, -0x00001081L, 0x00401000L, 0x00401001L, 0x00000081L, -0x00001000L, 0x00000080L, 0x00400000L, 0x00401001L, -0x00400081L, 0x00001081L, 0x00001080L, 0x00000000L, -0x00000080L, 0x00400001L, 0x00000001L, 0x00400080L, -0x00000000L, 0x00400081L, 0x00400080L, 0x00001080L, -0x00000081L, 0x00001000L, 0x00401081L, 0x00400000L, -0x00401080L, 0x00000001L, 0x00001001L, 0x00401081L, -0x00400001L, 0x00401080L, 0x00401000L, 0x00001001L, -},{ -/* nibble 7 */ -0x08200020L, 0x08208000L, 0x00008020L, 0x00000000L, -0x08008000L, 0x00200020L, 0x08200000L, 0x08208020L, -0x00000020L, 0x08000000L, 0x00208000L, 0x00008020L, -0x00208020L, 0x08008020L, 0x08000020L, 0x08200000L, -0x00008000L, 0x00208020L, 0x00200020L, 0x08008000L, -0x08208020L, 0x08000020L, 0x00000000L, 0x00208000L, -0x08000000L, 0x00200000L, 0x08008020L, 0x08200020L, -0x00200000L, 0x00008000L, 0x08208000L, 0x00000020L, -0x00200000L, 0x00008000L, 0x08000020L, 0x08208020L, -0x00008020L, 0x08000000L, 0x00000000L, 0x00208000L, -0x08200020L, 0x08008020L, 0x08008000L, 0x00200020L, -0x08208000L, 0x00000020L, 0x00200020L, 0x08008000L, -0x08208020L, 0x00200000L, 0x08200000L, 0x08000020L, -0x00208000L, 0x00008020L, 0x08008020L, 0x08200000L, -0x00000020L, 0x08208000L, 0x00208020L, 0x00000000L, -0x08000000L, 0x08200020L, 0x00008000L, 0x00208020L, -}}; diff --git a/secure/lib/libdes/str2key.c b/secure/lib/libdes/str2key.c deleted file mode 100644 index 278ba0f921b0f..0000000000000 --- a/secure/lib/libdes/str2key.c +++ /dev/null @@ -1,160 +0,0 @@ -/* lib/des/str2key.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include "des_locl.h" - -extern int des_check_key; - -void des_string_to_key(str, key) -char *str; -des_cblock (*key); - { - des_key_schedule ks; - int i,length; - register unsigned char j; - - memset(key,0,8); - length=strlen(str); -#ifdef OLD_STR_TO_KEY - for (i=0; i>4)&0x0f); - j=((j<<2)&0xcc)|((j>>2)&0x33); - j=((j<<1)&0xaa)|((j>>1)&0x55); - (*key)[7-(i%8)]^=j; - } - } -#endif - des_set_odd_parity((des_cblock *)key); - i=des_check_key; - des_check_key=0; - des_set_key((des_cblock *)key,ks); - des_check_key=i; - des_cbc_cksum((des_cblock *)str,(des_cblock *)key,(long)length,ks, - (des_cblock *)key); - memset(ks,0,sizeof(ks)); - des_set_odd_parity((des_cblock *)key); - } - -void des_string_to_2keys(str, key1, key2) -char *str; -des_cblock (*key1); -des_cblock (*key2); - { - des_key_schedule ks; - int i,length; - register unsigned char j; - - memset(key1,0,8); - memset(key2,0,8); - length=strlen(str); -#ifdef OLD_STR_TO_KEY - if (length <= 8) - { - for (i=0; i>4)&0x0f); - j=((j<<2)&0xcc)|((j>>2)&0x33); - j=((j<<1)&0xaa)|((j>>1)&0x55); - if ((i%16) < 8) - (*key1)[7-(i%8)]^=j; - else - (*key2)[7-(i%8)]^=j; - } - } - if (length <= 8) memcpy(key2,key1,8); -#endif - des_set_odd_parity((des_cblock *)key1); - des_set_odd_parity((des_cblock *)key2); - i=des_check_key; - des_check_key=0; - des_set_key((des_cblock *)key1,ks); - des_cbc_cksum((des_cblock *)str,(des_cblock *)key1,(long)length,ks, - (des_cblock *)key1); - des_set_key((des_cblock *)key2,ks); - des_cbc_cksum((des_cblock *)str,(des_cblock *)key2,(long)length,ks, - (des_cblock *)key2); - des_check_key=i; - memset(ks,0,sizeof(ks)); - des_set_odd_parity(key1); - des_set_odd_parity(key2); - } diff --git a/secure/lib/libdes/supp.c b/secure/lib/libdes/supp.c deleted file mode 100644 index 8cd9289f0f068..0000000000000 --- a/secure/lib/libdes/supp.c +++ /dev/null @@ -1,98 +0,0 @@ -/* lib/des/supp.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* - * Copyright (c) 1995 - * Mark Murray. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Murray - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY MARK MURRAY 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. - * - * $Id$ - */ - -#include -#include "des_locl.h" - -void des_cblock_print_file(cb, fp) - des_cblock *cb; - FILE *fp; -{ - int i; - unsigned int *p = (unsigned int *)cb; - - fprintf(fp, " 0x { "); - for (i = 0; i < 8; i++) { - fprintf(fp, "%x", p[i]); - if (i != 7) fprintf(fp, ", "); - } - fprintf(fp, " }"); -} diff --git a/secure/lib/libdes/t/perl b/secure/lib/libdes/t/perl deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/secure/lib/libdes/t/test b/secure/lib/libdes/t/test deleted file mode 100644 index 97acd0552e430..0000000000000 --- a/secure/lib/libdes/t/test +++ /dev/null @@ -1,27 +0,0 @@ -#!./perl - -BEGIN { push(@INC, qw(../../../lib ../../lib ../lib lib)); } - -use DES; - -$key='00000000'; -$ks=DES::set_key($key); -@a=split(//,$ks); -foreach (@a) { printf "%02x-",ord($_); } -print "\n"; - - -$key=DES::random_key(); -print "($_)\n"; -@a=split(//,$key); -foreach (@a) { printf "%02x-",ord($_); } -print "\n"; -$str="this is and again into the breach"; -($k1,$k2)=DES::string_to_2keys($str); -@a=split(//,$k1); -foreach (@a) { printf "%02x-",ord($_); } -print "\n"; -@a=split(//,$k2); -foreach (@a) { printf "%02x-",ord($_); } -print "\n"; - diff --git a/secure/lib/libdes/testdes.pl b/secure/lib/libdes/testdes.pl deleted file mode 100755 index 01a165a963d1a..0000000000000 --- a/secure/lib/libdes/testdes.pl +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/local/bin/perl - -# des.pl tesing code - -require 'des.pl'; - -$num_tests=34; -@key_data=( - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, - 0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57, - 0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E, - 0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86, - 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E, - 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6, - 0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE, - 0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6, - 0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE, - 0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16, - 0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F, - 0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46, - 0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E, - 0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76, - 0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07, - 0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F, - 0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7, - 0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF, - 0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6, - 0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF, - 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E, - 0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, - ); - -@plain_data=( - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01, - 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, - 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42, - 0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA, - 0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72, - 0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A, - 0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2, - 0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A, - 0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2, - 0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A, - 0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02, - 0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A, - 0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32, - 0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA, - 0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62, - 0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2, - 0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA, - 0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92, - 0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A, - 0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2, - 0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); - -@cipher_data=( - 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, - 0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58, - 0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B, - 0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33, - 0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D, - 0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD, - 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, - 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4, - 0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B, - 0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71, - 0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A, - 0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A, - 0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95, - 0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B, - 0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09, - 0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A, - 0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F, - 0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88, - 0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77, - 0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A, - 0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56, - 0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56, - 0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56, - 0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC, - 0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A, - 0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41, - 0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93, - 0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00, - 0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06, - 0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7, - 0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51, - 0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE, - 0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D, - 0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2); - -print "Doing ecb tests\n"; -for ($i=0; $i<$num_tests; $i++) - { - printf "Doing test $i\n"; - $key =pack("C8",splice(@key_data ,0,8)); - $data=pack("C8",splice(@plain_data ,0,8)); - $res =pack("C8",splice(@cipher_data,0,8)); - - @ks= &des_set_key($key); - $out1= &des_ecb_encrypt(*ks,1,$data); - $out2= &des_ecb_encrypt(*ks,0,$out1); - $out3= &des_ecb_encrypt(*ks,0,$res); - &eprint("encryption failure",$res,$out1) - if ($out1 ne $res); - &eprint("encryption/decryption failure",$data,$out2) - if ($out2 ne $data); - &eprint("decryption failure",$data,$out3) - if ($data ne $out3); - } -print "Done\n"; - -print "doing speed test over 30 seconds\n"; -$SIG{'ALRM'}='done'; -sub done {$done=1;} -$done=0; - -$count=0; -$d=pack("C8",0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); -@ks= &des_set_key($d); -alarm(30); -$start=(times)[0]; -while (!$done) - { - $count++; - $d=&des_ecb_encrypt(*ks,1,$d); - } -$end=(times)[0]; -$t=$end-$start; -printf "$count DESs in %.2f seconds is %.2f DESs/sec or %.2f bytes/sec\n", - 1.0*$t,1.0*$count/$t,$count*8.0/$t; - -sub eprint - { - local($s,$c,$e)=@_; - local(@k); - - @k=unpack("C8",$c); - printf "%02x%02x%02x%02x %02x%02x%02x%02x - ",unpack("C8",$c); - printf "%02x%02x%02x%02x %02x%02x%02x%02x :",unpack("C8",$e); - print " $s\n"; - } diff --git a/secure/lib/libdes/times b/secure/lib/libdes/times deleted file mode 100644 index 86d10a035ba80..0000000000000 --- a/secure/lib/libdes/times +++ /dev/null @@ -1,173 +0,0 @@ -SGI Challenge (MIPS R4400 200mhz) - gcc -O2 -set_key per sec = 114141.13 ( 8.8uS) -DES ecb bytes per sec = 1573472.84 ( 5.1uS) -DES cbc bytes per sec = 1580418.20 ( 5.1uS) -crypt per sec = 7137.84 (140.1uS) - -DEC Alpha DEC 4000/710 AXP OSF/1 v 3.0 - gcc -O2 2.6.1 -set_key per sec = 123138.49 ( 8.1uS) -DES ecb bytes per sec = 1407546.76 ( 5.7uS) -DES cbc bytes per sec = 1404103.21 ( 5.7uS) -crypt per sec = 7746.76 (129.1uS) - -DEC Alpha DEC 4000/710 AXP OSF/1 v 3.0 - cc -O4 'DEC Compiler Driver 3.11' -set_key per sec = 135160.83 ( 7.4uS) -DES ecb bytes per sec = 1267753.22 ( 6.3uS) -DES cbc bytes per sec = 1260564.90 ( 6.3uS) -crypt per sec = 6479.37 (154.3uS) - -SGI Challenge (MIPS R4400 200mhz) - cc -O2 -set_key per sec = 124000.10 ( 8.1uS) -DES ecb bytes per sec = 1338138.45 ( 6.0uS) -DES cbc bytes per sec = 1356515.84 ( 5.9uS) -crypt per sec = 6223.92 (160.7uS) - -SGI Indy (MIPS R4600 133mhz) -cc -O2 -set_key per sec = 88470.54 ( 11.3uS) -DES ecb bytes per sec = 1023040.33 ( 7.8uS) -DES cbc bytes per sec = 1033610.01 ( 7.7uS) -crypt per sec = 4641.51 (215.4uS) - -HP-UX 9000/887 cc +O3 -set_key per sec = 76824.30 ( 13.0uS) -DES ecb bytes per sec = 1048911.20 ( 7.6uS) -DES cbc bytes per sec = 1072332.80 ( 7.5uS) -crypt per sec = 4968.64 (201.3uS) - -IRIX 5.2 IP22 (R4000) cc -O2 (galilo) -set_key per sec = 60615.73 ( 16.5uS) -DES ecb bytes per sec = 584741.32 ( 13.7uS) -DES cbc bytes per sec = 584306.94 ( 13.7uS) -crypt per sec = 3049.33 (327.9uS) - -HP-UX 9000/867 cc -O -set_key per sec = 48600.00 ( 20.6uS) -DES ecb bytes per sec = 616235.14 ( 13.0uS) -DES cbc bytes per sec = 638669.44 ( 12.5uS) -crypt per sec = 3016.68 (331.5uS) - -HP-UX 9000/867 gcc -O2 -set_key per sec = 52120.50 ( 19.2uS) -DES ecb bytes per sec = 715156.55 ( 11.2uS) -DES cbc bytes per sec = 724424.28 ( 11.0uS) -crypt per sec = 3295.87 (303.4uS) - -DGUX AViiON mc88110 gcc -O2 -set_key per sec = 55604.91 ( 18.0uS) -DES ecb bytes per sec = 658513.25 ( 12.1uS) -DES cbc bytes per sec = 675552.71 ( 11.8uS) -crypt per sec = 3438.10 (290.9uS) - -Sparc 10 cc -O2 (orb) -set_key per sec = 53002.30 ( 18.9uS) -DES ecb bytes per sec = 705250.40 ( 11.3uS) -DES cbc bytes per sec = 714342.40 ( 11.2uS) -crypt per sec = 2943.99 (339.7uS) - -Sparc 10 gcc -O2 (orb) -set_key per sec = 58681.21 ( 17.0uS) -DES ecb bytes per sec = 772390.20 ( 10.4uS) -DES cbc bytes per sec = 774144.00 ( 10.3uS) -crypt per sec = 3606.90 (277.2uS) - -DEC Alpha DEC 4000/610 AXP OSF/1 v 1.3 - gcc v 2.3.3 -set_key per sec = 101840.19 ( 9.8uS) -DES ecb bytes per sec = 1223712.35 ( 6.5uS) -DES cbc bytes per sec = 1230542.98 ( 6.5uS) -crypt per sec = 6428.75 (155.6uS) - -DEC Alpha DEC 4000/610 APX OSF/1 v 1.3 - cc -O2 - OSF/1 AXP -set_key per sec = 114198.91 ( 8.8uS) -DES ecb bytes per sec = 1022710.93 ( 7.8uS) -DES cbc bytes per sec = 1008821.93 ( 7.9uS) -crypt per sec = 5454.13 (183.3uS) - -DEC Alpha - DEC 3000/500 AXP OSF/1 - cc -O2 - 02/12/92 -set_key per sec = 83587.04 ( 12.0uS) -DES ecb bytes per sec = 822620.82 ( 9.7uS) -DES cbc bytes per sec = 832929.60 ( 9.6uS) -crypt per sec = 4807.62 (208.0uS) - -sun sparc 10/30 - gcc -O2 -set_key per sec = 42005.24 ( 23.8uS) -DES ecb bytes per sec = 555949.47 ( 14.4uS) -DES cbc bytes per sec = 549440.28 ( 14.6uS) -crypt per sec = 2580.25 (387.6uS) - -PA-RISC 1.1 HP 710 -set_key per sec = 38916.86 -DES ecb bytes per sec = 505971.82 -DES cbc bytes per sec = 515381.13 -crypt per sec = 2438.24 - -iris (spike) cc -O2 -set_key per sec = 23128.83 ( 43.2uS) -DES ecb bytes per sec = 261577.94 ( 30.6uS) -DES cbc bytes per sec = 261746.41 ( 30.6uS) -crypt per sec = 1231.76 (811.8uS) - -sun sparc 10/30 - cc -O4 -set_key per sec = 38379.86 ( 26.1uS) -DES ecb bytes per sec = 460051.34 ( 17.4uS) -DES cbc bytes per sec = 464970.54 ( 17.2uS) -crypt per sec = 2092.64 (477.9uS) - -sun sparc 2 - gcc2 -O2 -set_key per sec = 21559.10 -DES ecb bytes per sec = 305566.92 -DES cbc bytes per sec = 303497.50 -crypt per sec = 1410.48 - -RS/6000 model 320 -set_key per sec = 14371.93 -DES ecb bytes per sec = 222231.26 -DES cbc bytes per sec = 223926.79 -crypt per sec = 981.20 - -80486dx/66MHz Solaris 2.1 - gcc -O2 (gcc 2.6.3) -set_key per sec = 26814.15 ( 37.3uS) -DES ecb bytes per sec = 345029.95 ( 23.2uS) -DES cbc bytes per sec = 344064.00 ( 23.3uS) -crypt per sec = 1551.97 (644.3uS) - -80486dx/50MHz Solaris 2.1 - gcc -O2 (gcc 2.5.2) -set_key per sec = 18558.29 ( 53.9uS) -DES ecb bytes per sec = 240873.90 ( 33.2uS) -DES cbc bytes per sec = 239993.37 ( 33.3uS) -crypt per sec = 1073.67 (931.4uS) - -80486dx/50MHz Solaris 2.1 - cc -xO4 (cc: PC2.0.1 30 April 1993) -set_key per sec = 18302.79 ( 54.6uS) -DES ecb bytes per sec = 242640.29 ( 33.0uS) -DES cbc bytes per sec = 239568.89 ( 33.4uS) -crypt per sec = 1057.92 (945.2uS) - -68030 HP400 -set_key per sec = 5251.28 -DES ecb bytes per sec = 56186.56 -DES cbc bytes per sec = 58681.53 -crypt per sec = 276.15 - -80486sx/33MHz MSDOS Turbo C v 2.0 -set_key per sec = 1883.22 (531.0uS) -DES ecb bytes per sec = 63393.31 (126.2uS) -DES cbc bytes per sec = 63416.83 (126.1uS) -crypt per sec = 158.71 (6300.6uS) - -80486sx/33MHz MSDOS djgpp gcc 1.39 (32bit compiler) -set_key per sec = 12603.08 (79.3) -DES ecb bytes per sec = 158875.15 (50.4) -DES cbc bytes per sec = 159893.85 (50.0) -crypt per sec = 780.24 (1281.7) - -Version 1.99 26/08/92 -8MHz 68000 Atari-ST gcc 2.1 -O2 MiNT 0.94 -set_key per sec = 325.68 (3070.5uS) -DES ecb bytes per sec = 4173.67 (1916.8uS) -DES cbc bytes per sec = 4249.89 (1882.4uS) -crypt per sec = 20.19 (49521.6uS) - -8088/4.77mh MSDOS Turbo C v 2.0 -set_key per sec = 35.09 -DES ecb bytes per sec = 563.63 -crypt per sec = 2.69 diff --git a/secure/lib/libdes/typemap b/secure/lib/libdes/typemap deleted file mode 100644 index a524f53634e7f..0000000000000 --- a/secure/lib/libdes/typemap +++ /dev/null @@ -1,34 +0,0 @@ -# -# DES SECTION -# -deschar * T_DESCHARP -des_cblock * T_CBLOCK -des_cblock T_CBLOCK -des_key_schedule T_SCHEDULE -des_key_schedule * T_SCHEDULE - -INPUT -T_CBLOCK - $var=(des_cblock *)SvPV($arg,len); - if (len < DES_KEY_SZ) - { - croak(\"$var needs to be at least %u bytes long\",DES_KEY_SZ); - } - -T_SCHEDULE - $var=(des_key_schedule *)SvPV($arg,len); - if (len < DES_SCHEDULE_SZ) - { - croak(\"$var needs to be at least %u bytes long\", - DES_SCHEDULE_SZ); - } - -OUTPUT -T_CBLOCK - sv_setpvn($arg,(char *)$var,DES_KEY_SZ); - -T_SCHEDULE - sv_setpvn($arg,(char *)$var,DES_SCHEDULE_SZ); - -T_DESCHARP - sv_setpvn($arg,(char *)$var,len); diff --git a/secure/lib/libdes/version.h b/secure/lib/libdes/version.h deleted file mode 100644 index aee11903f3081..0000000000000 --- a/secure/lib/libdes/version.h +++ /dev/null @@ -1,48 +0,0 @@ -/* lib/des/version.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -extern char *DES_version; diff --git a/secure/lib/libdes/vms.com b/secure/lib/libdes/vms.com deleted file mode 100644 index 885ea8e36b50e..0000000000000 --- a/secure/lib/libdes/vms.com +++ /dev/null @@ -1,90 +0,0 @@ -$! --- VMS.com --- -$! -$ GoSub defines -$ GoSub linker_options -$ If (P1 .nes. "") -$ Then -$ GoSub 'P1' -$ Else -$ GoSub lib -$ GoSub destest -$ GoSub rpw -$ GoSub speed -$ GoSub des -$ EndIF -$! -$ Exit -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$DEFINES: -$ OPT_FILE := "VAX_LINKER_OPTIONS.OPT" -$! -$ CC_OPTS := "/NODebug/OPTimize/NOWarn" -$! -$ LINK_OPTS := "/NODebug/NOTraceback/Contiguous" -$! -$ OBJS = "cbc_cksm.obj,cbc_enc.obj,ecb_enc.obj,pcbc_enc.obj," + - - "qud_cksm.obj,rand_key.obj,read_pwd.obj,set_key.obj," + - - "str2key.obj,enc_read.obj,enc_writ.obj,fcrypt.obj," + - - "cfb_enc.obj,3ecb_enc.obj,ofb_enc.obj" - - -$! -$ LIBDES = "cbc_cksm.c,cbc_enc.c,ecb_enc.c,enc_read.c," + - - "enc_writ.c,pcbc_enc.c,qud_cksm.c,rand_key.c," + - - "read_pwd.c,set_key.c,str2key.c,fcrypt.c," + - - "cfb_enc.c,3ecb_enc.c,ofb_enc.c" -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$LINKER_OPTIONS: -$ If (f$search(OPT_FILE) .eqs. "") -$ Then -$ Create 'OPT_FILE' -$DECK -! Default system options file to link against the sharable C runtime library -! -Sys$Share:VAXcRTL.exe/Share -$EOD -$ EndIF -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$LIB: -$ CC 'CC_OPTS' 'LIBDES' -$ If (f$search("LIBDES.OLB") .nes. "") -$ Then Library /Object /Replace libdes 'OBJS' -$ Else Library /Create /Object libdes 'OBJS' -$ EndIF -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$DESTEST: -$ CC 'CC_OPTS' destest -$ Link 'link_opts' /Exec=destest destest.obj,libdes/LIBRARY,'opt_file'/Option -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$RPW: -$ CC 'CC_OPTS' rpw -$ Link 'link_opts' /Exec=rpw rpw.obj,libdes/LIBRARY,'opt_file'/Option -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$SPEED: -$ CC 'CC_OPTS' speed -$ Link 'link_opts' /Exec=speed speed.obj,libdes/LIBRARY,'opt_file'/Option -$ Return -$! -$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$! -$DES: -$ CC 'CC_OPTS' des -$ Link 'link_opts' /Exec=des des.obj,libdes/LIBRARY,'opt_file'/Option -$ Return diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile deleted file mode 100644 index 02a175f0d5d82..0000000000000 --- a/secure/lib/libtelnet/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id$ - -DISTRIBUTION= krb - -LIB= telnet -SRCS= encrypt.c genget.c getent.c misc.c - -CFLAGS+= -DHAS_CGETENT -DENCRYPTION - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES) -CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV -SRCS+= auth.c kerberos.c enc_des.c -LDADD+= -ldes -lkrb -DPADD+= ${LIBDES} ${LIBKRB} -.endif - -# Not Yet -#SRCS += spx.c rsaencpwd.c read_password.c - -# KRB4_ENCPWD not yet defined -# Used only in krb4encpwd.c and rsaencpwd.c, not yet active -#LDADD+= -ldescrypt - -.include diff --git a/secure/lib/libtelnet/auth-proto.h b/secure/lib/libtelnet/auth-proto.h deleted file mode 100644 index 111033d7700c6..0000000000000 --- a/secure/lib/libtelnet/auth-proto.h +++ /dev/null @@ -1,96 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)auth-proto.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#if !defined(P) -#ifdef __STDC__ -#define P(x) x -#else -#define P(x) () -#endif -#endif - -#if defined(AUTHENTICATION) -Authenticator *findauthenticator P((int, int)); - -void auth_init P((char *, int)); -int auth_cmd P((int, char **)); -void auth_request P((void)); -void auth_send P((unsigned char *, int)); -void auth_send_retry P((void)); -void auth_is P((unsigned char *, int)); -void auth_reply P((unsigned char *, int)); -void auth_finished P((Authenticator *, int)); -int auth_wait P((char *)); -void auth_disable_name P((char *)); -void auth_gen_printsub P((unsigned char *, int, unsigned char *, int)); - -#ifdef KRB4 -int kerberos4_init P((Authenticator *, int)); -int kerberos4_send P((Authenticator *)); -void kerberos4_is P((Authenticator *, unsigned char *, int)); -void kerberos4_reply P((Authenticator *, unsigned char *, int)); -int kerberos4_status P((Authenticator *, char *, int)); -void kerberos4_printsub P((unsigned char *, int, unsigned char *, int)); -#endif - -#ifdef KRB5 -int kerberos5_init P((Authenticator *, int)); -int kerberos5_send P((Authenticator *)); -void kerberos5_is P((Authenticator *, unsigned char *, int)); -void kerberos5_reply P((Authenticator *, unsigned char *, int)); -int kerberos5_status P((Authenticator *, char *, int)); -void kerberos5_printsub P((unsigned char *, int, unsigned char *, int)); -#endif -#endif diff --git a/secure/lib/libtelnet/auth.c b/secure/lib/libtelnet/auth.c deleted file mode 100644 index 64f5ce9e1c7a8..0000000000000 --- a/secure/lib/libtelnet/auth.c +++ /dev/null @@ -1,671 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - - -#if defined(AUTHENTICATION) -#include -#include -#include -#define AUTH_NAMES -#include -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -#include "encrypt.h" -#include "auth.h" -#include "misc-proto.h" -#include "auth-proto.h" - -#define typemask(x) (1<<((x)-1)) - -#ifdef KRB4_ENCPWD -extern krb4encpwd_init(); -extern krb4encpwd_send(); -extern krb4encpwd_is(); -extern krb4encpwd_reply(); -extern krb4encpwd_status(); -extern krb4encpwd_printsub(); -#endif - -#ifdef RSA_ENCPWD -extern rsaencpwd_init(); -extern rsaencpwd_send(); -extern rsaencpwd_is(); -extern rsaencpwd_reply(); -extern rsaencpwd_status(); -extern rsaencpwd_printsub(); -#endif - -int auth_debug_mode = 0; -static char *Name = "Noname"; -static int Server = 0; -static Authenticator *authenticated = 0; -static int authenticating = 0; -static int validuser = 0; -static unsigned char _auth_send_data[256]; -static unsigned char *auth_send_data; -static int auth_send_cnt = 0; - -/* - * Authentication types supported. Plese note that these are stored - * in priority order, i.e. try the first one first. - */ -Authenticator authenticators[] = { -#ifdef SPX - { AUTHTYPE_SPX, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL, - spx_init, - spx_send, - spx_is, - spx_reply, - spx_status, - spx_printsub }, - { AUTHTYPE_SPX, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY, - spx_init, - spx_send, - spx_is, - spx_reply, - spx_status, - spx_printsub }, -#endif -#ifdef KRB5 -# ifdef ENCRYPTION - { AUTHTYPE_KERBEROS_V5, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL, - kerberos5_init, - kerberos5_send, - kerberos5_is, - kerberos5_reply, - kerberos5_status, - kerberos5_printsub }, -# endif /* ENCRYPTION */ - { AUTHTYPE_KERBEROS_V5, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY, - kerberos5_init, - kerberos5_send, - kerberos5_is, - kerberos5_reply, - kerberos5_status, - kerberos5_printsub }, -#endif -#ifdef KRB4 -# ifdef ENCRYPTION - { AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL, - kerberos4_init, - kerberos4_send, - kerberos4_is, - kerberos4_reply, - kerberos4_status, - kerberos4_printsub }, -# endif /* ENCRYPTION */ - { AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY, - kerberos4_init, - kerberos4_send, - kerberos4_is, - kerberos4_reply, - kerberos4_status, - kerberos4_printsub }, -#endif -#ifdef KRB4_ENCPWD - { AUTHTYPE_KRB4_ENCPWD, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL, - krb4encpwd_init, - krb4encpwd_send, - krb4encpwd_is, - krb4encpwd_reply, - krb4encpwd_status, - krb4encpwd_printsub }, -#endif -#ifdef RSA_ENCPWD - { AUTHTYPE_RSA_ENCPWD, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY, - rsaencpwd_init, - rsaencpwd_send, - rsaencpwd_is, - rsaencpwd_reply, - rsaencpwd_status, - rsaencpwd_printsub }, -#endif - { 0, }, -}; - -static Authenticator NoAuth = { 0 }; - -static int i_support = 0; -static int i_wont_support = 0; - - Authenticator * -findauthenticator(type, way) - int type; - int way; -{ - Authenticator *ap = authenticators; - - while (ap->type && (ap->type != type || ap->way != way)) - ++ap; - return(ap->type ? ap : 0); -} - - void -auth_init(name, server) - char *name; - int server; -{ - Authenticator *ap = authenticators; - - Server = server; - Name = name; - - i_support = 0; - authenticated = 0; - authenticating = 0; - while (ap->type) { - if (!ap->init || (*ap->init)(ap, server)) { - i_support |= typemask(ap->type); - if (auth_debug_mode) - printf(">>>%s: I support auth type %d %d\r\n", - Name, - ap->type, ap->way); - } - else if (auth_debug_mode) - printf(">>>%s: Init failed: auth type %d %d\r\n", - Name, ap->type, ap->way); - ++ap; - } -} - - void -auth_disable_name(name) - char *name; -{ - int x; - for (x = 0; x < AUTHTYPE_CNT; ++x) { - if (!strcasecmp(name, AUTHTYPE_NAME(x))) { - i_wont_support |= typemask(x); - break; - } - } -} - - int -getauthmask(type, maskp) - char *type; - int *maskp; -{ - register int x; - - if (!strcasecmp(type, AUTHTYPE_NAME(0))) { - *maskp = -1; - return(1); - } - - for (x = 1; x < AUTHTYPE_CNT; ++x) { - if (!strcasecmp(type, AUTHTYPE_NAME(x))) { - *maskp = typemask(x); - return(1); - } - } - return(0); -} - - int -auth_enable(type) - char * type; -{ - return(auth_onoff(type, 1)); -} - - int -auth_disable(type) - char * type; -{ - return(auth_onoff(type, 0)); -} - - int -auth_onoff(type, on) - char *type; - int on; -{ - int i, mask = -1; - Authenticator *ap; - - if (!strcasecmp(type, "?") || !strcasecmp(type, "help")) { - printf("auth %s 'type'\n", on ? "enable" : "disable"); - printf("Where 'type' is one of:\n"); - printf("\t%s\n", AUTHTYPE_NAME(0)); - mask = 0; - for (ap = authenticators; ap->type; ap++) { - if ((mask & (i = typemask(ap->type))) != 0) - continue; - mask |= i; - printf("\t%s\n", AUTHTYPE_NAME(ap->type)); - } - return(0); - } - - if (!getauthmask(type, &mask)) { - printf("%s: invalid authentication type\n", type); - return(0); - } - if (on) - i_wont_support &= ~mask; - else - i_wont_support |= mask; - return(1); -} - - int -auth_togdebug(on) - int on; -{ - if (on < 0) - auth_debug_mode ^= 1; - else - auth_debug_mode = on; - printf("auth debugging %s\n", auth_debug_mode ? "enabled" : "disabled"); - return(1); -} - - int -auth_status() -{ - Authenticator *ap; - int i, mask; - - if (i_wont_support == -1) - printf("Authentication disabled\n"); - else - printf("Authentication enabled\n"); - - mask = 0; - for (ap = authenticators; ap->type; ap++) { - if ((mask & (i = typemask(ap->type))) != 0) - continue; - mask |= i; - printf("%s: %s\n", AUTHTYPE_NAME(ap->type), - (i_wont_support & typemask(ap->type)) ? - "disabled" : "enabled"); - } - return(1); -} - -/* - * This routine is called by the server to start authentication - * negotiation. - */ - void -auth_request() -{ - static unsigned char str_request[64] = { IAC, SB, - TELOPT_AUTHENTICATION, - TELQUAL_SEND, }; - Authenticator *ap = authenticators; - unsigned char *e = str_request + 4; - - if (!authenticating) { - authenticating = 1; - while (ap->type) { - if (i_support & ~i_wont_support & typemask(ap->type)) { - if (auth_debug_mode) { - printf(">>>%s: Sending type %d %d\r\n", - Name, ap->type, ap->way); - } - *e++ = ap->type; - *e++ = ap->way; - } - ++ap; - } - *e++ = IAC; - *e++ = SE; - net_write(str_request, e - str_request); - printsub('>', &str_request[2], e - str_request - 2); - } -} - -/* - * This is called when an AUTH SEND is received. - * It should never arrive on the server side (as only the server can - * send an AUTH SEND). - * You should probably respond to it if you can... - * - * If you want to respond to the types out of order (i.e. even - * if he sends LOGIN KERBEROS and you support both, you respond - * with KERBEROS instead of LOGIN (which is against what the - * protocol says)) you will have to hack this code... - */ - void -auth_send(data, cnt) - unsigned char *data; - int cnt; -{ - Authenticator *ap; - static unsigned char str_none[] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_IS, AUTHTYPE_NULL, 0, - IAC, SE }; - if (Server) { - if (auth_debug_mode) { - printf(">>>%s: auth_send called!\r\n", Name); - } - return; - } - - if (auth_debug_mode) { - printf(">>>%s: auth_send got:", Name); - printd(data, cnt); printf("\r\n"); - } - - /* - * Save the data, if it is new, so that we can continue looking - * at it if the authorization we try doesn't work - */ - if (data < _auth_send_data || - data > _auth_send_data + sizeof(_auth_send_data)) { - auth_send_cnt = cnt > sizeof(_auth_send_data) - ? sizeof(_auth_send_data) - : cnt; - memmove((void *)_auth_send_data, (void *)data, auth_send_cnt); - auth_send_data = _auth_send_data; - } else { - /* - * This is probably a no-op, but we just make sure - */ - auth_send_data = data; - auth_send_cnt = cnt; - } - while ((auth_send_cnt -= 2) >= 0) { - if (auth_debug_mode) - printf(">>>%s: He supports %d\r\n", - Name, *auth_send_data); - if ((i_support & ~i_wont_support) & typemask(*auth_send_data)) { - ap = findauthenticator(auth_send_data[0], - auth_send_data[1]); - if (ap && ap->send) { - if (auth_debug_mode) - printf(">>>%s: Trying %d %d\r\n", - Name, auth_send_data[0], - auth_send_data[1]); - if ((*ap->send)(ap)) { - /* - * Okay, we found one we like - * and did it. - * we can go home now. - */ - if (auth_debug_mode) - printf(">>>%s: Using type %d\r\n", - Name, *auth_send_data); - auth_send_data += 2; - return; - } - } - /* else - * just continue on and look for the - * next one if we didn't do anything. - */ - } - auth_send_data += 2; - } - net_write(str_none, sizeof(str_none)); - printsub('>', &str_none[2], sizeof(str_none) - 2); - if (auth_debug_mode) - printf(">>>%s: Sent failure message\r\n", Name); - auth_finished(0, AUTH_REJECT); -#ifdef KANNAN - /* - * We requested strong authentication, however no mechanisms worked. - * Therefore, exit on client end. - */ - printf("Unable to securely authenticate user ... exit\n"); - exit(0); -#endif /* KANNAN */ -} - - void -auth_send_retry() -{ - /* - * if auth_send_cnt <= 0 then auth_send will end up rejecting - * the authentication and informing the other side of this. - */ - auth_send(auth_send_data, auth_send_cnt); -} - - void -auth_is(data, cnt) - unsigned char *data; - int cnt; -{ - Authenticator *ap; - - if (cnt < 2) - return; - - if (data[0] == AUTHTYPE_NULL) { - auth_finished(0, AUTH_REJECT); - return; - } - - if (ap = findauthenticator(data[0], data[1])) { - if (ap->is) - (*ap->is)(ap, data+2, cnt-2); - } else if (auth_debug_mode) - printf(">>>%s: Invalid authentication in IS: %d\r\n", - Name, *data); -} - - void -auth_reply(data, cnt) - unsigned char *data; - int cnt; -{ - Authenticator *ap; - - if (cnt < 2) - return; - - if (ap = findauthenticator(data[0], data[1])) { - if (ap->reply) - (*ap->reply)(ap, data+2, cnt-2); - } else if (auth_debug_mode) - printf(">>>%s: Invalid authentication in SEND: %d\r\n", - Name, *data); -} - - void -auth_name(data, cnt) - unsigned char *data; - int cnt; -{ - Authenticator *ap; - unsigned char savename[256]; - - if (cnt < 1) { - if (auth_debug_mode) - printf(">>>%s: Empty name in NAME\r\n", Name); - return; - } - if (cnt > sizeof(savename) - 1) { - if (auth_debug_mode) - printf(">>>%s: Name in NAME (%d) exceeds %d length\r\n", - Name, cnt, sizeof(savename)-1); - return; - } - memmove((void *)savename, (void *)data, cnt); - savename[cnt] = '\0'; /* Null terminate */ - if (auth_debug_mode) - printf(">>>%s: Got NAME [%s]\r\n", Name, savename); - auth_encrypt_user(savename); -} - - int -auth_sendname(cp, len) - unsigned char *cp; - int len; -{ - static unsigned char str_request[256+6] - = { IAC, SB, TELOPT_AUTHENTICATION, TELQUAL_NAME, }; - register unsigned char *e = str_request + 4; - register unsigned char *ee = &str_request[sizeof(str_request)-2]; - - while (--len >= 0) { - if ((*e++ = *cp++) == IAC) - *e++ = IAC; - if (e >= ee) - return(0); - } - *e++ = IAC; - *e++ = SE; - net_write(str_request, e - str_request); - printsub('>', &str_request[2], e - &str_request[2]); - return(1); -} - - void -auth_finished(ap, result) - Authenticator *ap; - int result; -{ - if (!(authenticated = ap)) - authenticated = &NoAuth; - validuser = result; -} - - /* ARGSUSED */ - static void -auth_intr(sig) - int sig; -{ - auth_finished(0, AUTH_REJECT); -} - - int -auth_wait(name) - char *name; -{ - if (auth_debug_mode) - printf(">>>%s: in auth_wait.\r\n", Name); - - if (Server && !authenticating) - return(0); - - (void) signal(SIGALRM, auth_intr); - alarm(30); - while (!authenticated) - if (telnet_spin()) - break; - alarm(0); - (void) signal(SIGALRM, SIG_DFL); - - /* - * Now check to see if the user is valid or not - */ - if (!authenticated || authenticated == &NoAuth) - return(AUTH_REJECT); - - if (validuser == AUTH_VALID) - validuser = AUTH_USER; - - if (authenticated->status) - validuser = (*authenticated->status)(authenticated, - name, validuser); - return(validuser); -} - - void -auth_debug(mode) - int mode; -{ - auth_debug_mode = mode; -} - - void -auth_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - Authenticator *ap; - - if ((ap = findauthenticator(data[1], data[2])) && ap->printsub) - (*ap->printsub)(data, cnt, buf, buflen); - else - auth_gen_printsub(data, cnt, buf, buflen); -} - - void -auth_gen_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - register unsigned char *cp; - unsigned char tbuf[16]; - - cnt -= 3; - data += 3; - buf[buflen-1] = '\0'; - buf[buflen-2] = '*'; - buflen -= 2; - for (; cnt > 0; cnt--, data++) { - sprintf((char *)tbuf, " %d", *data); - for (cp = tbuf; *cp && buflen > 0; --buflen) - *buf++ = *cp++; - if (buflen <= 0) - return; - } - *buf = '\0'; -} -#endif diff --git a/secure/lib/libtelnet/auth.h b/secure/lib/libtelnet/auth.h deleted file mode 100644 index 615e8a07b8948..0000000000000 --- a/secure/lib/libtelnet/auth.h +++ /dev/null @@ -1,87 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)auth.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifndef __AUTH__ -#define __AUTH__ - -#define AUTH_REJECT 0 /* Rejected */ -#define AUTH_UNKNOWN 1 /* We don't know who he is, but he's okay */ -#define AUTH_OTHER 2 /* We know him, but not his name */ -#define AUTH_USER 3 /* We know he name */ -#define AUTH_VALID 4 /* We know him, and he needs no password */ - -#if !defined(P) -#ifdef __STDC__ -#define P(x) x -#else -#define P(x) () -#endif -#endif - -typedef struct XauthP { - int type; - int way; - int (*init) P((struct XauthP *, int)); - int (*send) P((struct XauthP *)); - void (*is) P((struct XauthP *, unsigned char *, int)); - void (*reply) P((struct XauthP *, unsigned char *, int)); - int (*status) P((struct XauthP *, char *, int)); - void (*printsub) P((unsigned char *, int, unsigned char *, int)); -} Authenticator; - -#include "auth-proto.h" - -extern auth_debug_mode; -#endif diff --git a/secure/lib/libtelnet/enc-proto.h b/secure/lib/libtelnet/enc-proto.h deleted file mode 100644 index 0c0d89cbf83d7..0000000000000 --- a/secure/lib/libtelnet/enc-proto.h +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)enc-proto.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ -#if !defined(P) -#ifdef __STDC__ -#define P(x) x -#else -#define P(x) () -#endif -#endif - -#ifdef ENCRYPTION -void encrypt_init P((char *, int)); -Encryptions *findencryption P((int)); -void encrypt_send_supprt P((void)); -void encrypt_auto P((int)); -void decrypt_auto P((int)); -void encrypt_is P((unsigned char *, int)); -void encrypt_reply P((unsigned char *, int)); -void encrypt_start_input P((int)); -void encrypt_session_key P((Session_Key *, int)); -void encrypt_end_input P((void)); -void encrypt_start_output P((int)); -void encrypt_end_output P((void)); -void encrypt_send_request_start P((void)); -void encrypt_send_request_end P((void)); -void encrypt_send_end P((void)); -void encrypt_wait P((void)); -void encrypt_send_support P((void)); -void encrypt_send_keyid P((int, unsigned char *, int, int)); -int net_write P((unsigned char *, int)); - -#ifdef TELENTD -void encrypt_wait P((void)); -#else -int encrypt_cmd P((int, char **)); -void encrypt_display P((void)); -#endif - -void krbdes_encrypt P((unsigned char *, int)); -int krbdes_decrypt P((int)); -int krbdes_is P((unsigned char *, int)); -int krbdes_reply P((unsigned char *, int)); -void krbdes_init P((int)); -int krbdes_start P((int, int)); -void krbdes_session P((Session_Key *, int)); -void krbdes_printsub P((unsigned char *, int, unsigned char *, int)); - -void cfb64_encrypt P((unsigned char *, int)); -int cfb64_decrypt P((int)); -void cfb64_init P((int)); -int cfb64_start P((int, int)); -int cfb64_is P((unsigned char *, int)); -int cfb64_reply P((unsigned char *, int)); -void cfb64_session P((Session_Key *, int)); -int cfb64_keyid P((int, unsigned char *, int *)); -void cfb64_printsub P((unsigned char *, int, unsigned char *, int)); - -void ofb64_encrypt P((unsigned char *, int)); -int ofb64_decrypt P((int)); -void ofb64_init P((int)); -int ofb64_start P((int, int)); -int ofb64_is P((unsigned char *, int)); -int ofb64_reply P((unsigned char *, int)); -void ofb64_session P((Session_Key *, int)); -int ofb64_keyid P((int, unsigned char *, int *)); -void ofb64_printsub P((unsigned char *, int, unsigned char *, int)); - -#endif /* ENCRYPTION */ diff --git a/secure/lib/libtelnet/enc_des.c b/secure/lib/libtelnet/enc_des.c deleted file mode 100644 index d6886fd717d41..0000000000000 --- a/secure/lib/libtelnet/enc_des.c +++ /dev/null @@ -1,724 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#ifdef ENCRYPTION -# ifdef AUTHENTICATION -# ifdef DES_ENCRYPTION -#include -#include -#ifdef __STDC__ -#include -#endif - -#include "encrypt.h" -#include "key-proto.h" -#include "misc-proto.h" - -extern encrypt_debug_mode; - -#define CFB 0 -#define OFB 1 - -#define NO_SEND_IV 1 -#define NO_RECV_IV 2 -#define NO_KEYID 4 -#define IN_PROGRESS (NO_SEND_IV|NO_RECV_IV|NO_KEYID) -#define SUCCESS 0 -#define FAILED -1 - - -struct fb { - Block krbdes_key; - Schedule krbdes_sched; - Block temp_feed; - unsigned char fb_feed[64]; - int need_start; - int state[2]; - int keyid[2]; - int once; - struct stinfo { - Block str_output; - Block str_feed; - Block str_iv; - Block str_ikey; - Schedule str_sched; - int str_index; - int str_flagshift; - } streams[2]; -}; - -static struct fb fb[2]; - -struct keyidlist { - char *keyid; - int keyidlen; - char *key; - int keylen; - int flags; -} keyidlist [] = { - { "\0", 1, 0, 0, 0 }, /* default key of zero */ - { 0, 0, 0, 0, 0 } -}; - -#define KEYFLAG_MASK 03 - -#define KEYFLAG_NOINIT 00 -#define KEYFLAG_INIT 01 -#define KEYFLAG_OK 02 -#define KEYFLAG_BAD 03 - -#define KEYFLAG_SHIFT 2 - -#define SHIFT_VAL(a,b) (KEYFLAG_SHIFT*((a)+((b)*2))) - -#define FB64_IV 1 -#define FB64_IV_OK 2 -#define FB64_IV_BAD 3 - - -void fb64_stream_iv P((Block, struct stinfo *)); -void fb64_init P((struct fb *)); -static int fb64_start P((struct fb *, int, int)); -int fb64_is P((unsigned char *, int, struct fb *)); -int fb64_reply P((unsigned char *, int, struct fb *)); -static void fb64_session P((Session_Key *, int, struct fb *)); -void fb64_stream_key P((Block, struct stinfo *)); -int fb64_keyid P((int, unsigned char *, int *, struct fb *)); - - void -cfb64_init(server) - int server; -{ - fb64_init(&fb[CFB]); - fb[CFB].fb_feed[4] = ENCTYPE_DES_CFB64; - fb[CFB].streams[0].str_flagshift = SHIFT_VAL(0, CFB); - fb[CFB].streams[1].str_flagshift = SHIFT_VAL(1, CFB); -} - - void -ofb64_init(server) - int server; -{ - fb64_init(&fb[OFB]); - fb[OFB].fb_feed[4] = ENCTYPE_DES_OFB64; - fb[CFB].streams[0].str_flagshift = SHIFT_VAL(0, OFB); - fb[CFB].streams[1].str_flagshift = SHIFT_VAL(1, OFB); -} - - void -fb64_init(fbp) - register struct fb *fbp; -{ - memset((void *)fbp, 0, sizeof(*fbp)); - fbp->state[0] = fbp->state[1] = FAILED; - fbp->fb_feed[0] = IAC; - fbp->fb_feed[1] = SB; - fbp->fb_feed[2] = TELOPT_ENCRYPT; - fbp->fb_feed[3] = ENCRYPT_IS; -} - -/* - * Returns: - * -1: some error. Negotiation is done, encryption not ready. - * 0: Successful, initial negotiation all done. - * 1: successful, negotiation not done yet. - * 2: Not yet. Other things (like getting the key from - * Kerberos) have to happen before we can continue. - */ - int -cfb64_start(dir, server) - int dir; - int server; -{ - return(fb64_start(&fb[CFB], dir, server)); -} - int -ofb64_start(dir, server) - int dir; - int server; -{ - return(fb64_start(&fb[OFB], dir, server)); -} - - static int -fb64_start(fbp, dir, server) - struct fb *fbp; - int dir; - int server; -{ - Block b; - int x; - unsigned char *p; - register int state; - - switch (dir) { - case DIR_DECRYPT: - /* - * This is simply a request to have the other side - * start output (our input). He will negotiate an - * IV so we need not look for it. - */ - state = fbp->state[dir-1]; - if (state == FAILED) - state = IN_PROGRESS; - break; - - case DIR_ENCRYPT: - state = fbp->state[dir-1]; - if (state == FAILED) - state = IN_PROGRESS; - else if ((state & NO_SEND_IV) == 0) - break; - - if (!VALIDKEY(fbp->krbdes_key)) { - fbp->need_start = 1; - break; - } - state &= ~NO_SEND_IV; - state |= NO_RECV_IV; - if (encrypt_debug_mode) - printf("Creating new feed\r\n"); - /* - * Create a random feed and send it over. - */ - des_new_random_key(fbp->temp_feed); - des_ecb_encrypt(fbp->temp_feed, fbp->temp_feed, - fbp->krbdes_sched, 1); - p = fbp->fb_feed + 3; - *p++ = ENCRYPT_IS; - p++; - *p++ = FB64_IV; - for (x = 0; x < sizeof(Block); ++x) { - if ((*p++ = fbp->temp_feed[x]) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); - net_write(fbp->fb_feed, p - fbp->fb_feed); - break; - default: - return(FAILED); - } - return(fbp->state[dir-1] = state); -} - -/* - * Returns: - * -1: some error. Negotiation is done, encryption not ready. - * 0: Successful, initial negotiation all done. - * 1: successful, negotiation not done yet. - */ - int -cfb64_is(data, cnt) - unsigned char *data; - int cnt; -{ - return(fb64_is(data, cnt, &fb[CFB])); -} - int -ofb64_is(data, cnt) - unsigned char *data; - int cnt; -{ - return(fb64_is(data, cnt, &fb[OFB])); -} - - int -fb64_is(data, cnt, fbp) - unsigned char *data; - int cnt; - struct fb *fbp; -{ - int x; - unsigned char *p; - Block b; - register int state = fbp->state[DIR_DECRYPT-1]; - - if (cnt-- < 1) - goto failure; - - switch (*data++) { - case FB64_IV: - if (cnt != sizeof(Block)) { - if (encrypt_debug_mode) - printf("CFB64: initial vector failed on size\r\n"); - state = FAILED; - goto failure; - } - - if (encrypt_debug_mode) - printf("CFB64: initial vector received\r\n"); - - if (encrypt_debug_mode) - printf("Initializing Decrypt stream\r\n"); - - fb64_stream_iv((void *)data, &fbp->streams[DIR_DECRYPT-1]); - - p = fbp->fb_feed + 3; - *p++ = ENCRYPT_REPLY; - p++; - *p++ = FB64_IV_OK; - *p++ = IAC; - *p++ = SE; - printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); - net_write(fbp->fb_feed, p - fbp->fb_feed); - - state = fbp->state[DIR_DECRYPT-1] = IN_PROGRESS; - break; - - default: - if (encrypt_debug_mode) { - printf("Unknown option type: %d\r\n", *(data-1)); - printd(data, cnt); - printf("\r\n"); - } - /* FALL THROUGH */ - failure: - /* - * We failed. Send an FB64_IV_BAD option - * to the other side so it will know that - * things failed. - */ - p = fbp->fb_feed + 3; - *p++ = ENCRYPT_REPLY; - p++; - *p++ = FB64_IV_BAD; - *p++ = IAC; - *p++ = SE; - printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); - net_write(fbp->fb_feed, p - fbp->fb_feed); - - break; - } - return(fbp->state[DIR_DECRYPT-1] = state); -} - -/* - * Returns: - * -1: some error. Negotiation is done, encryption not ready. - * 0: Successful, initial negotiation all done. - * 1: successful, negotiation not done yet. - */ - int -cfb64_reply(data, cnt) - unsigned char *data; - int cnt; -{ - return(fb64_reply(data, cnt, &fb[CFB])); -} - int -ofb64_reply(data, cnt) - unsigned char *data; - int cnt; -{ - return(fb64_reply(data, cnt, &fb[OFB])); -} - - - int -fb64_reply(data, cnt, fbp) - unsigned char *data; - int cnt; - struct fb *fbp; -{ - int x; - unsigned char *p; - Block b; - register int state = fbp->state[DIR_ENCRYPT-1]; - - if (cnt-- < 1) - goto failure; - - switch (*data++) { - case FB64_IV_OK: - fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]); - if (state == FAILED) - state = IN_PROGRESS; - state &= ~NO_RECV_IV; - encrypt_send_keyid(DIR_ENCRYPT, (unsigned char *)"\0", 1, 1); - break; - - case FB64_IV_BAD: - memset(fbp->temp_feed, 0, sizeof(Block)); - fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]); - state = FAILED; - break; - - default: - if (encrypt_debug_mode) { - printf("Unknown option type: %d\r\n", data[-1]); - printd(data, cnt); - printf("\r\n"); - } - /* FALL THROUGH */ - failure: - state = FAILED; - break; - } - return(fbp->state[DIR_ENCRYPT-1] = state); -} - - void -cfb64_session(key, server) - Session_Key *key; - int server; -{ - fb64_session(key, server, &fb[CFB]); -} - - void -ofb64_session(key, server) - Session_Key *key; - int server; -{ - fb64_session(key, server, &fb[OFB]); -} - - static void -fb64_session(key, server, fbp) - Session_Key *key; - int server; - struct fb *fbp; -{ - - if (!key || key->type != SK_DES) { - if (encrypt_debug_mode) - printf("Can't set krbdes's session key (%d != %d)\r\n", - key ? key->type : -1, SK_DES); - return; - } - memmove((void *)fbp->krbdes_key, (void *)key->data, sizeof(Block)); - - fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT-1]); - fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]); - - if (fbp->once == 0) { - des_set_random_generator_seed(fbp->krbdes_key); - fbp->once = 1; - } - des_key_sched(fbp->krbdes_key, fbp->krbdes_sched); - /* - * Now look to see if krbdes_start() was was waiting for - * the key to show up. If so, go ahead an call it now - * that we have the key. - */ - if (fbp->need_start) { - fbp->need_start = 0; - fb64_start(fbp, DIR_ENCRYPT, server); - } -} - -/* - * We only accept a keyid of 0. If we get a keyid of - * 0, then mark the state as SUCCESS. - */ - int -cfb64_keyid(dir, kp, lenp) - int dir, *lenp; - unsigned char *kp; -{ - return(fb64_keyid(dir, kp, lenp, &fb[CFB])); -} - - int -ofb64_keyid(dir, kp, lenp) - int dir, *lenp; - unsigned char *kp; -{ - return(fb64_keyid(dir, kp, lenp, &fb[OFB])); -} - - int -fb64_keyid(dir, kp, lenp, fbp) - int dir, *lenp; - unsigned char *kp; - struct fb *fbp; -{ - register int state = fbp->state[dir-1]; - - if (*lenp != 1 || (*kp != '\0')) { - *lenp = 0; - return(state); - } - - if (state == FAILED) - state = IN_PROGRESS; - - state &= ~NO_KEYID; - - return(fbp->state[dir-1] = state); -} - - void -fb64_printsub(data, cnt, buf, buflen, type) - unsigned char *data, *buf, *type; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - char *cp; - - buf[buflen-1] = '\0'; /* make sure it's NULL terminated */ - buflen -= 1; - - switch(data[2]) { - case FB64_IV: - sprintf(lbuf, "%s_IV", type); - cp = lbuf; - goto common; - - case FB64_IV_OK: - sprintf(lbuf, "%s_IV_OK", type); - cp = lbuf; - goto common; - - case FB64_IV_BAD: - sprintf(lbuf, "%s_IV_BAD", type); - cp = lbuf; - goto common; - - default: - sprintf(lbuf, " %d (unknown)", data[2]); - cp = lbuf; - common: - for (; (buflen > 0) && (*buf = *cp++); buf++) - buflen--; - for (i = 3; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - for (cp = lbuf; (buflen > 0) && (*buf = *cp++); buf++) - buflen--; - } - break; - } -} - - void -cfb64_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - fb64_printsub(data, cnt, buf, buflen, "CFB64"); -} - - void -ofb64_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - fb64_printsub(data, cnt, buf, buflen, "OFB64"); -} - - void -fb64_stream_iv(seed, stp) - Block seed; - register struct stinfo *stp; -{ - - memmove((void *)stp->str_iv, (void *)seed, sizeof(Block)); - memmove((void *)stp->str_output, (void *)seed, sizeof(Block)); - - des_key_sched(stp->str_ikey, stp->str_sched); - - stp->str_index = sizeof(Block); -} - - void -fb64_stream_key(key, stp) - Block key; - register struct stinfo *stp; -{ - memmove((void *)stp->str_ikey, (void *)key, sizeof(Block)); - des_key_sched(key, stp->str_sched); - - memmove((void *)stp->str_output, (void *)stp->str_iv, sizeof(Block)); - - stp->str_index = sizeof(Block); -} - -/* - * DES 64 bit Cipher Feedback - * - * key --->+-----+ - * +->| DES |--+ - * | +-----+ | - * | v - * INPUT --(--------->(+)+---> DATA - * | | - * +-------------+ - * - * - * Given: - * iV: Initial vector, 64 bits (8 bytes) long. - * Dn: the nth chunk of 64 bits (8 bytes) of data to encrypt (decrypt). - * On: the nth chunk of 64 bits (8 bytes) of encrypted (decrypted) output. - * - * V0 = DES(iV, key) - * On = Dn ^ Vn - * V(n+1) = DES(On, key) - */ - - void -cfb64_encrypt(s, c) - register unsigned char *s; - int c; -{ - register struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT-1]; - register int index; - - index = stp->str_index; - while (c-- > 0) { - if (index == sizeof(Block)) { - Block b; - des_ecb_encrypt(stp->str_output, b, stp->str_sched, 1); - memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); - index = 0; - } - - /* On encryption, we store (feed ^ data) which is cypher */ - *s = stp->str_output[index] = (stp->str_feed[index] ^ *s); - s++; - index++; - } - stp->str_index = index; -} - - int -cfb64_decrypt(data) - int data; -{ - register struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT-1]; - int index; - - if (data == -1) { - /* - * Back up one byte. It is assumed that we will - * never back up more than one byte. If we do, this - * may or may not work. - */ - if (stp->str_index) - --stp->str_index; - return(0); - } - - index = stp->str_index++; - if (index == sizeof(Block)) { - Block b; - des_ecb_encrypt(stp->str_output, b, stp->str_sched, 1); - memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); - stp->str_index = 1; /* Next time will be 1 */ - index = 0; /* But now use 0 */ - } - - /* On decryption we store (data) which is cypher. */ - stp->str_output[index] = data; - return(data ^ stp->str_feed[index]); -} - -/* - * DES 64 bit Output Feedback - * - * key --->+-----+ - * +->| DES |--+ - * | +-----+ | - * +-----------+ - * v - * INPUT -------->(+) ----> DATA - * - * Given: - * iV: Initial vector, 64 bits (8 bytes) long. - * Dn: the nth chunk of 64 bits (8 bytes) of data to encrypt (decrypt). - * On: the nth chunk of 64 bits (8 bytes) of encrypted (decrypted) output. - * - * V0 = DES(iV, key) - * V(n+1) = DES(Vn, key) - * On = Dn ^ Vn - */ - void -ofb64_encrypt(s, c) - register unsigned char *s; - int c; -{ - register struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT-1]; - register int index; - - index = stp->str_index; - while (c-- > 0) { - if (index == sizeof(Block)) { - Block b; - des_ecb_encrypt(stp->str_feed, b, stp->str_sched, 1); - memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); - index = 0; - } - *s++ ^= stp->str_feed[index]; - index++; - } - stp->str_index = index; -} - - int -ofb64_decrypt(data) - int data; -{ - register struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT-1]; - int index; - - if (data == -1) { - /* - * Back up one byte. It is assumed that we will - * never back up more than one byte. If we do, this - * may or may not work. - */ - if (stp->str_index) - --stp->str_index; - return(0); - } - - index = stp->str_index++; - if (index == sizeof(Block)) { - Block b; - des_ecb_encrypt(stp->str_feed, b, stp->str_sched, 1); - memmove((void *)stp->str_feed, (void *)b, sizeof(Block)); - stp->str_index = 1; /* Next time will be 1 */ - index = 0; /* But now use 0 */ - } - - return(data ^ stp->str_feed[index]); -} -# endif /* DES_ENCRYPTION */ -# endif /* AUTHENTICATION */ -#endif /* ENCRYPTION */ diff --git a/secure/lib/libtelnet/encrypt.c b/secure/lib/libtelnet/encrypt.c deleted file mode 100644 index 432df0cbb3335..0000000000000 --- a/secure/lib/libtelnet/encrypt.c +++ /dev/null @@ -1,1000 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifdef ENCRYPTION - -#define ENCRYPT_NAMES -#include - -#include "encrypt.h" -#include "misc.h" - -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -/* - * These functions pointers point to the current routines - * for encrypting and decrypting data. - */ -void (*encrypt_output) P((unsigned char *, int)); -int (*decrypt_input) P((int)); - -int encrypt_debug_mode = 0; -static int decrypt_mode = 0; -static int encrypt_mode = 0; -static int encrypt_verbose = 0; -static int autoencrypt = 0; -static int autodecrypt = 0; -static int havesessionkey = 0; -static int Server = 0; -static char *Name = "Noname"; - -#define typemask(x) ((x) > 0 ? 1 << ((x)-1) : 0) - -static long i_support_encrypt = typemask(ENCTYPE_DES_CFB64) - | typemask(ENCTYPE_DES_OFB64); -static long i_support_decrypt = typemask(ENCTYPE_DES_CFB64) - | typemask(ENCTYPE_DES_OFB64); -static long i_wont_support_encrypt = 0; -static long i_wont_support_decrypt = 0; -#define I_SUPPORT_ENCRYPT (i_support_encrypt & ~i_wont_support_encrypt) -#define I_SUPPORT_DECRYPT (i_support_decrypt & ~i_wont_support_decrypt) - -static long remote_supports_encrypt = 0; -static long remote_supports_decrypt = 0; - -static Encryptions encryptions[] = { -#ifdef DES_ENCRYPTION - { "DES_CFB64", ENCTYPE_DES_CFB64, - cfb64_encrypt, - cfb64_decrypt, - cfb64_init, - cfb64_start, - cfb64_is, - cfb64_reply, - cfb64_session, - cfb64_keyid, - cfb64_printsub }, - { "DES_OFB64", ENCTYPE_DES_OFB64, - ofb64_encrypt, - ofb64_decrypt, - ofb64_init, - ofb64_start, - ofb64_is, - ofb64_reply, - ofb64_session, - ofb64_keyid, - ofb64_printsub }, -#endif /* DES_ENCRYPTION */ - { 0, }, -}; - -static unsigned char str_send[64] = { IAC, SB, TELOPT_ENCRYPT, - ENCRYPT_SUPPORT }; -static unsigned char str_suplen = 0; -static unsigned char str_start[72] = { IAC, SB, TELOPT_ENCRYPT }; -static unsigned char str_end[] = { IAC, SB, TELOPT_ENCRYPT, 0, IAC, SE }; - - Encryptions * -findencryption(type) - int type; -{ - Encryptions *ep = encryptions; - - if (!(I_SUPPORT_ENCRYPT & remote_supports_decrypt & typemask(type))) - return(0); - while (ep->type && ep->type != type) - ++ep; - return(ep->type ? ep : 0); -} - - Encryptions * -finddecryption(type) - int type; -{ - Encryptions *ep = encryptions; - - if (!(I_SUPPORT_DECRYPT & remote_supports_encrypt & typemask(type))) - return(0); - while (ep->type && ep->type != type) - ++ep; - return(ep->type ? ep : 0); -} - -#define MAXKEYLEN 64 - -static struct key_info { - unsigned char keyid[MAXKEYLEN]; - int keylen; - int dir; - int *modep; - Encryptions *(*getcrypt)(); -} ki[2] = { - { { 0 }, 0, DIR_ENCRYPT, &encrypt_mode, findencryption }, - { { 0 }, 0, DIR_DECRYPT, &decrypt_mode, finddecryption }, -}; - - void -encrypt_init(name, server) - char *name; - int server; -{ - Encryptions *ep = encryptions; - - Name = name; - Server = server; - i_support_encrypt = i_support_decrypt = 0; - remote_supports_encrypt = remote_supports_decrypt = 0; - encrypt_mode = 0; - decrypt_mode = 0; - encrypt_output = 0; - decrypt_input = 0; -#ifdef notdef - encrypt_verbose = !server; -#endif - - str_suplen = 4; - - while (ep->type) { - if (encrypt_debug_mode) - printf(">>>%s: I will support %s\r\n", - Name, ENCTYPE_NAME(ep->type)); - i_support_encrypt |= typemask(ep->type); - i_support_decrypt |= typemask(ep->type); - if ((i_wont_support_decrypt & typemask(ep->type)) == 0) - if ((str_send[str_suplen++] = ep->type) == IAC) - str_send[str_suplen++] = IAC; - if (ep->init) - (*ep->init)(Server); - ++ep; - } - str_send[str_suplen++] = IAC; - str_send[str_suplen++] = SE; -} - - void -encrypt_list_types() -{ - Encryptions *ep = encryptions; - - printf("Valid encryption types:\n"); - while (ep->type) { - printf("\t%s (%d)\r\n", ENCTYPE_NAME(ep->type), ep->type); - ++ep; - } -} - - int -EncryptEnable(type, mode) - char *type, *mode; -{ - if (isprefix(type, "help") || isprefix(type, "?")) { - printf("Usage: encrypt enable [input|output]\n"); - encrypt_list_types(); - return(0); - } - if (EncryptType(type, mode)) - return(EncryptStart(mode)); - return(0); -} - - int -EncryptDisable(type, mode) - char *type, *mode; -{ - register Encryptions *ep; - int ret = 0; - - if (isprefix(type, "help") || isprefix(type, "?")) { - printf("Usage: encrypt disable [input|output]\n"); - encrypt_list_types(); - } else if ((ep = (Encryptions *)genget(type, encryptions, - sizeof(Encryptions))) == 0) { - printf("%s: invalid encryption type\n", type); - } else if (Ambiguous(ep)) { - printf("Ambiguous type '%s'\n", type); - } else { - if ((mode == 0) || (isprefix(mode, "input") ? 1 : 0)) { - if (decrypt_mode == ep->type) - EncryptStopInput(); - i_wont_support_decrypt |= typemask(ep->type); - ret = 1; - } - if ((mode == 0) || (isprefix(mode, "output"))) { - if (encrypt_mode == ep->type) - EncryptStopOutput(); - i_wont_support_encrypt |= typemask(ep->type); - ret = 1; - } - if (ret == 0) - printf("%s: invalid encryption mode\n", mode); - } - return(ret); -} - - int -EncryptType(type, mode) - char *type; - char *mode; -{ - register Encryptions *ep; - int ret = 0; - - if (isprefix(type, "help") || isprefix(type, "?")) { - printf("Usage: encrypt type [input|output]\n"); - encrypt_list_types(); - } else if ((ep = (Encryptions *)genget(type, encryptions, - sizeof(Encryptions))) == 0) { - printf("%s: invalid encryption type\n", type); - } else if (Ambiguous(ep)) { - printf("Ambiguous type '%s'\n", type); - } else { - if ((mode == 0) || isprefix(mode, "input")) { - decrypt_mode = ep->type; - i_wont_support_decrypt &= ~typemask(ep->type); - ret = 1; - } - if ((mode == 0) || isprefix(mode, "output")) { - encrypt_mode = ep->type; - i_wont_support_encrypt &= ~typemask(ep->type); - ret = 1; - } - if (ret == 0) - printf("%s: invalid encryption mode\n", mode); - } - return(ret); -} - - int -EncryptStart(mode) - char *mode; -{ - register int ret = 0; - if (mode) { - if (isprefix(mode, "input")) - return(EncryptStartInput()); - if (isprefix(mode, "output")) - return(EncryptStartOutput()); - if (isprefix(mode, "help") || isprefix(mode, "?")) { - printf("Usage: encrypt start [input|output]\n"); - return(0); - } - printf("%s: invalid encryption mode 'encrypt start ?' for help\n", mode); - return(0); - } - ret += EncryptStartInput(); - ret += EncryptStartOutput(); - return(ret); -} - - int -EncryptStartInput() -{ - if (decrypt_mode) { - encrypt_send_request_start(); - return(1); - } - printf("No previous decryption mode, decryption not enabled\r\n"); - return(0); -} - - int -EncryptStartOutput() -{ - if (encrypt_mode) { - encrypt_start_output(encrypt_mode); - return(1); - } - printf("No previous encryption mode, encryption not enabled\r\n"); - return(0); -} - - int -EncryptStop(mode) - char *mode; -{ - int ret = 0; - if (mode) { - if (isprefix(mode, "input")) - return(EncryptStopInput()); - if (isprefix(mode, "output")) - return(EncryptStopOutput()); - if (isprefix(mode, "help") || isprefix(mode, "?")) { - printf("Usage: encrypt stop [input|output]\n"); - return(0); - } - printf("%s: invalid encryption mode 'encrypt stop ?' for help\n", mode); - return(0); - } - ret += EncryptStopInput(); - ret += EncryptStopOutput(); - return(ret); -} - - int -EncryptStopInput() -{ - encrypt_send_request_end(); - return(1); -} - - int -EncryptStopOutput() -{ - encrypt_send_end(); - return(1); -} - - void -encrypt_display() -{ - if (encrypt_output) - printf("Currently encrypting output with %s\r\n", - ENCTYPE_NAME(encrypt_mode)); - if (decrypt_input) - printf("Currently decrypting input with %s\r\n", - ENCTYPE_NAME(decrypt_mode)); -} - - int -EncryptStatus() -{ - if (encrypt_output) - printf("Currently encrypting output with %s\r\n", - ENCTYPE_NAME(encrypt_mode)); - else if (encrypt_mode) { - printf("Currently output is clear text.\r\n"); - printf("Last encryption mode was %s\r\n", - ENCTYPE_NAME(encrypt_mode)); - } - if (decrypt_input) { - printf("Currently decrypting input with %s\r\n", - ENCTYPE_NAME(decrypt_mode)); - } else if (decrypt_mode) { - printf("Currently input is clear text.\r\n"); - printf("Last decryption mode was %s\r\n", - ENCTYPE_NAME(decrypt_mode)); - } - return 1; -} - - void -encrypt_send_support() -{ - if (str_suplen) { - /* - * If the user has requested that decryption start - * immediatly, then send a "REQUEST START" before - * we negotiate the type. - */ - if (!Server && autodecrypt) - encrypt_send_request_start(); - net_write(str_send, str_suplen); - printsub('>', &str_send[2], str_suplen - 2); - str_suplen = 0; - } -} - - int -EncryptDebug(on) - int on; -{ - if (on < 0) - encrypt_debug_mode ^= 1; - else - encrypt_debug_mode = on; - printf("Encryption debugging %s\r\n", - encrypt_debug_mode ? "enabled" : "disabled"); - return(1); -} - - int -EncryptVerbose(on) - int on; -{ - if (on < 0) - encrypt_verbose ^= 1; - else - encrypt_verbose = on; - printf("Encryption %s verbose\r\n", - encrypt_verbose ? "is" : "is not"); - return(1); -} - - int -EncryptAutoEnc(on) - int on; -{ - encrypt_auto(on); - printf("Automatic encryption of output is %s\r\n", - autoencrypt ? "enabled" : "disabled"); - return(1); -} - - int -EncryptAutoDec(on) - int on; -{ - decrypt_auto(on); - printf("Automatic decryption of input is %s\r\n", - autodecrypt ? "enabled" : "disabled"); - return(1); -} - -/* - * Called when ENCRYPT SUPPORT is received. - */ - void -encrypt_support(typelist, cnt) - unsigned char *typelist; - int cnt; -{ - register int type, use_type = 0; - Encryptions *ep; - - /* - * Forget anything the other side has previously told us. - */ - remote_supports_decrypt = 0; - - while (cnt-- > 0) { - type = *typelist++; - if (encrypt_debug_mode) - printf(">>>%s: He is supporting %s (%d)\r\n", - Name, - ENCTYPE_NAME(type), type); - if ((type < ENCTYPE_CNT) && - (I_SUPPORT_ENCRYPT & typemask(type))) { - remote_supports_decrypt |= typemask(type); - if (use_type == 0) - use_type = type; - } - } - if (use_type) { - ep = findencryption(use_type); - if (!ep) - return; - type = ep->start ? (*ep->start)(DIR_ENCRYPT, Server) : 0; - if (encrypt_debug_mode) - printf(">>>%s: (*ep->start)() returned %d\r\n", - Name, type); - if (type < 0) - return; - encrypt_mode = use_type; - if (type == 0) - encrypt_start_output(use_type); - } -} - - void -encrypt_is(data, cnt) - unsigned char *data; - int cnt; -{ - Encryptions *ep; - register int type, ret; - - if (--cnt < 0) - return; - type = *data++; - if (type < ENCTYPE_CNT) - remote_supports_encrypt |= typemask(type); - if (!(ep = finddecryption(type))) { - if (encrypt_debug_mode) - printf(">>>%s: Can't find type %s (%d) for initial negotiation\r\n", - Name, - ENCTYPE_NAME_OK(type) - ? ENCTYPE_NAME(type) : "(unknown)", - type); - return; - } - if (!ep->is) { - if (encrypt_debug_mode) - printf(">>>%s: No initial negotiation needed for type %s (%d)\r\n", - Name, - ENCTYPE_NAME_OK(type) - ? ENCTYPE_NAME(type) : "(unknown)", - type); - ret = 0; - } else { - ret = (*ep->is)(data, cnt); - if (encrypt_debug_mode) - printf("(*ep->is)(%x, %d) returned %s(%d)\n", data, cnt, - (ret < 0) ? "FAIL " : - (ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret); - } - if (ret < 0) { - autodecrypt = 0; - } else { - decrypt_mode = type; - if (ret == 0 && autodecrypt) - encrypt_send_request_start(); - } -} - - void -encrypt_reply(data, cnt) - unsigned char *data; - int cnt; -{ - Encryptions *ep; - register int ret, type; - - if (--cnt < 0) - return; - type = *data++; - if (!(ep = findencryption(type))) { - if (encrypt_debug_mode) - printf(">>>%s: Can't find type %s (%d) for initial negotiation\r\n", - Name, - ENCTYPE_NAME_OK(type) - ? ENCTYPE_NAME(type) : "(unknown)", - type); - return; - } - if (!ep->reply) { - if (encrypt_debug_mode) - printf(">>>%s: No initial negotiation needed for type %s (%d)\r\n", - Name, - ENCTYPE_NAME_OK(type) - ? ENCTYPE_NAME(type) : "(unknown)", - type); - ret = 0; - } else { - ret = (*ep->reply)(data, cnt); - if (encrypt_debug_mode) - printf("(*ep->reply)(%x, %d) returned %s(%d)\n", - data, cnt, - (ret < 0) ? "FAIL " : - (ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret); - } - if (encrypt_debug_mode) - printf(">>>%s: encrypt_reply returned %d\n", Name, ret); - if (ret < 0) { - autoencrypt = 0; - } else { - encrypt_mode = type; - if (ret == 0 && autoencrypt) - encrypt_start_output(type); - } -} - -/* - * Called when a ENCRYPT START command is received. - */ - void -encrypt_start(data, cnt) - unsigned char *data; - int cnt; -{ - Encryptions *ep; - - if (!decrypt_mode) { - /* - * Something is wrong. We should not get a START - * command without having already picked our - * decryption scheme. Send a REQUEST-END to - * attempt to clear the channel... - */ - printf("%s: Warning, Cannot decrypt input stream!!!\r\n", Name); - encrypt_send_request_end(); - return; - } - - if (ep = finddecryption(decrypt_mode)) { - decrypt_input = ep->input; - if (encrypt_verbose) - printf("[ Input is now decrypted with type %s ]\r\n", - ENCTYPE_NAME(decrypt_mode)); - if (encrypt_debug_mode) - printf(">>>%s: Start to decrypt input with type %s\r\n", - Name, ENCTYPE_NAME(decrypt_mode)); - } else { - printf("%s: Warning, Cannot decrypt type %s (%d)!!!\r\n", - Name, - ENCTYPE_NAME_OK(decrypt_mode) - ? ENCTYPE_NAME(decrypt_mode) - : "(unknown)", - decrypt_mode); - encrypt_send_request_end(); - } -} - - void -encrypt_session_key(key, server) - Session_Key *key; - int server; -{ - Encryptions *ep = encryptions; - - havesessionkey = 1; - - while (ep->type) { - if (ep->session) - (*ep->session)(key, server); -#ifdef notdef - if (!encrypt_output && autoencrypt && !server) - encrypt_start_output(ep->type); - if (!decrypt_input && autodecrypt && !server) - encrypt_send_request_start(); -#endif - ++ep; - } -} - -/* - * Called when ENCRYPT END is received. - */ - void -encrypt_end() -{ - decrypt_input = 0; - if (encrypt_debug_mode) - printf(">>>%s: Input is back to clear text\r\n", Name); - if (encrypt_verbose) - printf("[ Input is now clear text ]\r\n"); -} - -/* - * Called when ENCRYPT REQUEST-END is received. - */ - void -encrypt_request_end() -{ - encrypt_send_end(); -} - -/* - * Called when ENCRYPT REQUEST-START is received. If we receive - * this before a type is picked, then that indicates that the - * other side wants us to start encrypting data as soon as we - * can. - */ - void -encrypt_request_start(data, cnt) - unsigned char *data; - int cnt; -{ - if (encrypt_mode == 0) { - if (Server) - autoencrypt = 1; - return; - } - encrypt_start_output(encrypt_mode); -} - -static unsigned char str_keyid[(MAXKEYLEN*2)+5] = { IAC, SB, TELOPT_ENCRYPT }; - -encrypt_enc_keyid(keyid, len) - unsigned char *keyid; - int len; -{ - encrypt_keyid(&ki[1], keyid, len); -} - -encrypt_dec_keyid(keyid, len) - unsigned char *keyid; - int len; -{ - encrypt_keyid(&ki[0], keyid, len); -} - -encrypt_keyid(kp, keyid, len) - struct key_info *kp; - unsigned char *keyid; - int len; -{ - Encryptions *ep; - unsigned char *strp, *cp; - int dir = kp->dir; - register int ret = 0; - - if (!(ep = (*kp->getcrypt)(*kp->modep))) { - if (len == 0) - return; - kp->keylen = 0; - } else if (len == 0) { - /* - * Empty option, indicates a failure. - */ - if (kp->keylen == 0) - return; - kp->keylen = 0; - if (ep->keyid) - (void)(*ep->keyid)(dir, kp->keyid, &kp->keylen); - - } else if ((len != kp->keylen) || - (memcmp(keyid, kp->keyid, len) != 0)) { - /* - * Length or contents are different - */ - kp->keylen = len; - memmove(kp->keyid, keyid, len); - if (ep->keyid) - (void)(*ep->keyid)(dir, kp->keyid, &kp->keylen); - } else { - if (ep->keyid) - ret = (*ep->keyid)(dir, kp->keyid, &kp->keylen); - if ((ret == 0) && (dir == DIR_ENCRYPT) && autoencrypt) - encrypt_start_output(*kp->modep); - return; - } - - encrypt_send_keyid(dir, kp->keyid, kp->keylen, 0); -} - - void -encrypt_send_keyid(dir, keyid, keylen, saveit) - int dir; - unsigned char *keyid; - int keylen; - int saveit; -{ - unsigned char *strp; - - str_keyid[3] = (dir == DIR_ENCRYPT) - ? ENCRYPT_ENC_KEYID : ENCRYPT_DEC_KEYID; - if (saveit) { - struct key_info *kp = &ki[(dir == DIR_ENCRYPT) ? 0 : 1]; - memmove(kp->keyid, keyid, keylen); - kp->keylen = keylen; - } - - for (strp = &str_keyid[4]; keylen > 0; --keylen) { - if ((*strp++ = *keyid++) == IAC) - *strp++ = IAC; - } - *strp++ = IAC; - *strp++ = SE; - net_write(str_keyid, strp - str_keyid); - printsub('>', &str_keyid[2], strp - str_keyid - 2); -} - - void -encrypt_auto(on) - int on; -{ - if (on < 0) - autoencrypt ^= 1; - else - autoencrypt = on ? 1 : 0; -} - - void -decrypt_auto(on) - int on; -{ - if (on < 0) - autodecrypt ^= 1; - else - autodecrypt = on ? 1 : 0; -} - - void -encrypt_start_output(type) - int type; -{ - Encryptions *ep; - register unsigned char *p; - register int i; - - if (!(ep = findencryption(type))) { - if (encrypt_debug_mode) { - printf(">>>%s: Can't encrypt with type %s (%d)\r\n", - Name, - ENCTYPE_NAME_OK(type) - ? ENCTYPE_NAME(type) : "(unknown)", - type); - } - return; - } - if (ep->start) { - i = (*ep->start)(DIR_ENCRYPT, Server); - if (encrypt_debug_mode) { - printf(">>>%s: Encrypt start: %s (%d) %s\r\n", - Name, - (i < 0) ? "failed" : - "initial negotiation in progress", - i, ENCTYPE_NAME(type)); - } - if (i) - return; - } - p = str_start + 3; - *p++ = ENCRYPT_START; - for (i = 0; i < ki[0].keylen; ++i) { - if ((*p++ = ki[0].keyid[i]) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - net_write(str_start, p - str_start); - net_encrypt(); - printsub('>', &str_start[2], p - &str_start[2]); - /* - * If we are already encrypting in some mode, then - * encrypt the ring (which includes our request) in - * the old mode, mark it all as "clear text" and then - * switch to the new mode. - */ - encrypt_output = ep->output; - encrypt_mode = type; - if (encrypt_debug_mode) - printf(">>>%s: Started to encrypt output with type %s\r\n", - Name, ENCTYPE_NAME(type)); - if (encrypt_verbose) - printf("[ Output is now encrypted with type %s ]\r\n", - ENCTYPE_NAME(type)); -} - - void -encrypt_send_end() -{ - if (!encrypt_output) - return; - - str_end[3] = ENCRYPT_END; - net_write(str_end, sizeof(str_end)); - net_encrypt(); - printsub('>', &str_end[2], sizeof(str_end) - 2); - /* - * Encrypt the output buffer now because it will not be done by - * netflush... - */ - encrypt_output = 0; - if (encrypt_debug_mode) - printf(">>>%s: Output is back to clear text\r\n", Name); - if (encrypt_verbose) - printf("[ Output is now clear text ]\r\n"); -} - - void -encrypt_send_request_start() -{ - register unsigned char *p; - register int i; - - p = &str_start[3]; - *p++ = ENCRYPT_REQSTART; - for (i = 0; i < ki[1].keylen; ++i) { - if ((*p++ = ki[1].keyid[i]) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - net_write(str_start, p - str_start); - printsub('>', &str_start[2], p - &str_start[2]); - if (encrypt_debug_mode) - printf(">>>%s: Request input to be encrypted\r\n", Name); -} - - void -encrypt_send_request_end() -{ - str_end[3] = ENCRYPT_REQEND; - net_write(str_end, sizeof(str_end)); - printsub('>', &str_end[2], sizeof(str_end) - 2); - - if (encrypt_debug_mode) - printf(">>>%s: Request input to be clear text\r\n", Name); -} - - void -encrypt_wait() -{ - register int encrypt, decrypt; - if (encrypt_debug_mode) - printf(">>>%s: in encrypt_wait\r\n", Name); - if (!havesessionkey || !(I_SUPPORT_ENCRYPT & remote_supports_decrypt)) - return; - while (autoencrypt && !encrypt_output) - if (telnet_spin()) - return; -} - - void -encrypt_debug(mode) - int mode; -{ - encrypt_debug_mode = mode; -} - - void -encrypt_gen_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char tbuf[16], *cp; - - cnt -= 2; - data += 2; - buf[buflen-1] = '\0'; - buf[buflen-2] = '*'; - buflen -= 2;; - for (; cnt > 0; cnt--, data++) { - sprintf(tbuf, " %d", *data); - for (cp = tbuf; *cp && buflen > 0; --buflen) - *buf++ = *cp++; - if (buflen <= 0) - return; - } - *buf = '\0'; -} - - void -encrypt_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - Encryptions *ep; - register int type = data[1]; - - for (ep = encryptions; ep->type && ep->type != type; ep++) - ; - - if (ep->printsub) - (*ep->printsub)(data, cnt, buf, buflen); - else - encrypt_gen_printsub(data, cnt, buf, buflen); -} -#endif /* ENCRYPTION */ diff --git a/secure/lib/libtelnet/encrypt.h b/secure/lib/libtelnet/encrypt.h deleted file mode 100644 index e0ae385f13f39..0000000000000 --- a/secure/lib/libtelnet/encrypt.h +++ /dev/null @@ -1,108 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)encrypt.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifdef ENCRYPTION -# ifndef __ENCRYPTION__ -# define __ENCRYPTION__ - -#define DIR_DECRYPT 1 -#define DIR_ENCRYPT 2 - -typedef unsigned char Block[8]; -typedef unsigned char *BlockT; -typedef struct { Block _; } Schedule[16]; - -#define VALIDKEY(key) ( key[0] | key[1] | key[2] | key[3] | \ - key[4] | key[5] | key[6] | key[7]) - -#define SAMEKEY(k1, k2) (!bcmp((void *)k1, (void *)k2, sizeof(Block))) - -typedef struct { - short type; - int length; - unsigned char *data; -} Session_Key; - -# if !defined(P) -# ifdef __STDC__ -# define P(x) x -# else -# define P(x) () -# endif -# endif - -typedef struct { - char *name; - int type; - void (*output) P((unsigned char *, int)); - int (*input) P((int)); - void (*init) P((int)); - int (*start) P((int, int)); - int (*is) P((unsigned char *, int)); - int (*reply) P((unsigned char *, int)); - void (*session) P((Session_Key *, int)); - int (*keyid) P((int, unsigned char *, int *)); - void (*printsub) P((unsigned char *, int, unsigned char *, int)); -} Encryptions; - -#define SK_DES 1 /* Matched Kerberos v5 KEYTYPE_DES */ - -#include "enc-proto.h" - -extern int encrypt_debug_mode; -extern int (*decrypt_input) P((int)); -extern void (*encrypt_output) P((unsigned char *, int)); -# endif /* __ENCRYPTION__ */ -#endif /* ENCRYPTION */ diff --git a/secure/lib/libtelnet/genget.c b/secure/lib/libtelnet/genget.c deleted file mode 100644 index f87fcf0a5d438..0000000000000 --- a/secure/lib/libtelnet/genget.c +++ /dev/null @@ -1,105 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)genget.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - - -#include - -#define LOWER(x) (isupper(x) ? tolower(x) : (x)) -/* - * The prefix function returns 0 if *s1 is not a prefix - * of *s2. If *s1 exactly matches *s2, the negative of - * the length is returned. If *s1 is a prefix of *s2, - * the length of *s1 is returned. - */ - int -isprefix(s1, s2) - register char *s1, *s2; -{ - register int n = 0; - char *os1; - register char c1, c2; - - if (*s1 == '\0') - return(-1); - os1 = s1; - c1 = *s1; - c2 = *s2; - while (LOWER(c1) == LOWER(c2)) { - if (c1 == '\0') - break; - c1 = *++s1; - c2 = *++s2; - } - return(*s1 ? 0 : (*s2 ? (s1 - os1) : (os1 - s1))); -} - -static char *ambiguous; /* special return value for command routines */ - - char ** -genget(name, table, stlen) - char *name; /* name to match */ - char **table; /* name entry in table */ - int stlen; -{ - register char **c, **found; - register int n; - - if (name == 0) - return 0; - - found = 0; - for (c = table; *c != 0; c = (char **)((char *)c + stlen)) { - if ((n = isprefix(name, *c)) == 0) - continue; - if (n < 0) /* exact match */ - return(c); - if (found) - return(&ambiguous); - found = c; - } - return(found); -} - -/* - * Function call version of Ambiguous() - */ - int -Ambiguous(s) - char *s; -{ - return((char **)s == &ambiguous); -} diff --git a/secure/lib/libtelnet/getent.c b/secure/lib/libtelnet/getent.c deleted file mode 100644 index 05626f11d4135..0000000000000 --- a/secure/lib/libtelnet/getent.c +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93"; -#endif /* not lint */ - -static char *area; - -/*ARGSUSED*/ -getent(cp, name) -char *cp, *name; -{ -#ifdef HAS_CGETENT - char *dba[2]; - - dba[0] = "/etc/gettytab"; - dba[1] = 0; - return((cgetent(&area, dba, name) == 0) ? 1 : 0); -#else - return(0); -#endif -} - -#ifndef SOLARIS -/*ARGSUSED*/ -char * -getstr(id, cpp) -char *id, **cpp; -{ -# ifdef HAS_CGETENT - char *answer; - return((cgetstr(area, id, &answer) > 0) ? answer : 0); -# else - return(0); -# endif -} -#endif diff --git a/secure/lib/libtelnet/kerberos.c b/secure/lib/libtelnet/kerberos.c deleted file mode 100644 index f0c8b8aef4ded..0000000000000 --- a/secure/lib/libtelnet/kerberos.c +++ /dev/null @@ -1,555 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifdef KRB4 -#include -#include -#include -#include /* BSD wont include this in krb.h, so we do it here */ -#include -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -#include "encrypt.h" -#include "auth.h" -#include "misc.h" - -int kerberos4_cksum P((unsigned char *, int)); -int kuserok P((AUTH_DAT *, char *)); - -extern auth_debug_mode; - -static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, - AUTHTYPE_KERBEROS_V4, }; -static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_NAME, }; - -#define KRB_AUTH 0 /* Authentication data follows */ -#define KRB_REJECT 1 /* Rejected (reason might follow) */ -#define KRB_ACCEPT 2 /* Accepted */ -#define KRB_CHALLENGE 3 /* Challenge for mutual auth. */ -#define KRB_RESPONSE 4 /* Response for mutual auth. */ - -#define KRB_SERVICE_NAME "rcmd" - -static KTEXT_ST auth; -static char name[ANAME_SZ]; -static AUTH_DAT adat = { 0 }; -#ifdef ENCRYPTION -static Block session_key = { 0 }; -static des_key_schedule sched; -static Block challenge = { 0 }; -#endif /* ENCRYPTION */ - - static int -Data(ap, type, d, c) - Authenticator *ap; - int type; - void *d; - int c; -{ - unsigned char *p = str_data + 4; - unsigned char *cd = (unsigned char *)d; - - if (c == -1) - c = strlen((char *)cd); - - if (auth_debug_mode) { - printf("%s:%d: [%d] (%d)", - str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY", - str_data[3], - type, c); - printd(d, c); - printf("\r\n"); - } - *p++ = ap->type; - *p++ = ap->way; - *p++ = type; - while (c-- > 0) { - if ((*p++ = *cd++) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - if (str_data[3] == TELQUAL_IS) - printsub('>', &str_data[2], p - (&str_data[2])); - return(net_write(str_data, p - str_data)); -} - - int -kerberos4_init(ap, server) - Authenticator *ap; - int server; -{ - FILE *fp; - - if (server) { - str_data[3] = TELQUAL_REPLY; - if ((fp = fopen(KEYFILE, "r")) == NULL) - return(0); - fclose(fp); - } else { - str_data[3] = TELQUAL_IS; - } - return(1); -} - -char dst_realm_buf[REALM_SZ], *dest_realm = NULL; -int dst_realm_sz = REALM_SZ; - - int -kerberos4_send(ap) - Authenticator *ap; -{ - KTEXT_ST auth; -#ifdef ENCRYPTION - Block enckey; -#endif /* ENCRYPTION */ - char instance[INST_SZ]; - char *realm; - char *krb_realmofhost(); - char *krb_get_phost(); - CREDENTIALS cred; - int r; - - printf("[ Trying KERBEROS4 ... ]\n"); - if (!UserNameRequested) { - if (auth_debug_mode) { - printf("Kerberos V4: no user name supplied\r\n"); - } - return(0); - } - - memset(instance, 0, sizeof(instance)); - - if (realm = krb_get_phost(RemoteHostName)) - strncpy(instance, realm, sizeof(instance)); - - instance[sizeof(instance)-1] = '\0'; - - realm = dest_realm ? dest_realm : krb_realmofhost(RemoteHostName); - - if (!realm) { - printf("Kerberos V4: no realm for %s\r\n", RemoteHostName); - return(0); - } - if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L)) { - printf("mk_req failed: %s\r\n", krb_err_txt[r]); - return(0); - } - if (r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred)) { - printf("get_cred failed: %s\r\n", krb_err_txt[r]); - return(0); - } - if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { - if (auth_debug_mode) - printf("Not enough room for user name\r\n"); - return(0); - } - if (auth_debug_mode) - printf("Sent %d bytes of authentication data\r\n", auth.length); - if (!Data(ap, KRB_AUTH, (void *)auth.dat, auth.length)) { - if (auth_debug_mode) - printf("Not enough room for authentication data\r\n"); - return(0); - } -#ifdef ENCRYPTION - /* - * If we are doing mutual authentication, get set up to send - * the challenge, and verify it when the response comes back. - */ - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - register int i; - - des_key_sched(&cred.session, sched); - des_init_random_number_generator(&cred.session); - des_new_random_key(&session_key); - des_ecb_encrypt(&session_key, &session_key, sched, 0); - des_ecb_encrypt(&session_key, &challenge, sched, 0); - /* - * Increment the challenge by 1, and encrypt it for - * later comparison. - */ - for (i = 7; i >= 0; --i) { - register int x; - x = (unsigned int)challenge[i] + 1; - challenge[i] = x; /* ignore overflow */ - if (x < 256) /* if no overflow, all done */ - break; - } - des_ecb_encrypt(&challenge, &challenge, sched, 1); - } -#endif /* ENCRYPTION */ - - if (auth_debug_mode) { - printf("CK: %d:", kerberos4_cksum(auth.dat, auth.length)); - printd(auth.dat, auth.length); - printf("\r\n"); - printf("Sent Kerberos V4 credentials to server\r\n"); - } - return(1); -} - - void -kerberos4_is(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ -#ifdef ENCRYPTION - Session_Key skey; - Block datablock; -#endif /* ENCRYPTION */ - char realm[REALM_SZ]; - char instance[INST_SZ]; - int r; - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB_AUTH: - if (krb_get_lrealm(realm, 1) != KSUCCESS) { - Data(ap, KRB_REJECT, (void *)"No local V4 Realm.", -1); - auth_finished(ap, AUTH_REJECT); - if (auth_debug_mode) - printf("No local realm\r\n"); - return; - } - memmove((void *)auth.dat, (void *)data, auth.length = cnt); - if (auth_debug_mode) { - printf("Got %d bytes of authentication data\r\n", cnt); - printf("CK: %d:", kerberos4_cksum(auth.dat, auth.length)); - printd(auth.dat, auth.length); - printf("\r\n"); - } - instance[0] = '*'; instance[1] = 0; - if (r = krb_rd_req(&auth, KRB_SERVICE_NAME, - instance, 0, &adat, "")) { - if (auth_debug_mode) - printf("Kerberos failed him as %s\r\n", name); - Data(ap, KRB_REJECT, (void *)krb_err_txt[r], -1); - auth_finished(ap, AUTH_REJECT); - return; - } -#ifdef ENCRYPTION - memmove((void *)session_key, (void *)adat.session, sizeof(Block)); -#endif /* ENCRYPTION */ - krb_kntoln(&adat, name); - - if (UserNameRequested && !kuserok(&adat, UserNameRequested)) - Data(ap, KRB_ACCEPT, (void *)0, 0); - else - Data(ap, KRB_REJECT, - (void *)"user is not authorized", -1); - auth_finished(ap, AUTH_USER); - break; - - case KRB_CHALLENGE: -#ifndef ENCRYPTION - Data(ap, KRB_RESPONSE, (void *)0, 0); -#else /* ENCRYPTION */ - if (!VALIDKEY(session_key)) { - /* - * We don't have a valid session key, so just - * send back a response with an empty session - * key. - */ - Data(ap, KRB_RESPONSE, (void *)0, 0); - break; - } - - /* - * Initialize the random number generator since it's - * used later on by the encryption routine. - */ - des_init_random_number_generator(&session_key); - des_key_sched(&session_key, sched); - memmove((void *)datablock, (void *)data, sizeof(Block)); - /* - * Take the received encrypted challenge, and encrypt - * it again to get a unique session_key for the - * ENCRYPT option. - */ - des_ecb_encrypt(&datablock, &session_key, sched, 1); - skey.type = SK_DES; - skey.length = 8; - skey.data = session_key; - encrypt_session_key(&skey, 1); - /* - * Now decrypt the received encrypted challenge, - * increment by one, re-encrypt it and send it back. - */ - des_ecb_encrypt(&datablock, &challenge, sched, 0); - for (r = 7; r >= 0; r--) { - register int t; - t = (unsigned int)challenge[r] + 1; - challenge[r] = t; /* ignore overflow */ - if (t < 256) /* if no overflow, all done */ - break; - } - des_ecb_encrypt(&challenge, &challenge, sched, 1); - Data(ap, KRB_RESPONSE, (void *)challenge, sizeof(challenge)); -#endif /* ENCRYPTION */ - break; - - default: - if (auth_debug_mode) - printf("Unknown Kerberos option %d\r\n", data[-1]); - Data(ap, KRB_REJECT, 0, 0); - break; - } -} - - void -kerberos4_reply(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ -#ifdef ENCRYPTION - Session_Key skey; -#endif /* ENCRYPTION */ - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB_REJECT: - if (cnt > 0) { - printf("[ Kerberos V4 refuses authentication because %.*s ]\r\n", - cnt, data); - } else - printf("[ Kerberos V4 refuses authentication ]\r\n"); - auth_send_retry(); - return; - case KRB_ACCEPT: - printf("[ Kerberos V4 accepts you ]\n"); - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - /* - * Send over the encrypted challenge. - */ -#ifndef ENCRYPTION - Data(ap, KRB_CHALLENGE, (void *)0, 0); -#else /* ENCRYPTION */ - Data(ap, KRB_CHALLENGE, (void *)session_key, - sizeof(session_key)); - des_ecb_encrypt(&session_key, &session_key, sched, 1); - skey.type = SK_DES; - skey.length = 8; - skey.data = session_key; - encrypt_session_key(&skey, 0); -#endif /* ENCRYPTION */ - return; - } - auth_finished(ap, AUTH_USER); - return; - case KRB_RESPONSE: -#ifdef ENCRYPTION - /* - * Verify that the response to the challenge is correct. - */ - if ((cnt != sizeof(Block)) || - (0 != memcmp((void *)data, (void *)challenge, - sizeof(challenge)))) - { -#endif /* ENCRYPTION */ - printf("[ Kerberos V4 challenge failed!!! ]\r\n"); - auth_send_retry(); - return; -#ifdef ENCRYPTION - } - printf("[ Kerberos V4 challenge successful ]\r\n"); - auth_finished(ap, AUTH_USER); -#endif /* ENCRYPTION */ - break; - default: - if (auth_debug_mode) - printf("Unknown Kerberos option %d\r\n", data[-1]); - return; - } -} - - int -kerberos4_status(ap, name, level) - Authenticator *ap; - char *name; - int level; -{ - if (level < AUTH_USER) - return(level); - - if (UserNameRequested && !kuserok(&adat, UserNameRequested)) { - strcpy(name, UserNameRequested); - return(AUTH_VALID); - } else - return(AUTH_USER); -} - -#define BUMP(buf, len) while (*(buf)) {++(buf), --(len);} -#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);} - - void -kerberos4_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - - buf[buflen-1] = '\0'; /* make sure its NULL terminated */ - buflen -= 1; - - switch(data[3]) { - case KRB_REJECT: /* Rejected (reason might follow) */ - strncpy((char *)buf, " REJECT ", buflen); - goto common; - - case KRB_ACCEPT: /* Accepted (name might follow) */ - strncpy((char *)buf, " ACCEPT ", buflen); - common: - BUMP(buf, buflen); - if (cnt <= 4) - break; - ADDC(buf, buflen, '"'); - for (i = 4; i < cnt; i++) - ADDC(buf, buflen, data[i]); - ADDC(buf, buflen, '"'); - ADDC(buf, buflen, '\0'); - break; - - case KRB_AUTH: /* Authentication data follows */ - strncpy((char *)buf, " AUTH", buflen); - goto common2; - - case KRB_CHALLENGE: - strncpy((char *)buf, " CHALLENGE", buflen); - goto common2; - - case KRB_RESPONSE: - strncpy((char *)buf, " RESPONSE", buflen); - goto common2; - - default: - sprintf(lbuf, " %d (unknown)", data[3]); - strncpy((char *)buf, lbuf, buflen); - common2: - BUMP(buf, buflen); - for (i = 4; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - strncpy((char *)buf, lbuf, buflen); - BUMP(buf, buflen); - } - break; - } -} - - int -kerberos4_cksum(d, n) - unsigned char *d; - int n; -{ - int ck = 0; - - /* - * A comment is probably needed here for those not - * well versed in the "C" language. Yes, this is - * supposed to be a "switch" with the body of the - * "switch" being a "while" statement. The whole - * purpose of the switch is to allow us to jump into - * the middle of the while() loop, and then not have - * to do any more switch()s. - * - * Some compilers will spit out a warning message - * about the loop not being entered at the top. - */ - switch (n&03) - while (n > 0) { - case 0: - ck ^= (int)*d++ << 24; - --n; - case 3: - ck ^= (int)*d++ << 16; - --n; - case 2: - ck ^= (int)*d++ << 8; - --n; - case 1: - ck ^= (int)*d++; - --n; - } - return(ck); -} -#endif - -#ifdef notdef - -prkey(msg, key) - char *msg; - unsigned char *key; -{ - register int i; - printf("%s:", msg); - for (i = 0; i < 8; i++) - printf(" %3d", key[i]); - printf("\r\n"); -} -#endif diff --git a/secure/lib/libtelnet/kerberos5.c b/secure/lib/libtelnet/kerberos5.c deleted file mode 100644 index 3f3f61f4fcf13..0000000000000 --- a/secure/lib/libtelnet/kerberos5.c +++ /dev/null @@ -1,764 +0,0 @@ -/* - * $Source: /home/ncvs/src/secure/lib/libtelnet/kerberos5.c,v $ - * $Author: pst $ - * $Id: kerberos5.c,v 1.3 1995/07/20 11:39:23 pst Exp $ - */ - -#if !defined(lint) && !defined(SABER) -static -#ifdef __STDC__ -const -#endif -char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 1.3 1995/07/20 11:39:23 pst Exp $"; -#endif /* lint */ - -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)kerberos5.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - - -#ifdef KRB5 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* kerberos 5 include files (ext-proto.h) will get an appropriate stdlib.h - and string.h/strings.h */ - -#include "encrypt.h" -#include "auth.h" -#include "misc.h" - -extern auth_debug_mode; - -#ifdef FORWARD -int forward_flags = 0; /* Flags get set in telnet/main.c on -f and -F */ - -/* These values need to be the same as those defined in telnet/main.c. */ -/* Either define them in both places, or put in some common header file. */ -#define OPTS_FORWARD_CREDS 0x00000002 -#define OPTS_FORWARDABLE_CREDS 0x00000001 - -void kerberos5_forward(); - -#endif /* FORWARD */ - -static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, - AUTHTYPE_KERBEROS_V5, }; -/*static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_NAME, };*/ - -#define KRB_AUTH 0 /* Authentication data follows */ -#define KRB_REJECT 1 /* Rejected (reason might follow) */ -#define KRB_ACCEPT 2 /* Accepted */ -#define KRB_RESPONSE 3 /* Response for mutual auth. */ - -#ifdef FORWARD -#define KRB_FORWARD 4 /* Forwarded credentials follow */ -#define KRB_FORWARD_ACCEPT 5 /* Forwarded credentials accepted */ -#define KRB_FORWARD_REJECT 6 /* Forwarded credentials rejected */ -#endif /* FORWARD */ - -static krb5_data auth; - /* telnetd gets session key from here */ -static krb5_tkt_authent *authdat = NULL; -/* telnet matches the AP_REQ and AP_REP with this */ -static krb5_authenticator authenticator; - -/* some compilers can't hack void *, so we use the Kerberos krb5_pointer, - which is either void * or char *, depending on the compiler. */ - -#define Voidptr krb5_pointer - -Block session_key; - - static int -Data(ap, type, d, c) - Authenticator *ap; - int type; - Voidptr d; - int c; -{ - unsigned char *p = str_data + 4; - unsigned char *cd = (unsigned char *)d; - - if (c == -1) - c = strlen((char *)cd); - - if (auth_debug_mode) { - printf("%s:%d: [%d] (%d)", - str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY", - str_data[3], - type, c); - printd(d, c); - printf("\r\n"); - } - *p++ = ap->type; - *p++ = ap->way; - *p++ = type; - while (c-- > 0) { - if ((*p++ = *cd++) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - if (str_data[3] == TELQUAL_IS) - printsub('>', &str_data[2], p - &str_data[2]); - return(net_write(str_data, p - str_data)); -} - - int -kerberos5_init(ap, server) - Authenticator *ap; - int server; -{ - if (server) - str_data[3] = TELQUAL_REPLY; - else - str_data[3] = TELQUAL_IS; - krb5_init_ets(); - return(1); -} - - int -kerberos5_send(ap) - Authenticator *ap; -{ - char **realms; - char *name; - char *p1, *p2; - krb5_checksum ksum; - krb5_octet sum[CRC32_CKSUM_LENGTH]; - krb5_principal server; - krb5_error_code r; - krb5_ccache ccache; - krb5_creds creds; /* telnet gets session key from here */ - extern krb5_flags krb5_kdc_default_options; - int ap_opts; - -#ifdef ENCRYPTION - krb5_keyblock *newkey = 0; -#endif /* ENCRYPTION */ - - ksum.checksum_type = CKSUMTYPE_CRC32; - ksum.contents = sum; - ksum.length = sizeof(sum); - memset((Voidptr )sum, 0, sizeof(sum)); - - if (!UserNameRequested) { - if (auth_debug_mode) { - printf("Kerberos V5: no user name supplied\r\n"); - } - return(0); - } - - if (r = krb5_cc_default(&ccache)) { - if (auth_debug_mode) { - printf("Kerberos V5: could not get default ccache\r\n"); - } - return(0); - } - - if ((name = malloc(strlen(RemoteHostName)+1)) == NULL) { - if (auth_debug_mode) - printf("Out of memory for hostname in Kerberos V5\r\n"); - return(0); - } - - if (r = krb5_get_host_realm(RemoteHostName, &realms)) { - if (auth_debug_mode) - printf("Kerberos V5: no realm for %s\r\n", RemoteHostName); - free(name); - return(0); - } - - p1 = RemoteHostName; - p2 = name; - - while (*p2 = *p1++) { - if (isupper(*p2)) - *p2 |= 040; - ++p2; - } - - if (r = krb5_build_principal_ext(&server, - strlen(realms[0]), realms[0], - 4, "host", - p2 - name, name, - 0)) { - if (auth_debug_mode) { - printf("Kerberos V5: failure setting up principal (%s)\r\n", - error_message(r)); - } - free(name); - krb5_free_host_realm(realms); - return(0); - } - - - memset((char *)&creds, 0, sizeof(creds)); - creds.server = server; - - if (r = krb5_cc_get_principal(ccache, &creds.client)) { - if (auth_debug_mode) { - printf("Kerberos V5: failure on principal (%s)\r\n", - error_message(r)); - } - free(name); - krb5_free_principal(server); - krb5_free_host_realm(realms); - return(0); - } - - if (r = krb5_get_credentials(krb5_kdc_default_options, ccache, &creds)) { - if (auth_debug_mode) { - printf("Kerberos V5: failure on credentials(%d)\r\n",r); - } - free(name); - krb5_free_host_realm(realms); - krb5_free_principal(server); - return(0); - } - - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) - ap_opts = AP_OPTS_MUTUAL_REQUIRED; - else - ap_opts = 0; - - r = krb5_mk_req_extended(ap_opts, &ksum, krb5_kdc_default_options, 0, -#ifdef ENCRYPTION - &newkey, -#else /* ENCRYPTION */ - 0, -#endif /* ENCRYPTION */ - ccache, &creds, &authenticator, &auth); - /* don't let the key get freed if we clean up the authenticator */ - authenticator.subkey = 0; - - free(name); - krb5_free_host_realm(realms); - krb5_free_principal(server); -#ifdef ENCRYPTION - if (newkey) { - /* keep the key in our private storage, but don't use it - yet---see kerberos5_reply() below */ - if (newkey->keytype != KEYTYPE_DES) { - if (creds.keyblock.keytype == KEYTYPE_DES) - /* use the session key in credentials instead */ - memmove((char *)session_key, - (char *)creds.keyblock.contents, sizeof(Block)); - else - /* XXX ? */; - } else { - memmove((char *)session_key, (char *)newkey->contents, - sizeof(Block)); - } - krb5_free_keyblock(newkey); - } -#endif /* ENCRYPTION */ - if (r) { - if (auth_debug_mode) { - printf("Kerberos V5: mk_req failed (%s)\r\n", - error_message(r)); - } - return(0); - } - - if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { - if (auth_debug_mode) - printf("Not enough room for user name\r\n"); - return(0); - } - if (!Data(ap, KRB_AUTH, auth.data, auth.length)) { - if (auth_debug_mode) - printf("Not enough room for authentication data\r\n"); - return(0); - } - if (auth_debug_mode) { - printf("Sent Kerberos V5 credentials to server\r\n"); - } - return(1); -} - - void -kerberos5_is(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - int r; - struct hostent *hp; - char *p1, *p2; - static char *realm = NULL; - krb5_principal server; - krb5_ap_rep_enc_part reply; - krb5_data outbuf; -#ifdef ENCRYPTION - Session_Key skey; -#endif /* ENCRYPTION */ - char *name; - char *getenv(); - krb5_data inbuf; - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB_AUTH: - auth.data = (char *)data; - auth.length = cnt; - - if (!(hp = gethostbyname(LocalHostName))) { - if (auth_debug_mode) - printf("Cannot resolve local host name\r\n"); - Data(ap, KRB_REJECT, "Unknown local hostname.", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - - if (!realm && (krb5_get_default_realm(&realm))) { - if (auth_debug_mode) - printf("Could not get default realm\r\n"); - Data(ap, KRB_REJECT, "Could not get default realm.", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - - if ((name = malloc(strlen(hp->h_name)+1)) == NULL) { - if (auth_debug_mode) - printf("Out of memory for hostname in Kerberos V5\r\n"); - Data(ap, KRB_REJECT, "Out of memory.", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - - p1 = hp->h_name; - p2 = name; - - while (*p2 = *p1++) { - if (isupper(*p2)) - *p2 |= 040; - ++p2; - } - - if (authdat) - krb5_free_tkt_authent(authdat); - - r = krb5_build_principal_ext(&server, - strlen(realm), realm, - 4, "host", - p2 - name, name, - 0); - if (!r) { - r = krb5_rd_req_simple(&auth, server, 0, &authdat); - krb5_free_principal(server); - } - if (r) { - char errbuf[128]; - - errout: - authdat = 0; - (void) strcpy(errbuf, "Read req failed: "); - (void) strcat(errbuf, error_message(r)); - Data(ap, KRB_REJECT, errbuf, -1); - if (auth_debug_mode) - printf("%s\r\n", errbuf); - return; - } - free(name); - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - /* do ap_rep stuff here */ - reply.ctime = authdat->authenticator->ctime; - reply.cusec = authdat->authenticator->cusec; - reply.subkey = 0; /* use the one he gave us, so don't - need to return one here */ - reply.seq_number = 0; /* we don't do seq #'s. */ - - if (r = krb5_mk_rep(&reply, - authdat->authenticator->subkey ? - authdat->authenticator->subkey : - authdat->ticket->enc_part2->session, - &outbuf)) { - goto errout; - } - Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length); - } - if (krb5_unparse_name(authdat->ticket->enc_part2 ->client, - &name)) - name = 0; - Data(ap, KRB_ACCEPT, name, name ? -1 : 0); - if (auth_debug_mode) { - printf("Kerberos5 identifies him as ``%s''\r\n", - name ? name : ""); - } - auth_finished(ap, AUTH_USER); - - free(name); - if (authdat->authenticator->subkey && - authdat->authenticator->subkey->keytype == KEYTYPE_DES) { - memmove((Voidptr )session_key, - (Voidptr )authdat->authenticator->subkey->contents, - sizeof(Block)); - } else if (authdat->ticket->enc_part2->session->keytype == - KEYTYPE_DES) { - memmove((Voidptr )session_key, - (Voidptr )authdat->ticket->enc_part2->session->contents, - sizeof(Block)); - } else - break; - -#ifdef ENCRYPTION - skey.type = SK_DES; - skey.length = 8; - skey.data = session_key; - encrypt_session_key(&skey, 1); -#endif /* ENCRYPTION */ - break; -#ifdef FORWARD - case KRB_FORWARD: - inbuf.data = (char *)data; - inbuf.length = cnt; - if (r = rd_and_store_for_creds(&inbuf, authdat->ticket, - UserNameRequested)) { - char errbuf[128]; - - (void) strcpy(errbuf, "Read forwarded creds failed: "); - (void) strcat(errbuf, error_message(r)); - Data(ap, KRB_FORWARD_REJECT, errbuf, -1); - if (auth_debug_mode) - printf("Could not read forwarded credentials\r\n"); - } - else - Data(ap, KRB_FORWARD_ACCEPT, 0, 0); - if (auth_debug_mode) - printf("Forwarded credentials obtained\r\n"); - break; -#endif /* FORWARD */ - default: - if (auth_debug_mode) - printf("Unknown Kerberos option %d\r\n", data[-1]); - Data(ap, KRB_REJECT, 0, 0); - break; - } -} - - void -kerberos5_reply(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - static int mutual_complete = 0; - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB_REJECT: - if (cnt > 0) { - printf("[ Kerberos V5 refuses authentication because %.*s ]\r\n", - cnt, data); - } else - printf("[ Kerberos V5 refuses authentication ]\r\n"); - auth_send_retry(); - return; - case KRB_ACCEPT: - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL && - !mutual_complete) { - printf("[ Kerberos V5 accepted you, but didn't provide mutual authentication! ]\n"); - auth_send_retry(); - return; - } - if (cnt) - printf("[ Kerberos V5 accepts you as ``%.*s'' ]\n", cnt, data); - else - printf("[ Kerberos V5 accepts you ]\n"); - auth_finished(ap, AUTH_USER); -#ifdef FORWARD - if (forward_flags & OPTS_FORWARD_CREDS) - kerberos5_forward(ap); -#endif /* FORWARD */ - break; - case KRB_RESPONSE: - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - /* the rest of the reply should contain a krb_ap_rep */ - krb5_ap_rep_enc_part *reply; - krb5_data inbuf; - krb5_error_code r; - krb5_keyblock tmpkey; - - inbuf.length = cnt; - inbuf.data = (char *)data; - - tmpkey.keytype = KEYTYPE_DES; - tmpkey.contents = session_key; - tmpkey.length = sizeof(Block); - - if (r = krb5_rd_rep(&inbuf, &tmpkey, &reply)) { - printf("[ Mutual authentication failed: %s ]\n", - error_message(r)); - auth_send_retry(); - return; - } - if (reply->ctime != authenticator.ctime || - reply->cusec != authenticator.cusec) { - printf("[ Mutual authentication failed (mismatched KRB_AP_REP) ]\n"); - auth_send_retry(); - return; - } - krb5_free_ap_rep_enc_part(reply); -#ifdef ENCRYPTION - skey.type = SK_DES; - skey.length = 8; - skey.data = session_key; - encrypt_session_key(&skey, 0); -#endif /* ENCRYPTION */ - mutual_complete = 1; - } - return; -#ifdef FORWARD - case KRB_FORWARD_ACCEPT: - printf("[ Kerberos V5 accepted forwarded credentials ]\n"); - return; - case KRB_FORWARD_REJECT: - printf("[ Kerberos V5 refuses forwarded credentials because %.*s ]\r\n", - cnt, data); - return; -#endif /* FORWARD */ - default: - if (auth_debug_mode) - printf("Unknown Kerberos option %d\r\n", data[-1]); - return; - } -} - - int -kerberos5_status(ap, name, level) - Authenticator *ap; - char *name; - int level; -{ - if (level < AUTH_USER) - return(level); - - if (UserNameRequested && - krb5_kuserok(authdat->ticket->enc_part2->client, UserNameRequested)) - { - strcpy(name, UserNameRequested); - return(AUTH_VALID); - } else - return(AUTH_USER); -} - -#define BUMP(buf, len) while (*(buf)) {++(buf), --(len);} -#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);} - - void -kerberos5_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - - buf[buflen-1] = '\0'; /* make sure its NULL terminated */ - buflen -= 1; - - switch(data[3]) { - case KRB_REJECT: /* Rejected (reason might follow) */ - strncpy((char *)buf, " REJECT ", buflen); - goto common; - - case KRB_ACCEPT: /* Accepted (name might follow) */ - strncpy((char *)buf, " ACCEPT ", buflen); - common: - BUMP(buf, buflen); - if (cnt <= 4) - break; - ADDC(buf, buflen, '"'); - for (i = 4; i < cnt; i++) - ADDC(buf, buflen, data[i]); - ADDC(buf, buflen, '"'); - ADDC(buf, buflen, '\0'); - break; - - - case KRB_AUTH: /* Authentication data follows */ - strncpy((char *)buf, " AUTH", buflen); - goto common2; - - case KRB_RESPONSE: - strncpy((char *)buf, " RESPONSE", buflen); - goto common2; - -#ifdef FORWARD - case KRB_FORWARD: /* Forwarded credentials follow */ - strncpy((char *)buf, " FORWARD", buflen); - goto common2; - - case KRB_FORWARD_ACCEPT: /* Forwarded credentials accepted */ - strncpy((char *)buf, " FORWARD_ACCEPT", buflen); - goto common2; - - case KRB_FORWARD_REJECT: /* Forwarded credentials rejected */ - /* (reason might follow) */ - strncpy((char *)buf, " FORWARD_REJECT", buflen); - goto common2; -#endif /* FORWARD */ - - default: - sprintf(lbuf, " %d (unknown)", data[3]); - strncpy((char *)buf, lbuf, buflen); - common2: - BUMP(buf, buflen); - for (i = 4; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - strncpy((char *)buf, lbuf, buflen); - BUMP(buf, buflen); - } - break; - } -} - -#ifdef FORWARD - void -kerberos5_forward(ap) - Authenticator *ap; -{ - struct hostent *hp; - krb5_creds *local_creds; - krb5_error_code r; - krb5_data forw_creds; - extern krb5_cksumtype krb5_kdc_req_sumtype; - krb5_ccache ccache; - int i; - - if (!(local_creds = (krb5_creds *) - calloc(1, sizeof(*local_creds)))) { - if (auth_debug_mode) - printf("Kerberos V5: could not allocate memory for credentials\r\n"); - return; - } - - if (r = krb5_sname_to_principal(RemoteHostName, "host", 1, - &local_creds->server)) { - if (auth_debug_mode) - printf("Kerberos V5: could not build server name - %s\r\n", - error_message(r)); - krb5_free_creds(local_creds); - return; - } - - if (r = krb5_cc_default(&ccache)) { - if (auth_debug_mode) - printf("Kerberos V5: could not get default ccache - %s\r\n", - error_message(r)); - krb5_free_creds(local_creds); - return; - } - - if (r = krb5_cc_get_principal(ccache, &local_creds->client)) { - if (auth_debug_mode) - printf("Kerberos V5: could not get default principal - %s\r\n", - error_message(r)); - krb5_free_creds(local_creds); - return; - } - - /* Get ticket from credentials cache */ - if (r = krb5_get_credentials(KRB5_GC_CACHED, ccache, local_creds)) { - if (auth_debug_mode) - printf("Kerberos V5: could not obtain credentials - %s\r\n", - error_message(r)); - krb5_free_creds(local_creds); - return; - } - - if (r = get_for_creds(ETYPE_DES_CBC_CRC, - krb5_kdc_req_sumtype, - RemoteHostName, - local_creds->client, - &local_creds->keyblock, - forward_flags & OPTS_FORWARDABLE_CREDS, - &forw_creds)) { - if (auth_debug_mode) - printf("Kerberos V5: error getting forwarded creds - %s\r\n", - error_message(r)); - krb5_free_creds(local_creds); - return; - } - - /* Send forwarded credentials */ - if (!Data(ap, KRB_FORWARD, forw_creds.data, forw_creds.length)) { - if (auth_debug_mode) - printf("Not enough room for authentication data\r\n"); - } - else { - if (auth_debug_mode) - printf("Forwarded local Kerberos V5 credentials to server\r\n"); - } - - krb5_free_creds(local_creds); -} -#endif /* FORWARD */ - -#endif /* KRB5 */ diff --git a/secure/lib/libtelnet/key-proto.h b/secure/lib/libtelnet/key-proto.h deleted file mode 100644 index 9668a775be505..0000000000000 --- a/secure/lib/libtelnet/key-proto.h +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)key-proto.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifndef __KEY_PROTO__ -#define __KEY_PROTO__ - -#if !defined(P) -#ifdef __STDC__ -#define P(x) x -#else -#define P(x) () -#endif -#endif - -int key_file_exists P((void)); -void key_lookup P((unsigned char *, Block)); -void key_stream_init P((Block, Block, int)); -unsigned char key_stream P((int, int)); -#endif diff --git a/secure/lib/libtelnet/krb4encpwd.c b/secure/lib/libtelnet/krb4encpwd.c deleted file mode 100644 index 00f32e8532b9e..0000000000000 --- a/secure/lib/libtelnet/krb4encpwd.c +++ /dev/null @@ -1,446 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - - -#ifdef KRB4_ENCPWD -/* - * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION - * ALL RIGHTS RESERVED - * - * "Digital Equipment Corporation authorizes the reproduction, - * distribution and modification of this software subject to the following - * restrictions: - * - * 1. Any partial or whole copy of this software, or any modification - * thereof, must include this copyright notice in its entirety. - * - * 2. This software is supplied "as is" with no warranty of any kind, - * expressed or implied, for any purpose, including any warranty of fitness - * or merchantibility. DIGITAL assumes no responsibility for the use or - * reliability of this software, nor promises to provide any form of - * support for it on any basis. - * - * 3. Distribution of this software is authorized only if no profit or - * remuneration of any kind is received in exchange for such distribution. - * - * 4. This software produces public key authentication certificates - * bearing an expiration date established by DIGITAL and RSA Data - * Security, Inc. It may cease to generate certificates after the expiration - * date. Any modification of this software that changes or defeats - * the expiration date or its effect is unauthorized. - * - * 5. Software that will renew or extend the expiration date of - * authentication certificates produced by this software may be obtained - * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA - * 94065, (415)595-8782, or from DIGITAL" - * - */ - -#include -#include -#include -#include - -#include -#include -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -#include "encrypt.h" -#include "auth.h" -#include "misc.h" - -int krb_mk_encpwd_req P((KTEXT, char *, char *, char *, char *, char *, char *)); -int krb_rd_encpwd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *, char *, char *, char *)); - -extern auth_debug_mode; - -static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, - AUTHTYPE_KRB4_ENCPWD, }; -static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_NAME, }; - -#define KRB4_ENCPWD_AUTH 0 /* Authentication data follows */ -#define KRB4_ENCPWD_REJECT 1 /* Rejected (reason might follow) */ -#define KRB4_ENCPWD_ACCEPT 2 /* Accepted */ -#define KRB4_ENCPWD_CHALLENGE 3 /* Challenge for mutual auth. */ -#define KRB4_ENCPWD_ACK 4 /* Acknowledge */ - -#define KRB_SERVICE_NAME "rcmd" - -static KTEXT_ST auth; -static char name[ANAME_SZ]; -static char user_passwd[ANAME_SZ]; -static AUTH_DAT adat = { 0 }; -#ifdef ENCRYPTION -static Block session_key = { 0 }; -#endif /* ENCRYPTION */ -static Schedule sched; -static char challenge[REALM_SZ]; - - static int -Data(ap, type, d, c) - Authenticator *ap; - int type; - void *d; - int c; -{ - unsigned char *p = str_data + 4; - unsigned char *cd = (unsigned char *)d; - - if (c == -1) - c = strlen((char *)cd); - - if (0) { - printf("%s:%d: [%d] (%d)", - str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY", - str_data[3], - type, c); - printd(d, c); - printf("\r\n"); - } - *p++ = ap->type; - *p++ = ap->way; - *p++ = type; - while (c-- > 0) { - if ((*p++ = *cd++) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - if (str_data[3] == TELQUAL_IS) - printsub('>', &str_data[2], p - (&str_data[2])); - return(net_write(str_data, p - str_data)); -} - - int -krb4encpwd_init(ap, server) - Authenticator *ap; - int server; -{ - char hostname[80], *cp, *realm; - C_Block skey; - - if (server) { - str_data[3] = TELQUAL_REPLY; - } else { - str_data[3] = TELQUAL_IS; - gethostname(hostname, sizeof(hostname)); - realm = krb_realmofhost(hostname); - cp = strchr(hostname, '.'); - if (*cp != NULL) *cp = NULL; - if (read_service_key(KRB_SERVICE_NAME, hostname, realm, 0, - KEYFILE, (char *)skey)) { - return(0); - } - } - return(1); -} - - int -krb4encpwd_send(ap) - Authenticator *ap; -{ - - printf("[ Trying KRB4ENCPWD ... ]\n"); - if (!UserNameRequested) { - return(0); - } - if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { - return(0); - } - - if (!Data(ap, KRB4_ENCPWD_ACK, (void *)NULL, 0)) { - return(0); - } - - return(1); -} - - void -krb4encpwd_is(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - Block datablock; - char r_passwd[ANAME_SZ], r_user[ANAME_SZ]; - char lhostname[ANAME_SZ], *cp; - int r; - time_t now; - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB4_ENCPWD_AUTH: - memmove((void *)auth.dat, (void *)data, auth.length = cnt); - - gethostname(lhostname, sizeof(lhostname)); - if ((cp = strchr(lhostname, '.')) != 0) *cp = '\0'; - - if (r = krb_rd_encpwd_req(&auth, KRB_SERVICE_NAME, lhostname, 0, &adat, NULL, challenge, r_user, r_passwd)) { - Data(ap, KRB4_ENCPWD_REJECT, (void *)"Auth failed", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - auth_encrypt_userpwd(r_passwd); - if (passwdok(UserNameRequested, UserPassword) == 0) { - /* - * illegal username and password - */ - Data(ap, KRB4_ENCPWD_REJECT, (void *)"Illegal password", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - - memmove((void *)session_key, (void *)adat.session, sizeof(Block)); - Data(ap, KRB4_ENCPWD_ACCEPT, (void *)0, 0); - auth_finished(ap, AUTH_USER); - break; - - case KRB4_ENCPWD_CHALLENGE: - /* - * Take the received random challenge text and save - * for future authentication. - */ - memmove((void *)challenge, (void *)data, sizeof(Block)); - break; - - - case KRB4_ENCPWD_ACK: - /* - * Receive ack, if mutual then send random challenge - */ - - /* - * If we are doing mutual authentication, get set up to send - * the challenge, and verify it when the response comes back. - */ - - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - register int i; - - time(&now); - sprintf(challenge, "%x", now); - Data(ap, KRB4_ENCPWD_CHALLENGE, (void *)challenge, strlen(challenge)); - } - break; - - default: - Data(ap, KRB4_ENCPWD_REJECT, 0, 0); - break; - } -} - - - void -krb4encpwd_reply(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - KTEXT_ST krb_token; - Block enckey; - CREDENTIALS cred; - int r; - char randchal[REALM_SZ], instance[ANAME_SZ], *cp; - char hostname[80], *realm; - - if (cnt-- < 1) - return; - switch (*data++) { - case KRB4_ENCPWD_REJECT: - if (cnt > 0) { - printf("[ KRB4_ENCPWD refuses authentication because %.*s ]\r\n", - cnt, data); - } else - printf("[ KRB4_ENCPWD refuses authentication ]\r\n"); - auth_send_retry(); - return; - case KRB4_ENCPWD_ACCEPT: - printf("[ KRB4_ENCPWD accepts you ]\n"); - auth_finished(ap, AUTH_USER); - return; - case KRB4_ENCPWD_CHALLENGE: - /* - * Verify that the response to the challenge is correct. - */ - - gethostname(hostname, sizeof(hostname)); - realm = krb_realmofhost(hostname); - memmove((void *)challenge, (void *)data, cnt); - memset(user_passwd, 0, sizeof(user_passwd)); - local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); - UserPassword = user_passwd; - Challenge = challenge; - strcpy(instance, RemoteHostName); - if ((cp = strchr(instance, '.')) != 0) *cp = '\0'; - - if (r = krb_mk_encpwd_req(&krb_token, KRB_SERVICE_NAME, instance, realm, Challenge, UserNameRequested, user_passwd)) { - krb_token.length = 0; - } - - if (!Data(ap, KRB4_ENCPWD_AUTH, (void *)krb_token.dat, krb_token.length)) { - return; - } - - break; - - default: - return; - } -} - - int -krb4encpwd_status(ap, name, level) - Authenticator *ap; - char *name; - int level; -{ - - if (level < AUTH_USER) - return(level); - - if (UserNameRequested && passwdok(UserNameRequested, UserPassword)) { - strcpy(name, UserNameRequested); - return(AUTH_VALID); - } else { - return(AUTH_USER); - } -} - -#define BUMP(buf, len) while (*(buf)) {++(buf), --(len);} -#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);} - - void -krb4encpwd_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - - buf[buflen-1] = '\0'; /* make sure its NULL terminated */ - buflen -= 1; - - switch(data[3]) { - case KRB4_ENCPWD_REJECT: /* Rejected (reason might follow) */ - strncpy((char *)buf, " REJECT ", buflen); - goto common; - - case KRB4_ENCPWD_ACCEPT: /* Accepted (name might follow) */ - strncpy((char *)buf, " ACCEPT ", buflen); - common: - BUMP(buf, buflen); - if (cnt <= 4) - break; - ADDC(buf, buflen, '"'); - for (i = 4; i < cnt; i++) - ADDC(buf, buflen, data[i]); - ADDC(buf, buflen, '"'); - ADDC(buf, buflen, '\0'); - break; - - case KRB4_ENCPWD_AUTH: /* Authentication data follows */ - strncpy((char *)buf, " AUTH", buflen); - goto common2; - - case KRB4_ENCPWD_CHALLENGE: - strncpy((char *)buf, " CHALLENGE", buflen); - goto common2; - - case KRB4_ENCPWD_ACK: - strncpy((char *)buf, " ACK", buflen); - goto common2; - - default: - sprintf(lbuf, " %d (unknown)", data[3]); - strncpy((char *)buf, lbuf, buflen); - common2: - BUMP(buf, buflen); - for (i = 4; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - strncpy((char *)buf, lbuf, buflen); - BUMP(buf, buflen); - } - break; - } -} - -int passwdok(name, passwd) -char *name, *passwd; -{ - char *crypt(); - char *salt, *p; - struct passwd *pwd; - int passwdok_status = 0; - - if (pwd = getpwnam(name)) - salt = pwd->pw_passwd; - else salt = "xx"; - - p = crypt(passwd, salt); - - if (pwd && !strcmp(p, pwd->pw_passwd)) { - passwdok_status = 1; - } else passwdok_status = 0; - return(passwdok_status); -} - -#endif - -#ifdef notdef - -prkey(msg, key) - char *msg; - unsigned char *key; -{ - register int i; - printf("%s:", msg); - for (i = 0; i < 8; i++) - printf(" %3d", key[i]); - printf("\r\n"); -} -#endif diff --git a/secure/lib/libtelnet/misc-proto.h b/secure/lib/libtelnet/misc-proto.h deleted file mode 100644 index e5f334a9bdd0a..0000000000000 --- a/secure/lib/libtelnet/misc-proto.h +++ /dev/null @@ -1,79 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)misc-proto.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Copyright (C) 1990 by the Massachusetts Institute of Technology - * - * Export of this software from the United States of America is assumed - * to require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#ifndef __MISC_PROTO__ -#define __MISC_PROTO__ - -#if !defined(P) -#ifdef __STDC__ -#define P(x) x -#else -#define P(x) () -#endif -#endif - -void auth_encrypt_init P((char *, char *, char *, int)); -void auth_encrypt_connect P((int)); -void printd P((unsigned char *, int)); - -/* - * These functions are imported from the application - */ -int net_write P((unsigned char *, int)); -void net_encrypt P((void)); -int telnet_spin P((void)); -char *telnet_getenv P((char *)); -char *telnet_gets P((char *, char *, int, int)); -#endif diff --git a/secure/lib/libtelnet/misc.c b/secure/lib/libtelnet/misc.c deleted file mode 100644 index 9565900a391e4..0000000000000 --- a/secure/lib/libtelnet/misc.c +++ /dev/null @@ -1,94 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ - -#include "misc.h" - -char *RemoteHostName; -char *LocalHostName; -char *UserNameRequested = 0; -int ConnectedCount = 0; - - void -auth_encrypt_init(local, remote, name, server) - char *local; - char *remote; - char *name; - int server; -{ - RemoteHostName = remote; - LocalHostName = local; -#if defined(AUTHENTICATION) - auth_init(name, server); -#endif -#ifdef ENCRYPTION - encrypt_init(name, server); -#endif /* ENCRYPTION */ - if (UserNameRequested) { - free(UserNameRequested); - UserNameRequested = 0; - } -} - - void -auth_encrypt_user(name) - char *name; -{ - extern char *strdup(); - - if (UserNameRequested) - free(UserNameRequested); - UserNameRequested = name ? strdup(name) : 0; -} - - void -auth_encrypt_connect(cnt) - int cnt; -{ -} - - void -printd(data, cnt) - unsigned char *data; - int cnt; -{ - if (cnt > 16) - cnt = 16; - while (cnt-- > 0) { - printf(" %02x", *data); - ++data; - } -} diff --git a/secure/lib/libtelnet/misc.h b/secure/lib/libtelnet/misc.h deleted file mode 100644 index 41ffa7f67aa71..0000000000000 --- a/secure/lib/libtelnet/misc.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)misc.h 8.1 (Berkeley) 6/4/93 - */ - -extern char *UserNameRequested; -extern char *LocalHostName; -extern char *RemoteHostName; -extern int ConnectedCount; -extern int ReservedPort; - -#include "misc-proto.h" diff --git a/secure/lib/libtelnet/read_password.c b/secure/lib/libtelnet/read_password.c deleted file mode 100644 index 4ae412c5fc619..0000000000000 --- a/secure/lib/libtelnet/read_password.c +++ /dev/null @@ -1,145 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)read_password.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * $Source: /home/ncvs/src/secure/lib/libtelnet/read_password.c,v $ - * $Author: pst $ - * - * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute - * of Technology. - * - * For copying and distribution information, please see the file - * . - * - * This routine prints the supplied string to standard - * output as a prompt, and reads a password string without - * echoing. - */ - -#if defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) - -#include -#include -#include -#include -#include - -static jmp_buf env; - -/*** Routines ****************************************************** */ -/* - * This version just returns the string, doesn't map to key. - * - * Returns 0 on success, non-zero on failure. - */ - -int -local_des_read_pw_string(s,max,prompt,verify) - char *s; - int max; - char *prompt; - int verify; -{ - int ok = 0; - char *ptr; - - jmp_buf old_env; - struct sgttyb tty_state; - char key_string[BUFSIZ]; - - if (max > BUFSIZ) { - return -1; - } - - /* XXX assume jmp_buf is typedef'ed to an array */ - memmove((char *)env, (char *)old_env, sizeof(env)); - if (setjmp(env)) - goto lose; - - /* save terminal state*/ - if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1) - return -1; -/* - push_signals(); -*/ - /* Turn off echo */ - tty_state.sg_flags &= ~ECHO; - if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1) - return -1; - while (!ok) { - (void) printf(prompt); - (void) fflush(stdout); - while (!fgets(s, max, stdin)); - - if ((ptr = strchr(s, '\n'))) - *ptr = '\0'; - if (verify) { - printf("\nVerifying, please re-enter %s",prompt); - (void) fflush(stdout); - if (!fgets(key_string, sizeof(key_string), stdin)) { - clearerr(stdin); - continue; - } - if ((ptr = strchr(key_string, '\n'))) - *ptr = '\0'; - if (strcmp(s,key_string)) { - printf("\n\07\07Mismatch - try again\n"); - (void) fflush(stdout); - continue; - } - } - ok = 1; - } - -lose: - if (!ok) - memset(s, 0, max); - printf("\n"); - /* turn echo back on */ - tty_state.sg_flags |= ECHO; - if (ioctl(0,TIOCSETP,(char *)&tty_state)) - ok = 0; -/* - pop_signals(); -*/ - memmove((char *)old_env, (char *)env, sizeof(env)); - if (verify) - memset(key_string, 0, sizeof (key_string)); - s[max-1] = 0; /* force termination */ - return !ok; /* return nonzero if not okay */ -} -#endif /* defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) */ diff --git a/secure/lib/libtelnet/rsaencpwd.c b/secure/lib/libtelnet/rsaencpwd.c deleted file mode 100644 index 3492132a5df28..0000000000000 --- a/secure/lib/libtelnet/rsaencpwd.c +++ /dev/null @@ -1,492 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)rsaencpwd.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - - -#ifdef RSA_ENCPWD -/* - * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION - * ALL RIGHTS RESERVED - * - * "Digital Equipment Corporation authorizes the reproduction, - * distribution and modification of this software subject to the following - * restrictions: - * - * 1. Any partial or whole copy of this software, or any modification - * thereof, must include this copyright notice in its entirety. - * - * 2. This software is supplied "as is" with no warranty of any kind, - * expressed or implied, for any purpose, including any warranty of fitness - * or merchantibility. DIGITAL assumes no responsibility for the use or - * reliability of this software, nor promises to provide any form of - * support for it on any basis. - * - * 3. Distribution of this software is authorized only if no profit or - * remuneration of any kind is received in exchange for such distribution. - * - * 4. This software produces public key authentication certificates - * bearing an expiration date established by DIGITAL and RSA Data - * Security, Inc. It may cease to generate certificates after the expiration - * date. Any modification of this software that changes or defeats - * the expiration date or its effect is unauthorized. - * - * 5. Software that will renew or extend the expiration date of - * authentication certificates produced by this software may be obtained - * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA - * 94065, (415)595-8782, or from DIGITAL" - * - */ - -#include -#include -#include -#include - -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -#include "encrypt.h" -#include "auth.h" -#include "misc.h" -#include "cdc.h" - -extern auth_debug_mode; - -static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, - AUTHTYPE_RSA_ENCPWD, }; -static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_NAME, }; - -#define RSA_ENCPWD_AUTH 0 /* Authentication data follows */ -#define RSA_ENCPWD_REJECT 1 /* Rejected (reason might follow) */ -#define RSA_ENCPWD_ACCEPT 2 /* Accepted */ -#define RSA_ENCPWD_CHALLENGEKEY 3 /* Challenge and public key */ - -#define NAME_SZ 40 -#define CHAL_SZ 20 -#define PWD_SZ 40 - -static KTEXT_ST auth; -static char name[NAME_SZ]; -static char user_passwd[PWD_SZ]; -static char key_file[2*NAME_SZ]; -static char lhostname[NAME_SZ]; -static char challenge[CHAL_SZ]; -static int challenge_len; - - static int -Data(ap, type, d, c) - Authenticator *ap; - int type; - void *d; - int c; -{ - unsigned char *p = str_data + 4; - unsigned char *cd = (unsigned char *)d; - - if (c == -1) - c = strlen((char *)cd); - - if (0) { - printf("%s:%d: [%d] (%d)", - str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY", - str_data[3], - type, c); - printd(d, c); - printf("\r\n"); - } - *p++ = ap->type; - *p++ = ap->way; - if (type != NULL) *p++ = type; - while (c-- > 0) { - if ((*p++ = *cd++) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - if (str_data[3] == TELQUAL_IS) - printsub('>', &str_data[2], p - (&str_data[2])); - return(net_write(str_data, p - str_data)); -} - - int -rsaencpwd_init(ap, server) - Authenticator *ap; - int server; -{ - char *cp; - FILE *fp; - - if (server) { - str_data[3] = TELQUAL_REPLY; - memset(key_file, 0, sizeof(key_file)); - gethostname(lhostname, sizeof(lhostname)); - if ((cp = strchr(lhostname, '.')) != 0) *cp = '\0'; - strcpy(key_file, "/etc/."); - strcat(key_file, lhostname); - strcat(key_file, "_privkey"); - if ((fp=fopen(key_file, "r"))==NULL) return(0); - fclose(fp); - } else { - str_data[3] = TELQUAL_IS; - } - return(1); -} - - int -rsaencpwd_send(ap) - Authenticator *ap; -{ - - printf("[ Trying RSAENCPWD ... ]\n"); - if (!UserNameRequested) { - return(0); - } - if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { - return(0); - } - if (!Data(ap, NULL, (void *)NULL, 0)) { - return(0); - } - - - return(1); -} - - void -rsaencpwd_is(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - Block datablock; - char r_passwd[PWD_SZ], r_user[NAME_SZ]; - char *cp, key[160]; - char chalkey[160], *ptr; - FILE *fp; - int r, i, j, chalkey_len, len; - time_t now; - - cnt--; - switch (*data++) { - case RSA_ENCPWD_AUTH: - memmove((void *)auth.dat, (void *)data, auth.length = cnt); - - if ((fp=fopen(key_file, "r"))==NULL) { - Data(ap, RSA_ENCPWD_REJECT, (void *)"Auth failed", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - /* - * get privkey - */ - fscanf(fp, "%x;", &len); - for (i=0;iway & AUTH_HOW_MASK) == AUTH_HOW_ONE_WAY) { - register int i; - - - time(&now); - if ((now % 2) == 0) { - sprintf(challenge, "%x", now); - challenge_len = strlen(challenge); - } else { - strcpy(challenge, "randchal"); - challenge_len = 8; - } - - if ((fp=fopen(key_file, "r"))==NULL) { - Data(ap, RSA_ENCPWD_REJECT, (void *)"Auth failed", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - /* - * skip privkey - */ - fscanf(fp, "%x;", &len); - for (i=0;i 0) { - printf("[ RSA_ENCPWD refuses authentication because %.*s ]\r\n", - cnt, data); - } else - printf("[ RSA_ENCPWD refuses authentication ]\r\n"); - auth_send_retry(); - return; - case RSA_ENCPWD_ACCEPT: - printf("[ RSA_ENCPWD accepts you ]\n"); - auth_finished(ap, AUTH_USER); - return; - case RSA_ENCPWD_CHALLENGEKEY: - /* - * Verify that the response to the challenge is correct. - */ - - memmove((void *)chalkey, (void *)data, cnt); - ptr = (char *) &chalkey[0]; - ptr += DecodeHeaderLength(chalkey); - if (*ptr != 0x04) { - return; - } - *ptr++; - challenge_len = DecodeValueLength(ptr); - ptr += NumEncodeLengthOctets(challenge_len); - memmove(challenge, ptr, challenge_len); - ptr += challenge_len; - if (*ptr != 0x04) { - return; - } - *ptr++; - pubkey_len = DecodeValueLength(ptr); - ptr += NumEncodeLengthOctets(pubkey_len); - memmove(pubkey, ptr, pubkey_len); - memset(user_passwd, 0, sizeof(user_passwd)); - local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); - UserPassword = user_passwd; - Challenge = challenge; - r = init_rsa_encpwd(&token, user_passwd, challenge, challenge_len, pubkey); - if (r < 0) { - token.length = 1; - } - - if (!Data(ap, RSA_ENCPWD_AUTH, (void *)token.dat, token.length)) { - return; - } - - break; - - default: - return; - } -} - - int -rsaencpwd_status(ap, name, level) - Authenticator *ap; - char *name; - int level; -{ - - if (level < AUTH_USER) - return(level); - - if (UserNameRequested && rsaencpwd_passwdok(UserNameRequested, UserPassword)) { - strcpy(name, UserNameRequested); - return(AUTH_VALID); - } else { - return(AUTH_USER); - } -} - -#define BUMP(buf, len) while (*(buf)) {++(buf), --(len);} -#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);} - - void -rsaencpwd_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - - buf[buflen-1] = '\0'; /* make sure its NULL terminated */ - buflen -= 1; - - switch(data[3]) { - case RSA_ENCPWD_REJECT: /* Rejected (reason might follow) */ - strncpy((char *)buf, " REJECT ", buflen); - goto common; - - case RSA_ENCPWD_ACCEPT: /* Accepted (name might follow) */ - strncpy((char *)buf, " ACCEPT ", buflen); - common: - BUMP(buf, buflen); - if (cnt <= 4) - break; - ADDC(buf, buflen, '"'); - for (i = 4; i < cnt; i++) - ADDC(buf, buflen, data[i]); - ADDC(buf, buflen, '"'); - ADDC(buf, buflen, '\0'); - break; - - case RSA_ENCPWD_AUTH: /* Authentication data follows */ - strncpy((char *)buf, " AUTH", buflen); - goto common2; - - case RSA_ENCPWD_CHALLENGEKEY: - strncpy((char *)buf, " CHALLENGEKEY", buflen); - goto common2; - - default: - sprintf(lbuf, " %d (unknown)", data[3]); - strncpy((char *)buf, lbuf, buflen); - common2: - BUMP(buf, buflen); - for (i = 4; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - strncpy((char *)buf, lbuf, buflen); - BUMP(buf, buflen); - } - break; - } -} - -int rsaencpwd_passwdok(name, passwd) -char *name, *passwd; -{ - char *crypt(); - char *salt, *p; - struct passwd *pwd; - int passwdok_status = 0; - - if (pwd = getpwnam(name)) - salt = pwd->pw_passwd; - else salt = "xx"; - - p = crypt(passwd, salt); - - if (pwd && !strcmp(p, pwd->pw_passwd)) { - passwdok_status = 1; - } else passwdok_status = 0; - return(passwdok_status); -} - -#endif - -#ifdef notdef - -prkey(msg, key) - char *msg; - unsigned char *key; -{ - register int i; - printf("%s:", msg); - for (i = 0; i < 8; i++) - printf(" %3d", key[i]); - printf("\r\n"); -} -#endif diff --git a/secure/lib/libtelnet/spx.c b/secure/lib/libtelnet/spx.c deleted file mode 100644 index 5b625c7cfad28..0000000000000 --- a/secure/lib/libtelnet/spx.c +++ /dev/null @@ -1,588 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)spx.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#ifdef SPX -/* - * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION - * ALL RIGHTS RESERVED - * - * "Digital Equipment Corporation authorizes the reproduction, - * distribution and modification of this software subject to the following - * restrictions: - * - * 1. Any partial or whole copy of this software, or any modification - * thereof, must include this copyright notice in its entirety. - * - * 2. This software is supplied "as is" with no warranty of any kind, - * expressed or implied, for any purpose, including any warranty of fitness - * or merchantibility. DIGITAL assumes no responsibility for the use or - * reliability of this software, nor promises to provide any form of - * support for it on any basis. - * - * 3. Distribution of this software is authorized only if no profit or - * remuneration of any kind is received in exchange for such distribution. - * - * 4. This software produces public key authentication certificates - * bearing an expiration date established by DIGITAL and RSA Data - * Security, Inc. It may cease to generate certificates after the expiration - * date. Any modification of this software that changes or defeats - * the expiration date or its effect is unauthorized. - * - * 5. Software that will renew or extend the expiration date of - * authentication certificates produced by this software may be obtained - * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA - * 94065, (415)595-8782, or from DIGITAL" - * - */ - -#include -#include -#include -#include "gssapi_defs.h" -#ifdef __STDC__ -#include -#endif -#ifdef NO_STRING_H -#include -#else -#include -#endif - -#include -#include "encrypt.h" -#include "auth.h" -#include "misc.h" - -extern auth_debug_mode; - -static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, - AUTHTYPE_SPX, }; -static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, - TELQUAL_NAME, }; - -#define SPX_AUTH 0 /* Authentication data follows */ -#define SPX_REJECT 1 /* Rejected (reason might follow) */ -#define SPX_ACCEPT 2 /* Accepted */ - -#ifdef ENCRYPTION -static Block session_key = { 0 }; -#endif /* ENCRYPTION */ -static Schedule sched; -static Block challenge = { 0 }; - - -/*******************************************************************/ - -gss_OID_set actual_mechs; -gss_OID actual_mech_type, output_name_type; -int major_status, status, msg_ctx = 0, new_status; -int req_flags = 0, ret_flags, lifetime_rec; -gss_cred_id_t gss_cred_handle; -gss_ctx_id_t actual_ctxhandle, context_handle; -gss_buffer_desc output_token, input_token, input_name_buffer; -gss_buffer_desc status_string; -gss_name_t desired_targname, src_name; -gss_channel_bindings input_chan_bindings; -char lhostname[GSS_C_MAX_PRINTABLE_NAME]; -char targ_printable[GSS_C_MAX_PRINTABLE_NAME]; -int to_addr=0, from_addr=0; -char *address; -gss_buffer_desc fullname_buffer; -gss_OID fullname_type; -gss_cred_id_t gss_delegated_cred_handle; - -/*******************************************************************/ - - - - static int -Data(ap, type, d, c) - Authenticator *ap; - int type; - void *d; - int c; -{ - unsigned char *p = str_data + 4; - unsigned char *cd = (unsigned char *)d; - - if (c == -1) - c = strlen((char *)cd); - - if (0) { - printf("%s:%d: [%d] (%d)", - str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY", - str_data[3], - type, c); - printd(d, c); - printf("\r\n"); - } - *p++ = ap->type; - *p++ = ap->way; - *p++ = type; - while (c-- > 0) { - if ((*p++ = *cd++) == IAC) - *p++ = IAC; - } - *p++ = IAC; - *p++ = SE; - if (str_data[3] == TELQUAL_IS) - printsub('>', &str_data[2], p - (&str_data[2])); - return(net_write(str_data, p - str_data)); -} - - int -spx_init(ap, server) - Authenticator *ap; - int server; -{ - gss_cred_id_t tmp_cred_handle; - - if (server) { - str_data[3] = TELQUAL_REPLY; - gethostname(lhostname, sizeof(lhostname)); - strcpy(targ_printable, "SERVICE:rcmd@"); - strcat(targ_printable, lhostname); - input_name_buffer.length = strlen(targ_printable); - input_name_buffer.value = targ_printable; - major_status = gss_import_name(&status, - &input_name_buffer, - GSS_C_NULL_OID, - &desired_targname); - major_status = gss_acquire_cred(&status, - desired_targname, - 0, - GSS_C_NULL_OID_SET, - GSS_C_ACCEPT, - &tmp_cred_handle, - &actual_mechs, - &lifetime_rec); - if (major_status != GSS_S_COMPLETE) return(0); - } else { - str_data[3] = TELQUAL_IS; - } - return(1); -} - - int -spx_send(ap) - Authenticator *ap; -{ - Block enckey; - int r; - - gss_OID actual_mech_type, output_name_type; - int msg_ctx = 0, new_status, status; - int req_flags = 0, ret_flags, lifetime_rec, major_status; - gss_buffer_desc output_token, input_token, input_name_buffer; - gss_buffer_desc output_name_buffer, status_string; - gss_name_t desired_targname; - gss_channel_bindings input_chan_bindings; - char targ_printable[GSS_C_MAX_PRINTABLE_NAME]; - int from_addr=0, to_addr=0, myhostlen, j; - int deleg_flag=1, mutual_flag=0, replay_flag=0, seq_flag=0; - char *address; - - printf("[ Trying SPX ... ]\n"); - strcpy(targ_printable, "SERVICE:rcmd@"); - strcat(targ_printable, RemoteHostName); - - input_name_buffer.length = strlen(targ_printable); - input_name_buffer.value = targ_printable; - - if (!UserNameRequested) { - return(0); - } - - major_status = gss_import_name(&status, - &input_name_buffer, - GSS_C_NULL_OID, - &desired_targname); - - - major_status = gss_display_name(&status, - desired_targname, - &output_name_buffer, - &output_name_type); - - printf("target is '%s'\n", output_name_buffer.value); fflush(stdout); - - major_status = gss_release_buffer(&status, &output_name_buffer); - - input_chan_bindings = (gss_channel_bindings) - malloc(sizeof(gss_channel_bindings_desc)); - - input_chan_bindings->initiator_addrtype = GSS_C_AF_INET; - input_chan_bindings->initiator_address.length = 4; - address = (char *) malloc(4); - input_chan_bindings->initiator_address.value = (char *) address; - address[0] = ((from_addr & 0xff000000) >> 24); - address[1] = ((from_addr & 0xff0000) >> 16); - address[2] = ((from_addr & 0xff00) >> 8); - address[3] = (from_addr & 0xff); - input_chan_bindings->acceptor_addrtype = GSS_C_AF_INET; - input_chan_bindings->acceptor_address.length = 4; - address = (char *) malloc(4); - input_chan_bindings->acceptor_address.value = (char *) address; - address[0] = ((to_addr & 0xff000000) >> 24); - address[1] = ((to_addr & 0xff0000) >> 16); - address[2] = ((to_addr & 0xff00) >> 8); - address[3] = (to_addr & 0xff); - input_chan_bindings->application_data.length = 0; - - req_flags = 0; - if (deleg_flag) req_flags = req_flags | 1; - if (mutual_flag) req_flags = req_flags | 2; - if (replay_flag) req_flags = req_flags | 4; - if (seq_flag) req_flags = req_flags | 8; - - major_status = gss_init_sec_context(&status, /* minor status */ - GSS_C_NO_CREDENTIAL, /* cred handle */ - &actual_ctxhandle, /* ctx handle */ - desired_targname, /* target name */ - GSS_C_NULL_OID, /* mech type */ - req_flags, /* req flags */ - 0, /* time req */ - input_chan_bindings, /* chan binding */ - GSS_C_NO_BUFFER, /* input token */ - &actual_mech_type, /* actual mech */ - &output_token, /* output token */ - &ret_flags, /* ret flags */ - &lifetime_rec); /* time rec */ - - if ((major_status != GSS_S_COMPLETE) && - (major_status != GSS_S_CONTINUE_NEEDED)) { - gss_display_status(&new_status, - status, - GSS_C_MECH_CODE, - GSS_C_NULL_OID, - &msg_ctx, - &status_string); - printf("%s\n", status_string.value); - return(0); - } - - if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { - return(0); - } - - if (!Data(ap, SPX_AUTH, (void *)output_token.value, output_token.length)) { - return(0); - } - - return(1); -} - - void -spx_is(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - Block datablock; - int r; - - if (cnt-- < 1) - return; - switch (*data++) { - case SPX_AUTH: - input_token.length = cnt; - input_token.value = (char *) data; - - gethostname(lhostname, sizeof(lhostname)); - - strcpy(targ_printable, "SERVICE:rcmd@"); - strcat(targ_printable, lhostname); - - input_name_buffer.length = strlen(targ_printable); - input_name_buffer.value = targ_printable; - - major_status = gss_import_name(&status, - &input_name_buffer, - GSS_C_NULL_OID, - &desired_targname); - - major_status = gss_acquire_cred(&status, - desired_targname, - 0, - GSS_C_NULL_OID_SET, - GSS_C_ACCEPT, - &gss_cred_handle, - &actual_mechs, - &lifetime_rec); - - major_status = gss_release_name(&status, desired_targname); - - input_chan_bindings = (gss_channel_bindings) - malloc(sizeof(gss_channel_bindings_desc)); - - input_chan_bindings->initiator_addrtype = GSS_C_AF_INET; - input_chan_bindings->initiator_address.length = 4; - address = (char *) malloc(4); - input_chan_bindings->initiator_address.value = (char *) address; - address[0] = ((from_addr & 0xff000000) >> 24); - address[1] = ((from_addr & 0xff0000) >> 16); - address[2] = ((from_addr & 0xff00) >> 8); - address[3] = (from_addr & 0xff); - input_chan_bindings->acceptor_addrtype = GSS_C_AF_INET; - input_chan_bindings->acceptor_address.length = 4; - address = (char *) malloc(4); - input_chan_bindings->acceptor_address.value = (char *) address; - address[0] = ((to_addr & 0xff000000) >> 24); - address[1] = ((to_addr & 0xff0000) >> 16); - address[2] = ((to_addr & 0xff00) >> 8); - address[3] = (to_addr & 0xff); - input_chan_bindings->application_data.length = 0; - - major_status = gss_accept_sec_context(&status, - &context_handle, - gss_cred_handle, - &input_token, - input_chan_bindings, - &src_name, - &actual_mech_type, - &output_token, - &ret_flags, - &lifetime_rec, - &gss_delegated_cred_handle); - - - if (major_status != GSS_S_COMPLETE) { - - major_status = gss_display_name(&status, - src_name, - &fullname_buffer, - &fullname_type); - Data(ap, SPX_REJECT, (void *)"auth failed", -1); - auth_finished(ap, AUTH_REJECT); - return; - } - - major_status = gss_display_name(&status, - src_name, - &fullname_buffer, - &fullname_type); - - - Data(ap, SPX_ACCEPT, (void *)output_token.value, output_token.length); - auth_finished(ap, AUTH_USER); - break; - - default: - Data(ap, SPX_REJECT, 0, 0); - break; - } -} - - - void -spx_reply(ap, data, cnt) - Authenticator *ap; - unsigned char *data; - int cnt; -{ - Session_Key skey; - - if (cnt-- < 1) - return; - switch (*data++) { - case SPX_REJECT: - if (cnt > 0) { - printf("[ SPX refuses authentication because %.*s ]\r\n", - cnt, data); - } else - printf("[ SPX refuses authentication ]\r\n"); - auth_send_retry(); - return; - case SPX_ACCEPT: - printf("[ SPX accepts you ]\n"); - if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) { - /* - * Send over the encrypted challenge. - */ - input_token.value = (char *) data; - input_token.length = cnt; - - major_status = gss_init_sec_context(&status, /* minor stat */ - GSS_C_NO_CREDENTIAL, /* cred handle */ - &actual_ctxhandle, /* ctx handle */ - desired_targname, /* target name */ - GSS_C_NULL_OID, /* mech type */ - req_flags, /* req flags */ - 0, /* time req */ - input_chan_bindings, /* chan binding */ - &input_token, /* input token */ - &actual_mech_type, /* actual mech */ - &output_token, /* output token */ - &ret_flags, /* ret flags */ - &lifetime_rec); /* time rec */ - - if (major_status != GSS_S_COMPLETE) { - gss_display_status(&new_status, - status, - GSS_C_MECH_CODE, - GSS_C_NULL_OID, - &msg_ctx, - &status_string); - printf("[ SPX mutual response fails ... '%s' ]\r\n", - status_string.value); - auth_send_retry(); - return; - } - } - auth_finished(ap, AUTH_USER); - return; - - default: - return; - } -} - - int -spx_status(ap, name, level) - Authenticator *ap; - char *name; - int level; -{ - - gss_buffer_desc fullname_buffer, acl_file_buffer; - gss_OID fullname_type; - char acl_file[160], fullname[160]; - int major_status, status = 0; - struct passwd *pwd; - - /* - * hard code fullname to - * "SPX:/C=US/O=Digital/OU=LKG/OU=Sphinx/OU=Users/CN=Kannan Alagappan" - * and acl_file to "~kannan/.sphinx" - */ - - pwd = getpwnam(UserNameRequested); - if (pwd == NULL) { - return(AUTH_USER); /* not authenticated */ - } - - strcpy(acl_file, pwd->pw_dir); - strcat(acl_file, "/.sphinx"); - acl_file_buffer.value = acl_file; - acl_file_buffer.length = strlen(acl_file); - - major_status = gss_display_name(&status, - src_name, - &fullname_buffer, - &fullname_type); - - if (level < AUTH_USER) - return(level); - - major_status = gss__check_acl(&status, &fullname_buffer, - &acl_file_buffer); - - if (major_status == GSS_S_COMPLETE) { - strcpy(name, UserNameRequested); - return(AUTH_VALID); - } else { - return(AUTH_USER); - } - -} - -#define BUMP(buf, len) while (*(buf)) {++(buf), --(len);} -#define ADDC(buf, len, c) if ((len) > 0) {*(buf)++ = (c); --(len);} - - void -spx_printsub(data, cnt, buf, buflen) - unsigned char *data, *buf; - int cnt, buflen; -{ - char lbuf[32]; - register int i; - - buf[buflen-1] = '\0'; /* make sure its NULL terminated */ - buflen -= 1; - - switch(data[3]) { - case SPX_REJECT: /* Rejected (reason might follow) */ - strncpy((char *)buf, " REJECT ", buflen); - goto common; - - case SPX_ACCEPT: /* Accepted (name might follow) */ - strncpy((char *)buf, " ACCEPT ", buflen); - common: - BUMP(buf, buflen); - if (cnt <= 4) - break; - ADDC(buf, buflen, '"'); - for (i = 4; i < cnt; i++) - ADDC(buf, buflen, data[i]); - ADDC(buf, buflen, '"'); - ADDC(buf, buflen, '\0'); - break; - - case SPX_AUTH: /* Authentication data follows */ - strncpy((char *)buf, " AUTH", buflen); - goto common2; - - default: - sprintf(lbuf, " %d (unknown)", data[3]); - strncpy((char *)buf, lbuf, buflen); - common2: - BUMP(buf, buflen); - for (i = 4; i < cnt; i++) { - sprintf(lbuf, " %d", data[i]); - strncpy((char *)buf, lbuf, buflen); - BUMP(buf, buflen); - } - break; - } -} - -#endif - -#ifdef notdef - -prkey(msg, key) - char *msg; - unsigned char *key; -{ - register int i; - printf("%s:", msg); - for (i = 0; i < 8; i++) - printf(" %3d", key[i]); - printf("\r\n"); -} -#endif diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc deleted file mode 100644 index 26d868c391530..0000000000000 --- a/secure/libexec/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $Id: Makefile.inc,v 1.2 1995/07/29 12:49:22 markm Exp $ - -BINDIR?= /usr/libexec - -.include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile deleted file mode 100644 index f04e2a31edc19..0000000000000 --- a/secure/libexec/telnetd/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id$ - -# Do not define -DKLUDGELINEMODE, as it does not interact well with many -# telnet implementations. - -DISTRIBUTION= krb - -PROG= telnetd -MAN8= telnetd.8 - -SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ - termstat.c utility.c - -DPADD= ${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP} -LDADD= -L${TELNETOBJDIR} -lutil -ltermcap -ltelnet - -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK -CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES)) -CFLAGS+=-DAUTHENTICATION -LDADD+= -ldes -lkrb -DPADD+= ${LIBDES} ${LIBKRB} -.endif - -# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active -#LDADD+= -ldescrypt - -.include diff --git a/secure/libexec/telnetd/authenc.c b/secure/libexec/telnetd/authenc.c deleted file mode 100644 index ccb463c94d1e6..0000000000000 --- a/secure/libexec/telnetd/authenc.c +++ /dev/null @@ -1,91 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#if defined(AUTHENTICATION) || defined(ENCRYPTION) -#include "telnetd.h" -#include - - int -net_write(str, len) - unsigned char *str; - int len; -{ - if (nfrontp + len < netobuf + BUFSIZ) { - memmove((void *)nfrontp, (void *)str, len); - nfrontp += len; - return(len); - } - return(0); -} - - void -net_encrypt() -{ -#ifdef ENCRYPTION - char *s = (nclearto > nbackp) ? nclearto : nbackp; - if (s < nfrontp && encrypt_output) { - (*encrypt_output)((unsigned char *)s, nfrontp - s); - } - nclearto = nfrontp; -#endif /* ENCRYPTION */ -} - - int -telnet_spin() -{ - ttloop(); - return(0); -} - - char * -telnet_getenv(val) - char *val; -{ - extern char *getenv(); - return(getenv(val)); -} - - char * -telnet_gets(prompt, result, length, echo) - char *prompt; - char *result; - int length; - int echo; -{ - return((char *)0); -} -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ diff --git a/secure/libexec/telnetd/defs.h b/secure/libexec/telnetd/defs.h deleted file mode 100644 index a73d4a6199783..0000000000000 --- a/secure/libexec/telnetd/defs.h +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)defs.h 8.1 (Berkeley) 6/4/93 - */ - -/* - * Telnet server defines - */ -#include -#include - -#ifndef BSD -# define BSD 43 -#endif - -#if defined(CRAY) && !defined(LINEMODE) -# define SYSV_TERMIO -# define LINEMODE -# define KLUDGELINEMODE -# define DIAGNOSTICS -# if defined(UNICOS50) && !defined(UNICOS5) -# define UNICOS5 -# endif -# if !defined(UNICOS5) -# define BFTPDAEMON -# define HAS_IP_TOS -# endif -#endif /* CRAY */ -#if defined(UNICOS5) && !defined(NO_SETSID) -# define NO_SETSID -#endif - -#if defined(PRINTOPTIONS) && defined(DIAGNOSTICS) -#define TELOPTS -#define TELCMDS -#define SLC_NAMES -#endif - -#if defined(SYSV_TERMIO) && !defined(USE_TERMIO) -# define USE_TERMIO -#endif - -#include -#ifndef CRAY -#include -#endif /* CRAY */ -#include -#include -#include -#include -#ifndef FILIO_H -#include -#else -#include -#endif - -#include - -#include - -#include -#ifdef __STDC__ -#include -#endif -#include -#include -#include -#include -#ifndef LOG_DAEMON -#define LOG_DAEMON 0 -#endif -#ifndef LOG_ODELAY -#define LOG_ODELAY 0 -#endif -#include -#ifndef NO_STRING_H -#include -#else -#include -#endif - -#ifndef USE_TERMIO -#include -#else -# ifdef SYSV_TERMIO -# include -# else -# include -# endif -#endif -#if !defined(USE_TERMIO) || defined(NO_CC_T) -typedef unsigned char cc_t; -#endif - -#ifdef __STDC__ -#include -#endif - -#ifndef _POSIX_VDISABLE -# ifdef VDISABLE -# define _POSIX_VDISABLE VDISABLE -# else -# define _POSIX_VDISABLE ((unsigned char)'\377') -# endif -#endif - - -#ifdef CRAY -# ifdef CRAY1 -# include -# ifndef FD_ZERO -# include -# endif /* FD_ZERO */ -# endif /* CRAY1 */ - -#include -#endif /* CRAY */ - -#ifdef __hpux -#include -#endif - -#if !defined(TIOCSCTTY) && defined(TCSETCTTY) -# define TIOCSCTTY TCSETCTTY -#endif - -#ifndef FD_SET -#ifndef HAVE_fd_set -typedef struct fd_set { int fds_bits[1]; } fd_set; -#endif - -#define FD_SET(n, p) ((p)->fds_bits[0] |= (1<<(n))) -#define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1<<(n))) -#define FD_ISSET(n, p) ((p)->fds_bits[0] & (1<<(n))) -#define FD_ZERO(p) ((p)->fds_bits[0] = 0) -#endif /* FD_SET */ - -/* - * I/O data buffers defines - */ -#define NETSLOP 64 -#ifdef CRAY -#undef BUFSIZ -#define BUFSIZ 2048 -#endif - -#define NIACCUM(c) { *netip++ = c; \ - ncc++; \ - } - -/* clock manipulations */ -#define settimer(x) (clocks.x = ++clocks.system) -#define sequenceIs(x,y) (clocks.x < clocks.y) - -/* - * Linemode support states, in decreasing order of importance - */ -#define REAL_LINEMODE 0x04 -#define KLUDGE_OK 0x03 -#define NO_AUTOKLUDGE 0x02 -#define KLUDGE_LINEMODE 0x01 -#define NO_LINEMODE 0x00 - -/* - * Structures of information for each special character function. - */ -typedef struct { - unsigned char flag; /* the flags for this function */ - cc_t val; /* the value of the special character */ -} slcent, *Slcent; - -typedef struct { - slcent defset; /* the default settings */ - slcent current; /* the current settings */ - cc_t *sptr; /* a pointer to the char in */ - /* system data structures */ -} slcfun, *Slcfun; - -#ifdef DIAGNOSTICS -/* - * Diagnostics capabilities - */ -#define TD_REPORT 0x01 /* Report operations to client */ -#define TD_EXERCISE 0x02 /* Exercise client's implementation */ -#define TD_NETDATA 0x04 /* Display received data stream */ -#define TD_PTYDATA 0x08 /* Display data passed to pty */ -#define TD_OPTIONS 0x10 /* Report just telnet options */ -#endif /* DIAGNOSTICS */ - -/* - * We keep track of each side of the option negotiation. - */ - -#define MY_STATE_WILL 0x01 -#define MY_WANT_STATE_WILL 0x02 -#define MY_STATE_DO 0x04 -#define MY_WANT_STATE_DO 0x08 - -/* - * Macros to check the current state of things - */ - -#define my_state_is_do(opt) (options[opt]&MY_STATE_DO) -#define my_state_is_will(opt) (options[opt]&MY_STATE_WILL) -#define my_want_state_is_do(opt) (options[opt]&MY_WANT_STATE_DO) -#define my_want_state_is_will(opt) (options[opt]&MY_WANT_STATE_WILL) - -#define my_state_is_dont(opt) (!my_state_is_do(opt)) -#define my_state_is_wont(opt) (!my_state_is_will(opt)) -#define my_want_state_is_dont(opt) (!my_want_state_is_do(opt)) -#define my_want_state_is_wont(opt) (!my_want_state_is_will(opt)) - -#define set_my_state_do(opt) (options[opt] |= MY_STATE_DO) -#define set_my_state_will(opt) (options[opt] |= MY_STATE_WILL) -#define set_my_want_state_do(opt) (options[opt] |= MY_WANT_STATE_DO) -#define set_my_want_state_will(opt) (options[opt] |= MY_WANT_STATE_WILL) - -#define set_my_state_dont(opt) (options[opt] &= ~MY_STATE_DO) -#define set_my_state_wont(opt) (options[opt] &= ~MY_STATE_WILL) -#define set_my_want_state_dont(opt) (options[opt] &= ~MY_WANT_STATE_DO) -#define set_my_want_state_wont(opt) (options[opt] &= ~MY_WANT_STATE_WILL) - -/* - * Tricky code here. What we want to know is if the MY_STATE_WILL - * and MY_WANT_STATE_WILL bits have the same value. Since the two - * bits are adjacent, a little arithmatic will show that by adding - * in the lower bit, the upper bit will be set if the two bits were - * different, and clear if they were the same. - */ -#define my_will_wont_is_changing(opt) \ - ((options[opt]+MY_STATE_WILL) & MY_WANT_STATE_WILL) - -#define my_do_dont_is_changing(opt) \ - ((options[opt]+MY_STATE_DO) & MY_WANT_STATE_DO) - -/* - * Make everything symetrical - */ - -#define HIS_STATE_WILL MY_STATE_DO -#define HIS_WANT_STATE_WILL MY_WANT_STATE_DO -#define HIS_STATE_DO MY_STATE_WILL -#define HIS_WANT_STATE_DO MY_WANT_STATE_WILL - -#define his_state_is_do my_state_is_will -#define his_state_is_will my_state_is_do -#define his_want_state_is_do my_want_state_is_will -#define his_want_state_is_will my_want_state_is_do - -#define his_state_is_dont my_state_is_wont -#define his_state_is_wont my_state_is_dont -#define his_want_state_is_dont my_want_state_is_wont -#define his_want_state_is_wont my_want_state_is_dont - -#define set_his_state_do set_my_state_will -#define set_his_state_will set_my_state_do -#define set_his_want_state_do set_my_want_state_will -#define set_his_want_state_will set_my_want_state_do - -#define set_his_state_dont set_my_state_wont -#define set_his_state_wont set_my_state_dont -#define set_his_want_state_dont set_my_want_state_wont -#define set_his_want_state_wont set_my_want_state_dont - -#define his_will_wont_is_changing my_do_dont_is_changing -#define his_do_dont_is_changing my_will_wont_is_changing diff --git a/secure/libexec/telnetd/ext.h b/secure/libexec/telnetd/ext.h deleted file mode 100644 index db3f1c395313f..0000000000000 --- a/secure/libexec/telnetd/ext.h +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)ext.h 8.2 (Berkeley) 12/15/93 - */ - -/* - * Telnet server variable declarations - */ -extern char options[256]; -extern char do_dont_resp[256]; -extern char will_wont_resp[256]; -extern int linemode; /* linemode on/off */ -#ifdef LINEMODE -extern int uselinemode; /* what linemode to use (on/off) */ -extern int editmode; /* edit modes in use */ -extern int useeditmode; /* edit modes to use */ -extern int alwayslinemode; /* command line option */ -extern int lmodetype; /* Client support for linemode */ -#endif /* LINEMODE */ -extern int flowmode; /* current flow control state */ -extern int restartany; /* restart output on any character state */ -#ifdef DIAGNOSTICS -extern int diagnostic; /* telnet diagnostic capabilities */ -#endif /* DIAGNOSTICS */ -#ifdef BFTPDAEMON -extern int bftpd; /* behave as bftp daemon */ -#endif /* BFTPDAEMON */ -#if defined(SecurID) -extern int require_SecurID; -#endif -#if defined(AUTHENTICATION) -extern int auth_level; -#endif - -extern slcfun slctab[NSLC + 1]; /* slc mapping table */ - -char *terminaltype; - -/* - * I/O data buffers, pointers, and counters. - */ -extern char ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp; - -extern char netibuf[BUFSIZ], *netip; - -extern char netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp; -extern char *neturg; /* one past last bye of urgent data */ - -extern int pcc, ncc; - -#if defined(CRAY2) && defined(UNICOS5) -extern int unpcc; /* characters left unprocessed by CRAY-2 terminal routine */ -extern char *unptyip; /* pointer to remaining characters in buffer */ -#endif - -extern int pty, net; -extern char *line; -extern int SYNCHing; /* we are in TELNET SYNCH mode */ - -#ifndef P -# ifdef __STDC__ -# define P(x) x -# else -# define P(x) () -# endif -#endif - -extern void - _termstat P((void)), - add_slc P((int, int, int)), - check_slc P((void)), - change_slc P((int, int, int)), - cleanup P((int)), - clientstat P((int, int, int)), - copy_termbuf P((char *, int)), - deferslc P((void)), - defer_terminit P((void)), - do_opt_slc P((unsigned char *, int)), - doeof P((void)), - dooption P((int)), - dontoption P((int)), - edithost P((char *, char *)), - fatal P((int, char *)), - fatalperror P((int, char *)), - get_slc_defaults P((void)), - init_env P((void)), - init_termbuf P((void)), - interrupt P((void)), - localstat P((void)), - flowstat P((void)), - netclear P((void)), - netflush P((void)), -#ifdef DIAGNOSTICS - printoption P((char *, int)), - printdata P((char *, char *, int)), - printsub P((int, unsigned char *, int)), -#endif - ptyflush P((void)), - putchr P((int)), - putf P((char *, char *)), - recv_ayt P((void)), - send_do P((int, int)), - send_dont P((int, int)), - send_slc P((void)), - send_status P((void)), - send_will P((int, int)), - send_wont P((int, int)), - sendbrk P((void)), - sendsusp P((void)), - set_termbuf P((void)), - start_login P((char *, int, char *)), - start_slc P((int)), -#if defined(AUTHENTICATION) - start_slave P((char *)), -#else - start_slave P((char *, int, char *)), -#endif - suboption P((void)), - telrcv P((void)), - ttloop P((void)), - tty_binaryin P((int)), - tty_binaryout P((int)); - -extern int - end_slc P((unsigned char **)), - getnpty P((void)), -#ifndef convex - getpty P((int *)), -#endif - login_tty P((int)), - spcset P((int, cc_t *, cc_t **)), - stilloob P((int)), - terminit P((void)), - termstat P((void)), - tty_flowmode P((void)), - tty_restartany P((void)), - tty_isbinaryin P((void)), - tty_isbinaryout P((void)), - tty_iscrnl P((void)), - tty_isecho P((void)), - tty_isediting P((void)), - tty_islitecho P((void)), - tty_isnewmap P((void)), - tty_israw P((void)), - tty_issofttab P((void)), - tty_istrapsig P((void)), - tty_linemode P((void)); - -extern void - tty_rspeed P((int)), - tty_setecho P((int)), - tty_setedit P((int)), - tty_setlinemode P((int)), - tty_setlitecho P((int)), - tty_setsig P((int)), - tty_setsofttab P((int)), - tty_tspeed P((int)), - willoption P((int)), - wontoption P((int)), - writenet P((unsigned char *, int)); - -#ifdef ENCRYPTION -extern void (*encrypt_output) P((unsigned char *, int)); -extern int (*decrypt_input) P((int)); -extern char *nclearto; -#endif /* ENCRYPTION */ - - -/* - * The following are some clocks used to decide how to interpret - * the relationship between various variables. - */ - -extern struct { - int - system, /* what the current time is */ - echotoggle, /* last time user entered echo character */ - modenegotiated, /* last time operating mode negotiated */ - didnetreceive, /* last time we read data from network */ - ttypesubopt, /* ttype subopt is received */ - tspeedsubopt, /* tspeed subopt is received */ - environsubopt, /* environ subopt is received */ - oenvironsubopt, /* old environ subopt is received */ - xdisplocsubopt, /* xdisploc subopt is received */ - baseline, /* time started to do timed action */ - gotDM; /* when did we last see a data mark */ -} clocks; - - -#if defined(CRAY2) && defined(UNICOS5) -extern int needtermstat; -#endif - -#ifndef DEFAULT_IM -# ifdef CRAY -# define DEFAULT_IM "\r\n\r\nCray UNICOS (%h) (%t)\r\n\r\r\n\r" -# else -# ifdef sun -# define DEFAULT_IM "\r\n\r\nSunOS UNIX (%h) (%t)\r\n\r\r\n\r" -# else -# ifdef ultrix -# define DEFAULT_IM "\r\n\r\nULTRIX (%h) (%t)\r\n\r\r\n\r" -# else -# ifdef __FreeBSD__ -# define DEFAULT_IM "\r\n\r\nFreeBSD (%h) (%t)\r\n\r\r\n\r" -# else -# define DEFAULT_IM "\r\n\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r" -# endif -# endif -# endif -# endif -#endif diff --git a/secure/libexec/telnetd/global.c b/secure/libexec/telnetd/global.c deleted file mode 100644 index af21acc69fb1c..0000000000000 --- a/secure/libexec/telnetd/global.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ - -/* - * Allocate global variables. We do this - * by including the header file that defines - * them all as externs, but first we define - * the keyword "extern" to be nothing, so that - * we will actually allocate the space. - */ - -#include "defs.h" -#define extern -#include "ext.h" diff --git a/secure/libexec/telnetd/pathnames.h b/secure/libexec/telnetd/pathnames.h deleted file mode 100644 index 4e14a88b49cdf..0000000000000 --- a/secure/libexec/telnetd/pathnames.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/4/93 - */ - -#if BSD > 43 - -# include - -# ifndef _PATH_LOGIN -# define _PATH_LOGIN "/usr/bin/login" -# endif - -#else - -# define _PATH_TTY "/dev/tty" -# ifndef _PATH_LOGIN -# define _PATH_LOGIN "/bin/login" -# endif - -#endif - -#ifdef BFTPDAEMON -#define BFTPPATH "/usr/ucb/bftp" -#endif /* BFTPDAEMON */ diff --git a/secure/libexec/telnetd/slc.c b/secure/libexec/telnetd/slc.c deleted file mode 100644 index 6cbb7ababa1b2..0000000000000 --- a/secure/libexec/telnetd/slc.c +++ /dev/null @@ -1,491 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include "telnetd.h" - -#ifdef LINEMODE -/* - * local varibles - */ -static unsigned char *def_slcbuf = (unsigned char *)0; -static int def_slclen = 0; -static int slcchange; /* change to slc is requested */ -static unsigned char *slcptr; /* pointer into slc buffer */ -static unsigned char slcbuf[NSLC*6]; /* buffer for slc negotiation */ - -/* - * send_slc - * - * Write out the current special characters to the client. - */ - void -send_slc() -{ - register int i; - - /* - * Send out list of triplets of special characters - * to client. We only send info on the characters - * that are currently supported. - */ - for (i = 1; i <= NSLC; i++) { - if ((slctab[i].defset.flag & SLC_LEVELBITS) == SLC_NOSUPPORT) - continue; - add_slc((unsigned char)i, slctab[i].current.flag, - slctab[i].current.val); - } - -} /* end of send_slc */ - -/* - * default_slc - * - * Set pty special characters to all the defaults. - */ - void -default_slc() -{ - register int i; - - for (i = 1; i <= NSLC; i++) { - slctab[i].current.val = slctab[i].defset.val; - if (slctab[i].current.val == (cc_t)(_POSIX_VDISABLE)) - slctab[i].current.flag = SLC_NOSUPPORT; - else - slctab[i].current.flag = slctab[i].defset.flag; - if (slctab[i].sptr) { - *(slctab[i].sptr) = slctab[i].defset.val; - } - } - slcchange = 1; - -} /* end of default_slc */ -#endif /* LINEMODE */ - -/* - * get_slc_defaults - * - * Initialize the slc mapping table. - */ - void -get_slc_defaults() -{ - register int i; - - init_termbuf(); - - for (i = 1; i <= NSLC; i++) { - slctab[i].defset.flag = - spcset(i, &slctab[i].defset.val, &slctab[i].sptr); - slctab[i].current.flag = SLC_NOSUPPORT; - slctab[i].current.val = 0; - } - -} /* end of get_slc_defaults */ - -#ifdef LINEMODE -/* - * add_slc - * - * Add an slc triplet to the slc buffer. - */ - void -add_slc(func, flag, val) - register char func, flag; - register cc_t val; -{ - - if ((*slcptr++ = (unsigned char)func) == 0xff) - *slcptr++ = 0xff; - - if ((*slcptr++ = (unsigned char)flag) == 0xff) - *slcptr++ = 0xff; - - if ((*slcptr++ = (unsigned char)val) == 0xff) - *slcptr++ = 0xff; - -} /* end of add_slc */ - -/* - * start_slc - * - * Get ready to process incoming slc's and respond to them. - * - * The parameter getit is non-zero if it is necessary to grab a copy - * of the terminal control structures. - */ - void -start_slc(getit) - register int getit; -{ - - slcchange = 0; - if (getit) - init_termbuf(); - (void) sprintf((char *)slcbuf, "%c%c%c%c", - IAC, SB, TELOPT_LINEMODE, LM_SLC); - slcptr = slcbuf + 4; - -} /* end of start_slc */ - -/* - * end_slc - * - * Finish up the slc negotiation. If something to send, then send it. - */ - int -end_slc(bufp) - register unsigned char **bufp; -{ - register int len; - void netflush(); - - /* - * If a change has occured, store the new terminal control - * structures back to the terminal driver. - */ - if (slcchange) { - set_termbuf(); - } - - /* - * If the pty state has not yet been fully processed and there is a - * deferred slc request from the client, then do not send any - * sort of slc negotiation now. We will respond to the client's - * request very soon. - */ - if (def_slcbuf && (terminit() == 0)) { - return(0); - } - - if (slcptr > (slcbuf + 4)) { - if (bufp) { - *bufp = &slcbuf[4]; - return(slcptr - slcbuf - 4); - } else { - (void) sprintf((char *)slcptr, "%c%c", IAC, SE); - slcptr += 2; - len = slcptr - slcbuf; - writenet(slcbuf, len); - netflush(); /* force it out immediately */ - DIAG(TD_OPTIONS, printsub('>', slcbuf+2, len-2);); - } - } - return (0); - -} /* end of end_slc */ - -/* - * process_slc - * - * Figure out what to do about the client's slc - */ - void -process_slc(func, flag, val) - register unsigned char func, flag; - register cc_t val; -{ - register int hislevel, mylevel, ack; - - /* - * Ensure that we know something about this function - */ - if (func > NSLC) { - add_slc(func, SLC_NOSUPPORT, 0); - return; - } - - /* - * Process the special case requests of 0 SLC_DEFAULT 0 - * and 0 SLC_VARIABLE 0. Be a little forgiving here, don't - * worry about whether the value is actually 0 or not. - */ - if (func == 0) { - if ((flag = flag & SLC_LEVELBITS) == SLC_DEFAULT) { - default_slc(); - send_slc(); - } else if (flag == SLC_VARIABLE) { - send_slc(); - } - return; - } - - /* - * Appears to be a function that we know something about. So - * get on with it and see what we know. - */ - - hislevel = flag & SLC_LEVELBITS; - mylevel = slctab[func].current.flag & SLC_LEVELBITS; - ack = flag & SLC_ACK; - /* - * ignore the command if: - * the function value and level are the same as what we already have; - * or the level is the same and the ack bit is set - */ - if (hislevel == mylevel && (val == slctab[func].current.val || ack)) { - return; - } else if (ack) { - /* - * If we get here, we got an ack, but the levels don't match. - * This shouldn't happen. If it does, it is probably because - * we have sent two requests to set a variable without getting - * a response between them, and this is the first response. - * So, ignore it, and wait for the next response. - */ - return; - } else { - change_slc(func, flag, val); - } - -} /* end of process_slc */ - -/* - * change_slc - * - * Process a request to change one of our special characters. - * Compare client's request with what we are capable of supporting. - */ - void -change_slc(func, flag, val) - register char func, flag; - register cc_t val; -{ - register int hislevel, mylevel; - - hislevel = flag & SLC_LEVELBITS; - mylevel = slctab[func].defset.flag & SLC_LEVELBITS; - /* - * If client is setting a function to NOSUPPORT - * or DEFAULT, then we can easily and directly - * accomodate the request. - */ - if (hislevel == SLC_NOSUPPORT) { - slctab[func].current.flag = flag; - slctab[func].current.val = (cc_t)_POSIX_VDISABLE; - flag |= SLC_ACK; - add_slc(func, flag, val); - return; - } - if (hislevel == SLC_DEFAULT) { - /* - * Special case here. If client tells us to use - * the default on a function we don't support, then - * return NOSUPPORT instead of what we may have as a - * default level of DEFAULT. - */ - if (mylevel == SLC_DEFAULT) { - slctab[func].current.flag = SLC_NOSUPPORT; - } else { - slctab[func].current.flag = slctab[func].defset.flag; - } - slctab[func].current.val = slctab[func].defset.val; - add_slc(func, slctab[func].current.flag, - slctab[func].current.val); - return; - } - - /* - * Client wants us to change to a new value or he - * is telling us that he can't change to our value. - * Some of the slc's we support and can change, - * some we do support but can't change, - * and others we don't support at all. - * If we can change it then we have a pointer to - * the place to put the new value, so change it, - * otherwise, continue the negotiation. - */ - if (slctab[func].sptr) { - /* - * We can change this one. - */ - slctab[func].current.val = val; - *(slctab[func].sptr) = val; - slctab[func].current.flag = flag; - flag |= SLC_ACK; - slcchange = 1; - add_slc(func, flag, val); - } else { - /* - * It is not possible for us to support this - * request as he asks. - * - * If our level is DEFAULT, then just ack whatever was - * sent. - * - * If he can't change and we can't change, - * then degenerate to NOSUPPORT. - * - * Otherwise we send our level back to him, (CANTCHANGE - * or NOSUPPORT) and if CANTCHANGE, send - * our value as well. - */ - if (mylevel == SLC_DEFAULT) { - slctab[func].current.flag = flag; - slctab[func].current.val = val; - flag |= SLC_ACK; - } else if (hislevel == SLC_CANTCHANGE && - mylevel == SLC_CANTCHANGE) { - flag &= ~SLC_LEVELBITS; - flag |= SLC_NOSUPPORT; - slctab[func].current.flag = flag; - } else { - flag &= ~SLC_LEVELBITS; - flag |= mylevel; - slctab[func].current.flag = flag; - if (mylevel == SLC_CANTCHANGE) { - slctab[func].current.val = - slctab[func].defset.val; - val = slctab[func].current.val; - } - } - add_slc(func, flag, val); - } - -} /* end of change_slc */ - -#if defined(USE_TERMIO) && (VEOF == VMIN) -cc_t oldeofc = '\004'; -#endif - -/* - * check_slc - * - * Check the special characters in use and notify the client if any have - * changed. Only those characters that are capable of being changed are - * likely to have changed. If a local change occurs, kick the support level - * and flags up to the defaults. - */ - void -check_slc() -{ - register int i; - - for (i = 1; i <= NSLC; i++) { -#if defined(USE_TERMIO) && (VEOF == VMIN) - /* - * In a perfect world this would be a neat little - * function. But in this world, we should not notify - * client of changes to the VEOF char when - * ICANON is off, because it is not representing - * a special character. - */ - if (i == SLC_EOF) { - if (!tty_isediting()) - continue; - else if (slctab[i].sptr) - oldeofc = *(slctab[i].sptr); - } -#endif /* defined(USE_TERMIO) && defined(SYSV_TERMIO) */ - if (slctab[i].sptr && - (*(slctab[i].sptr) != slctab[i].current.val)) { - slctab[i].current.val = *(slctab[i].sptr); - if (*(slctab[i].sptr) == (cc_t)_POSIX_VDISABLE) - slctab[i].current.flag = SLC_NOSUPPORT; - else - slctab[i].current.flag = slctab[i].defset.flag; - add_slc((unsigned char)i, slctab[i].current.flag, - slctab[i].current.val); - } - } -} /* check_slc */ - -/* - * do_opt_slc - * - * Process an slc option buffer. Defer processing of incoming slc's - * until after the terminal state has been processed. Save the first slc - * request that comes along, but discard all others. - * - * ptr points to the beginning of the buffer, len is the length. - */ - void -do_opt_slc(ptr, len) - register unsigned char *ptr; - register int len; -{ - register unsigned char func, flag; - cc_t val; - register unsigned char *end = ptr + len; - - if (terminit()) { /* go ahead */ - while (ptr < end) { - func = *ptr++; - if (ptr >= end) break; - flag = *ptr++; - if (ptr >= end) break; - val = (cc_t)*ptr++; - - process_slc(func, flag, val); - - } - } else { - /* - * save this slc buffer if it is the first, otherwise dump - * it. - */ - if (def_slcbuf == (unsigned char *)0) { - def_slclen = len; - def_slcbuf = (unsigned char *)malloc((unsigned)len); - if (def_slcbuf == (unsigned char *)0) - return; /* too bad */ - memmove(def_slcbuf, ptr, len); - } - } - -} /* end of do_opt_slc */ - -/* - * deferslc - * - * Do slc stuff that was deferred. - */ - void -deferslc() -{ - if (def_slcbuf) { - start_slc(1); - do_opt_slc(def_slcbuf, def_slclen); - (void) end_slc(0); - free(def_slcbuf); - def_slcbuf = (unsigned char *)0; - def_slclen = 0; - } - -} /* end of deferslc */ - -#endif /* LINEMODE */ diff --git a/secure/libexec/telnetd/state.c b/secure/libexec/telnetd/state.c deleted file mode 100644 index 4ee8bea66f977..0000000000000 --- a/secure/libexec/telnetd/state.c +++ /dev/null @@ -1,1612 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include "telnetd.h" -#if defined(AUTHENTICATION) -#include -#endif - -unsigned char doopt[] = { IAC, DO, '%', 'c', 0 }; -unsigned char dont[] = { IAC, DONT, '%', 'c', 0 }; -unsigned char will[] = { IAC, WILL, '%', 'c', 0 }; -unsigned char wont[] = { IAC, WONT, '%', 'c', 0 }; -int not42 = 1; - -/* - * Buffer for sub-options, and macros - * for suboptions buffer manipulations - */ -unsigned char subbuffer[512], *subpointer= subbuffer, *subend= subbuffer; - -#define SB_CLEAR() subpointer = subbuffer -#define SB_TERM() { subend = subpointer; SB_CLEAR(); } -#define SB_ACCUM(c) if (subpointer < (subbuffer+sizeof subbuffer)) { \ - *subpointer++ = (c); \ - } -#define SB_GET() ((*subpointer++)&0xff) -#define SB_EOF() (subpointer >= subend) -#define SB_LEN() (subend - subpointer) - -#ifdef ENV_HACK -unsigned char *subsave; -#define SB_SAVE() subsave = subpointer; -#define SB_RESTORE() subpointer = subsave; -#endif - - -/* - * State for recv fsm - */ -#define TS_DATA 0 /* base state */ -#define TS_IAC 1 /* look for double IAC's */ -#define TS_CR 2 /* CR-LF ->'s CR */ -#define TS_SB 3 /* throw away begin's... */ -#define TS_SE 4 /* ...end's (suboption negotiation) */ -#define TS_WILL 5 /* will option negotiation */ -#define TS_WONT 6 /* wont " */ -#define TS_DO 7 /* do " */ -#define TS_DONT 8 /* dont " */ - - void -telrcv() -{ - register int c; - static int state = TS_DATA; -#if defined(CRAY2) && defined(UNICOS5) - char *opfrontp = pfrontp; -#endif - - while (ncc > 0) { - if ((&ptyobuf[BUFSIZ] - pfrontp) < 2) - break; - c = *netip++ & 0377, ncc--; -#ifdef ENCRYPTION - if (decrypt_input) - c = (*decrypt_input)(c); -#endif /* ENCRYPTION */ - switch (state) { - - case TS_CR: - state = TS_DATA; - /* Strip off \n or \0 after a \r */ - if ((c == 0) || (c == '\n')) { - break; - } - /* FALL THROUGH */ - - case TS_DATA: - if (c == IAC) { - state = TS_IAC; - break; - } - /* - * We now map \r\n ==> \r for pragmatic reasons. - * Many client implementations send \r\n when - * the user hits the CarriageReturn key. - * - * We USED to map \r\n ==> \n, since \r\n says - * that we want to be in column 1 of the next - * printable line, and \n is the standard - * unix way of saying that (\r is only good - * if CRMOD is set, which it normally is). - */ - if ((c == '\r') && his_state_is_wont(TELOPT_BINARY)) { - int nc = *netip; -#ifdef ENCRYPTION - if (decrypt_input) - nc = (*decrypt_input)(nc & 0xff); -#endif /* ENCRYPTION */ -#ifdef LINEMODE - /* - * If we are operating in linemode, - * convert to local end-of-line. - */ - if (linemode && (ncc > 0) && (('\n' == nc) || - ((0 == nc) && tty_iscrnl())) ) { - netip++; ncc--; - c = '\n'; - } else -#endif - { -#ifdef ENCRYPTION - if (decrypt_input) - (void)(*decrypt_input)(-1); -#endif /* ENCRYPTION */ - state = TS_CR; - } - } - *pfrontp++ = c; - break; - - case TS_IAC: -gotiac: switch (c) { - - /* - * Send the process on the pty side an - * interrupt. Do this with a NULL or - * interrupt char; depending on the tty mode. - */ - case IP: - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - interrupt(); - break; - - case BREAK: - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - sendbrk(); - break; - - /* - * Are You There? - */ - case AYT: - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - recv_ayt(); - break; - - /* - * Abort Output - */ - case AO: - { - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - ptyflush(); /* half-hearted */ - init_termbuf(); - - if (slctab[SLC_AO].sptr && - *slctab[SLC_AO].sptr != (cc_t)(_POSIX_VDISABLE)) { - *pfrontp++ = - (unsigned char)*slctab[SLC_AO].sptr; - } - - netclear(); /* clear buffer back */ - *nfrontp++ = IAC; - *nfrontp++ = DM; - neturg = nfrontp-1; /* off by one XXX */ - DIAG(TD_OPTIONS, - printoption("td: send IAC", DM)); - break; - } - - /* - * Erase Character and - * Erase Line - */ - case EC: - case EL: - { - cc_t ch; - - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - ptyflush(); /* half-hearted */ - init_termbuf(); - if (c == EC) - ch = *slctab[SLC_EC].sptr; - else - ch = *slctab[SLC_EL].sptr; - if (ch != (cc_t)(_POSIX_VDISABLE)) - *pfrontp++ = (unsigned char)ch; - break; - } - - /* - * Check for urgent data... - */ - case DM: - DIAG(TD_OPTIONS, - printoption("td: recv IAC", c)); - SYNCHing = stilloob(net); - settimer(gotDM); - break; - - - /* - * Begin option subnegotiation... - */ - case SB: - state = TS_SB; - SB_CLEAR(); - continue; - - case WILL: - state = TS_WILL; - continue; - - case WONT: - state = TS_WONT; - continue; - - case DO: - state = TS_DO; - continue; - - case DONT: - state = TS_DONT; - continue; - case EOR: - if (his_state_is_will(TELOPT_EOR)) - doeof(); - break; - - /* - * Handle RFC 10xx Telnet linemode option additions - * to command stream (EOF, SUSP, ABORT). - */ - case xEOF: - doeof(); - break; - - case SUSP: - sendsusp(); - break; - - case ABORT: - sendbrk(); - break; - - case IAC: - *pfrontp++ = c; - break; - } - state = TS_DATA; - break; - - case TS_SB: - if (c == IAC) { - state = TS_SE; - } else { - SB_ACCUM(c); - } - break; - - case TS_SE: - if (c != SE) { - if (c != IAC) { - /* - * bad form of suboption negotiation. - * handle it in such a way as to avoid - * damage to local state. Parse - * suboption buffer found so far, - * then treat remaining stream as - * another command sequence. - */ - - /* for DIAGNOSTICS */ - SB_ACCUM(IAC); - SB_ACCUM(c); - subpointer -= 2; - - SB_TERM(); - suboption(); - state = TS_IAC; - goto gotiac; - } - SB_ACCUM(c); - state = TS_SB; - } else { - /* for DIAGNOSTICS */ - SB_ACCUM(IAC); - SB_ACCUM(SE); - subpointer -= 2; - - SB_TERM(); - suboption(); /* handle sub-option */ - state = TS_DATA; - } - break; - - case TS_WILL: - willoption(c); - state = TS_DATA; - continue; - - case TS_WONT: - wontoption(c); - state = TS_DATA; - continue; - - case TS_DO: - dooption(c); - state = TS_DATA; - continue; - - case TS_DONT: - dontoption(c); - state = TS_DATA; - continue; - - default: - syslog(LOG_ERR, "telnetd: panic state=%d\n", state); - printf("telnetd: panic state=%d\n", state); - exit(1); - } - } -#if defined(CRAY2) && defined(UNICOS5) - if (!linemode) { - char xptyobuf[BUFSIZ+NETSLOP]; - char xbuf2[BUFSIZ]; - register char *cp; - int n = pfrontp - opfrontp, oc; - memmove(xptyobuf, opfrontp, n); - pfrontp = opfrontp; - pfrontp += term_input(xptyobuf, pfrontp, n, BUFSIZ+NETSLOP, - xbuf2, &oc, BUFSIZ); - for (cp = xbuf2; oc > 0; --oc) - if ((*nfrontp++ = *cp++) == IAC) - *nfrontp++ = IAC; - } -#endif /* defined(CRAY2) && defined(UNICOS5) */ -} /* end of telrcv */ - -/* - * The will/wont/do/dont state machines are based on Dave Borman's - * Telnet option processing state machine. - * - * These correspond to the following states: - * my_state = the last negotiated state - * want_state = what I want the state to go to - * want_resp = how many requests I have sent - * All state defaults are negative, and resp defaults to 0. - * - * When initiating a request to change state to new_state: - * - * if ((want_resp == 0 && new_state == my_state) || want_state == new_state) { - * do nothing; - * } else { - * want_state = new_state; - * send new_state; - * want_resp++; - * } - * - * When receiving new_state: - * - * if (want_resp) { - * want_resp--; - * if (want_resp && (new_state == my_state)) - * want_resp--; - * } - * if ((want_resp == 0) && (new_state != want_state)) { - * if (ok_to_switch_to new_state) - * want_state = new_state; - * else - * want_resp++; - * send want_state; - * } - * my_state = new_state; - * - * Note that new_state is implied in these functions by the function itself. - * will and do imply positive new_state, wont and dont imply negative. - * - * Finally, there is one catch. If we send a negative response to a - * positive request, my_state will be the positive while want_state will - * remain negative. my_state will revert to negative when the negative - * acknowlegment arrives from the peer. Thus, my_state generally tells - * us not only the last negotiated state, but also tells us what the peer - * wants to be doing as well. It is important to understand this difference - * as we may wish to be processing data streams based on our desired state - * (want_state) or based on what the peer thinks the state is (my_state). - * - * This all works fine because if the peer sends a positive request, the data - * that we receive prior to negative acknowlegment will probably be affected - * by the positive state, and we can process it as such (if we can; if we - * can't then it really doesn't matter). If it is that important, then the - * peer probably should be buffering until this option state negotiation - * is complete. - * - */ - void -send_do(option, init) - int option, init; -{ - if (init) { - if ((do_dont_resp[option] == 0 && his_state_is_will(option)) || - his_want_state_is_will(option)) - return; - /* - * Special case for TELOPT_TM: We send a DO, but pretend - * that we sent a DONT, so that we can send more DOs if - * we want to. - */ - if (option == TELOPT_TM) - set_his_want_state_wont(option); - else - set_his_want_state_will(option); - do_dont_resp[option]++; - } - (void) sprintf(nfrontp, (char *)doopt, option); - nfrontp += sizeof (dont) - 2; - - DIAG(TD_OPTIONS, printoption("td: send do", option)); -} - -#ifdef AUTHENTICATION -extern void auth_request(); -#endif -#ifdef LINEMODE -extern void doclientstat(); -#endif -#ifdef ENCRYPTION -extern void encrypt_send_support(); -#endif /* ENCRYPTION */ - - void -willoption(option) - int option; -{ - int changeok = 0; - void (*func)() = 0; - - /* - * process input from peer. - */ - - DIAG(TD_OPTIONS, printoption("td: recv will", option)); - - if (do_dont_resp[option]) { - do_dont_resp[option]--; - if (do_dont_resp[option] && his_state_is_will(option)) - do_dont_resp[option]--; - } - if (do_dont_resp[option] == 0) { - if (his_want_state_is_wont(option)) { - switch (option) { - - case TELOPT_BINARY: - init_termbuf(); - tty_binaryin(1); - set_termbuf(); - changeok++; - break; - - case TELOPT_ECHO: - /* - * See comments below for more info. - */ - not42 = 0; /* looks like a 4.2 system */ - break; - - case TELOPT_TM: -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - /* - * This telnetd implementation does not really - * support timing marks, it just uses them to - * support the kludge linemode stuff. If we - * receive a will or wont TM in response to our - * do TM request that may have been sent to - * determine kludge linemode support, process - * it, otherwise TM should get a negative - * response back. - */ - /* - * Handle the linemode kludge stuff. - * If we are not currently supporting any - * linemode at all, then we assume that this - * is the client telling us to use kludge - * linemode in response to our query. Set the - * linemode type that is to be supported, note - * that the client wishes to use linemode, and - * eat the will TM as though it never arrived. - */ - if (lmodetype < KLUDGE_LINEMODE) { - lmodetype = KLUDGE_LINEMODE; - clientstat(TELOPT_LINEMODE, WILL, 0); - send_wont(TELOPT_SGA, 1); - } else if (lmodetype == NO_AUTOKLUDGE) { - lmodetype = KLUDGE_OK; - } -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - /* - * We never respond to a WILL TM, and - * we leave the state WONT. - */ - return; - - case TELOPT_LFLOW: - /* - * If we are going to support flow control - * option, then don't worry peer that we can't - * change the flow control characters. - */ - slctab[SLC_XON].defset.flag &= ~SLC_LEVELBITS; - slctab[SLC_XON].defset.flag |= SLC_DEFAULT; - slctab[SLC_XOFF].defset.flag &= ~SLC_LEVELBITS; - slctab[SLC_XOFF].defset.flag |= SLC_DEFAULT; - case TELOPT_TTYPE: - case TELOPT_SGA: - case TELOPT_NAWS: - case TELOPT_TSPEED: - case TELOPT_XDISPLOC: - case TELOPT_NEW_ENVIRON: - case TELOPT_OLD_ENVIRON: - changeok++; - break; - -#ifdef LINEMODE - case TELOPT_LINEMODE: -# ifdef KLUDGELINEMODE - /* - * Note client's desire to use linemode. - */ - lmodetype = REAL_LINEMODE; -# endif /* KLUDGELINEMODE */ - func = doclientstat; - changeok++; - break; -#endif /* LINEMODE */ - -#ifdef AUTHENTICATION - case TELOPT_AUTHENTICATION: - func = auth_request; - changeok++; - break; -#endif - -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - func = encrypt_send_support; - changeok++; - break; -#endif /* ENCRYPTION */ - - default: - break; - } - if (changeok) { - set_his_want_state_will(option); - send_do(option, 0); - } else { - do_dont_resp[option]++; - send_dont(option, 0); - } - } else { - /* - * Option processing that should happen when - * we receive conformation of a change in - * state that we had requested. - */ - switch (option) { - case TELOPT_ECHO: - not42 = 0; /* looks like a 4.2 system */ - /* - * Egads, he responded "WILL ECHO". Turn - * it off right now! - */ - send_dont(option, 1); - /* - * "WILL ECHO". Kludge upon kludge! - * A 4.2 client is now echoing user input at - * the tty. This is probably undesireable and - * it should be stopped. The client will - * respond WONT TM to the DO TM that we send to - * check for kludge linemode. When the WONT TM - * arrives, linemode will be turned off and a - * change propogated to the pty. This change - * will cause us to process the new pty state - * in localstat(), which will notice that - * linemode is off and send a WILL ECHO - * so that we are properly in character mode and - * all is well. - */ - break; -#ifdef LINEMODE - case TELOPT_LINEMODE: -# ifdef KLUDGELINEMODE - /* - * Note client's desire to use linemode. - */ - lmodetype = REAL_LINEMODE; -# endif /* KLUDGELINEMODE */ - func = doclientstat; - break; -#endif /* LINEMODE */ - -#ifdef AUTHENTICATION - case TELOPT_AUTHENTICATION: - func = auth_request; - break; -#endif - -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - func = encrypt_send_support; - break; -#endif /* ENCRYPTION */ - case TELOPT_LFLOW: - func = flowstat; - break; - } - } - } - set_his_state_will(option); - if (func) - (*func)(); -} /* end of willoption */ - - void -send_dont(option, init) - int option, init; -{ - if (init) { - if ((do_dont_resp[option] == 0 && his_state_is_wont(option)) || - his_want_state_is_wont(option)) - return; - set_his_want_state_wont(option); - do_dont_resp[option]++; - } - (void) sprintf(nfrontp, (char *)dont, option); - nfrontp += sizeof (doopt) - 2; - - DIAG(TD_OPTIONS, printoption("td: send dont", option)); -} - - void -wontoption(option) - int option; -{ - /* - * Process client input. - */ - - DIAG(TD_OPTIONS, printoption("td: recv wont", option)); - - if (do_dont_resp[option]) { - do_dont_resp[option]--; - if (do_dont_resp[option] && his_state_is_wont(option)) - do_dont_resp[option]--; - } - if (do_dont_resp[option] == 0) { - if (his_want_state_is_will(option)) { - /* it is always ok to change to negative state */ - switch (option) { - case TELOPT_ECHO: - not42 = 1; /* doesn't seem to be a 4.2 system */ - break; - - case TELOPT_BINARY: - init_termbuf(); - tty_binaryin(0); - set_termbuf(); - break; - -#ifdef LINEMODE - case TELOPT_LINEMODE: -# ifdef KLUDGELINEMODE - /* - * If real linemode is supported, then client is - * asking to turn linemode off. - */ - if (lmodetype != REAL_LINEMODE) - break; -# endif /* KLUDGELINEMODE */ - clientstat(TELOPT_LINEMODE, WONT, 0); - break; -#endif /* LINEMODE */ - - case TELOPT_TM: - /* - * If we get a WONT TM, and had sent a DO TM, - * don't respond with a DONT TM, just leave it - * as is. Short circut the state machine to - * achive this. - */ - set_his_want_state_wont(TELOPT_TM); - return; - - case TELOPT_LFLOW: - /* - * If we are not going to support flow control - * option, then let peer know that we can't - * change the flow control characters. - */ - slctab[SLC_XON].defset.flag &= ~SLC_LEVELBITS; - slctab[SLC_XON].defset.flag |= SLC_CANTCHANGE; - slctab[SLC_XOFF].defset.flag &= ~SLC_LEVELBITS; - slctab[SLC_XOFF].defset.flag |= SLC_CANTCHANGE; - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - auth_finished(0, AUTH_REJECT); - break; -#endif - - /* - * For options that we might spin waiting for - * sub-negotiation, if the client turns off the - * option rather than responding to the request, - * we have to treat it here as if we got a response - * to the sub-negotiation, (by updating the timers) - * so that we'll break out of the loop. - */ - case TELOPT_TTYPE: - settimer(ttypesubopt); - break; - - case TELOPT_TSPEED: - settimer(tspeedsubopt); - break; - - case TELOPT_XDISPLOC: - settimer(xdisplocsubopt); - break; - - case TELOPT_OLD_ENVIRON: - settimer(oenvironsubopt); - break; - - case TELOPT_NEW_ENVIRON: - settimer(environsubopt); - break; - - default: - break; - } - set_his_want_state_wont(option); - if (his_state_is_will(option)) - send_dont(option, 0); - } else { - switch (option) { - case TELOPT_TM: -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - if (lmodetype < NO_AUTOKLUDGE) { - lmodetype = NO_LINEMODE; - clientstat(TELOPT_LINEMODE, WONT, 0); - send_will(TELOPT_SGA, 1); - send_will(TELOPT_ECHO, 1); - } -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - auth_finished(0, AUTH_REJECT); - break; -#endif - default: - break; - } - } - } - set_his_state_wont(option); - -} /* end of wontoption */ - - void -send_will(option, init) - int option, init; -{ - if (init) { - if ((will_wont_resp[option] == 0 && my_state_is_will(option))|| - my_want_state_is_will(option)) - return; - set_my_want_state_will(option); - will_wont_resp[option]++; - } - (void) sprintf(nfrontp, (char *)will, option); - nfrontp += sizeof (doopt) - 2; - - DIAG(TD_OPTIONS, printoption("td: send will", option)); -} - -#if !defined(LINEMODE) || !defined(KLUDGELINEMODE) -/* - * When we get a DONT SGA, we will try once to turn it - * back on. If the other side responds DONT SGA, we - * leave it at that. This is so that when we talk to - * clients that understand KLUDGELINEMODE but not LINEMODE, - * we'll keep them in char-at-a-time mode. - */ -int turn_on_sga = 0; -#endif - - void -dooption(option) - int option; -{ - int changeok = 0; - - /* - * Process client input. - */ - - DIAG(TD_OPTIONS, printoption("td: recv do", option)); - - if (will_wont_resp[option]) { - will_wont_resp[option]--; - if (will_wont_resp[option] && my_state_is_will(option)) - will_wont_resp[option]--; - } - if ((will_wont_resp[option] == 0) && (my_want_state_is_wont(option))) { - switch (option) { - case TELOPT_ECHO: -#ifdef LINEMODE -# ifdef KLUDGELINEMODE - if (lmodetype == NO_LINEMODE) -# else - if (his_state_is_wont(TELOPT_LINEMODE)) -# endif -#endif - { - init_termbuf(); - tty_setecho(1); - set_termbuf(); - } - changeok++; - break; - - case TELOPT_BINARY: - init_termbuf(); - tty_binaryout(1); - set_termbuf(); - changeok++; - break; - - case TELOPT_SGA: -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - /* - * If kludge linemode is in use, then we must - * process an incoming do SGA for linemode - * purposes. - */ - if (lmodetype == KLUDGE_LINEMODE) { - /* - * Receipt of "do SGA" in kludge - * linemode is the peer asking us to - * turn off linemode. Make note of - * the request. - */ - clientstat(TELOPT_LINEMODE, WONT, 0); - /* - * If linemode did not get turned off - * then don't tell peer that we did. - * Breaking here forces a wont SGA to - * be returned. - */ - if (linemode) - break; - } -#else - turn_on_sga = 0; -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - changeok++; - break; - - case TELOPT_STATUS: - changeok++; - break; - - case TELOPT_TM: - /* - * Special case for TM. We send a WILL, but - * pretend we sent a WONT. - */ - send_will(option, 0); - set_my_want_state_wont(option); - set_my_state_wont(option); - return; - - case TELOPT_LOGOUT: - /* - * When we get a LOGOUT option, respond - * with a WILL LOGOUT, make sure that - * it gets written out to the network, - * and then just go away... - */ - set_my_want_state_will(TELOPT_LOGOUT); - send_will(TELOPT_LOGOUT, 0); - set_my_state_will(TELOPT_LOGOUT); - (void)netflush(); - cleanup(0); - /* NOT REACHED */ - break; - -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - changeok++; - break; -#endif /* ENCRYPTION */ - case TELOPT_LINEMODE: - case TELOPT_TTYPE: - case TELOPT_NAWS: - case TELOPT_TSPEED: - case TELOPT_LFLOW: - case TELOPT_XDISPLOC: -#ifdef TELOPT_ENVIRON - case TELOPT_NEW_ENVIRON: -#endif - case TELOPT_OLD_ENVIRON: - default: - break; - } - if (changeok) { - set_my_want_state_will(option); - send_will(option, 0); - } else { - will_wont_resp[option]++; - send_wont(option, 0); - } - } - set_my_state_will(option); - -} /* end of dooption */ - - void -send_wont(option, init) - int option, init; -{ - if (init) { - if ((will_wont_resp[option] == 0 && my_state_is_wont(option)) || - my_want_state_is_wont(option)) - return; - set_my_want_state_wont(option); - will_wont_resp[option]++; - } - (void) sprintf(nfrontp, (char *)wont, option); - nfrontp += sizeof (wont) - 2; - - DIAG(TD_OPTIONS, printoption("td: send wont", option)); -} - - void -dontoption(option) - int option; -{ - /* - * Process client input. - */ - - - DIAG(TD_OPTIONS, printoption("td: recv dont", option)); - - if (will_wont_resp[option]) { - will_wont_resp[option]--; - if (will_wont_resp[option] && my_state_is_wont(option)) - will_wont_resp[option]--; - } - if ((will_wont_resp[option] == 0) && (my_want_state_is_will(option))) { - switch (option) { - case TELOPT_BINARY: - init_termbuf(); - tty_binaryout(0); - set_termbuf(); - break; - - case TELOPT_ECHO: /* we should stop echoing */ -#ifdef LINEMODE -# ifdef KLUDGELINEMODE - if ((lmodetype != REAL_LINEMODE) && - (lmodetype != KLUDGE_LINEMODE)) -# else - if (his_state_is_wont(TELOPT_LINEMODE)) -# endif -#endif - { - init_termbuf(); - tty_setecho(0); - set_termbuf(); - } - break; - - case TELOPT_SGA: -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - /* - * If kludge linemode is in use, then we - * must process an incoming do SGA for - * linemode purposes. - */ - if ((lmodetype == KLUDGE_LINEMODE) || - (lmodetype == KLUDGE_OK)) { - /* - * The client is asking us to turn - * linemode on. - */ - lmodetype = KLUDGE_LINEMODE; - clientstat(TELOPT_LINEMODE, WILL, 0); - /* - * If we did not turn line mode on, - * then what do we say? Will SGA? - * This violates design of telnet. - * Gross. Very Gross. - */ - } - break; -#else - set_my_want_state_wont(option); - if (my_state_is_will(option)) - send_wont(option, 0); - set_my_state_wont(option); - if (turn_on_sga ^= 1) - send_will(option, 1); - return; -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - - default: - break; - } - - set_my_want_state_wont(option); - if (my_state_is_will(option)) - send_wont(option, 0); - } - set_my_state_wont(option); - -} /* end of dontoption */ - -#ifdef ENV_HACK -int env_ovar = -1; -int env_ovalue = -1; -#else /* ENV_HACK */ -# define env_ovar OLD_ENV_VAR -# define env_ovalue OLD_ENV_VALUE -#endif /* ENV_HACK */ - -/* - * suboption() - * - * Look at the sub-option buffer, and try to be helpful to the other - * side. - * - * Currently we recognize: - * - * Terminal type is - * Linemode - * Window size - * Terminal speed - */ - void -suboption() -{ - register int subchar; - - DIAG(TD_OPTIONS, {netflush(); printsub('<', subpointer, SB_LEN()+2);}); - - subchar = SB_GET(); - switch (subchar) { - case TELOPT_TSPEED: { - register int xspeed, rspeed; - - if (his_state_is_wont(TELOPT_TSPEED)) /* Ignore if option disabled */ - break; - - settimer(tspeedsubopt); - - if (SB_EOF() || SB_GET() != TELQUAL_IS) - return; - - xspeed = atoi((char *)subpointer); - - while (SB_GET() != ',' && !SB_EOF()); - if (SB_EOF()) - return; - - rspeed = atoi((char *)subpointer); - clientstat(TELOPT_TSPEED, xspeed, rspeed); - - break; - - } /* end of case TELOPT_TSPEED */ - - case TELOPT_TTYPE: { /* Yaaaay! */ - static char terminalname[41]; - - if (his_state_is_wont(TELOPT_TTYPE)) /* Ignore if option disabled */ - break; - settimer(ttypesubopt); - - if (SB_EOF() || SB_GET() != TELQUAL_IS) { - return; /* ??? XXX but, this is the most robust */ - } - - terminaltype = terminalname; - - while ((terminaltype < (terminalname + sizeof terminalname-1)) && - !SB_EOF()) { - register int c; - - c = SB_GET(); - if (isupper(c)) { - c = tolower(c); - } - *terminaltype++ = c; /* accumulate name */ - } - *terminaltype = 0; - terminaltype = terminalname; - break; - } /* end of case TELOPT_TTYPE */ - - case TELOPT_NAWS: { - register int xwinsize, ywinsize; - - if (his_state_is_wont(TELOPT_NAWS)) /* Ignore if option disabled */ - break; - - if (SB_EOF()) - return; - xwinsize = SB_GET() << 8; - if (SB_EOF()) - return; - xwinsize |= SB_GET(); - if (SB_EOF()) - return; - ywinsize = SB_GET() << 8; - if (SB_EOF()) - return; - ywinsize |= SB_GET(); - clientstat(TELOPT_NAWS, xwinsize, ywinsize); - - break; - - } /* end of case TELOPT_NAWS */ - -#ifdef LINEMODE - case TELOPT_LINEMODE: { - register int request; - - if (his_state_is_wont(TELOPT_LINEMODE)) /* Ignore if option disabled */ - break; - /* - * Process linemode suboptions. - */ - if (SB_EOF()) - break; /* garbage was sent */ - request = SB_GET(); /* get will/wont */ - - if (SB_EOF()) - break; /* another garbage check */ - - if (request == LM_SLC) { /* SLC is not preceeded by WILL or WONT */ - /* - * Process suboption buffer of slc's - */ - start_slc(1); - do_opt_slc(subpointer, subend - subpointer); - (void) end_slc(0); - break; - } else if (request == LM_MODE) { - if (SB_EOF()) - return; - useeditmode = SB_GET(); /* get mode flag */ - clientstat(LM_MODE, 0, 0); - break; - } - - if (SB_EOF()) - break; - switch (SB_GET()) { /* what suboption? */ - case LM_FORWARDMASK: - /* - * According to spec, only server can send request for - * forwardmask, and client can only return a positive response. - * So don't worry about it. - */ - - default: - break; - } - break; - } /* end of case TELOPT_LINEMODE */ -#endif - case TELOPT_STATUS: { - int mode; - - if (SB_EOF()) - break; - mode = SB_GET(); - switch (mode) { - case TELQUAL_SEND: - if (my_state_is_will(TELOPT_STATUS)) - send_status(); - break; - - case TELQUAL_IS: - break; - - default: - break; - } - break; - } /* end of case TELOPT_STATUS */ - - case TELOPT_XDISPLOC: { - if (SB_EOF() || SB_GET() != TELQUAL_IS) - return; - settimer(xdisplocsubopt); - subpointer[SB_LEN()] = '\0'; - (void)setenv("DISPLAY", (char *)subpointer, 1); - break; - } /* end of case TELOPT_XDISPLOC */ - -#ifdef TELOPT_NEW_ENVIRON - case TELOPT_NEW_ENVIRON: -#endif - case TELOPT_OLD_ENVIRON: { - register int c; - register char *cp, *varp, *valp; - - if (SB_EOF()) - return; - c = SB_GET(); - if (c == TELQUAL_IS) { - if (subchar == TELOPT_OLD_ENVIRON) - settimer(oenvironsubopt); - else - settimer(environsubopt); - } else if (c != TELQUAL_INFO) { - return; - } - -#ifdef TELOPT_NEW_ENVIRON - if (subchar == TELOPT_NEW_ENVIRON) { - while (!SB_EOF()) { - c = SB_GET(); - if ((c == NEW_ENV_VAR) || (c == ENV_USERVAR)) - break; - } - } else -#endif - { -#ifdef ENV_HACK - /* - * We only want to do this if we haven't already decided - * whether or not the other side has its VALUE and VAR - * reversed. - */ - if (env_ovar < 0) { - register int last = -1; /* invalid value */ - int empty = 0; - int got_var = 0, got_value = 0, got_uservar = 0; - - /* - * The other side might have its VALUE and VAR values - * reversed. To be interoperable, we need to determine - * which way it is. If the first recognized character - * is a VAR or VALUE, then that will tell us what - * type of client it is. If the fist recognized - * character is a USERVAR, then we continue scanning - * the suboption looking for two consecutive - * VAR or VALUE fields. We should not get two - * consecutive VALUE fields, so finding two - * consecutive VALUE or VAR fields will tell us - * what the client is. - */ - SB_SAVE(); - while (!SB_EOF()) { - c = SB_GET(); - switch(c) { - case OLD_ENV_VAR: - if (last < 0 || last == OLD_ENV_VAR - || (empty && (last == OLD_ENV_VALUE))) - goto env_ovar_ok; - got_var++; - last = OLD_ENV_VAR; - break; - case OLD_ENV_VALUE: - if (last < 0 || last == OLD_ENV_VALUE - || (empty && (last == OLD_ENV_VAR))) - goto env_ovar_wrong; - got_value++; - last = OLD_ENV_VALUE; - break; - case ENV_USERVAR: - /* count strings of USERVAR as one */ - if (last != ENV_USERVAR) - got_uservar++; - if (empty) { - if (last == OLD_ENV_VALUE) - goto env_ovar_ok; - if (last == OLD_ENV_VAR) - goto env_ovar_wrong; - } - last = ENV_USERVAR; - break; - case ENV_ESC: - if (!SB_EOF()) - c = SB_GET(); - /* FALL THROUGH */ - default: - empty = 0; - continue; - } - empty = 1; - } - if (empty) { - if (last == OLD_ENV_VALUE) - goto env_ovar_ok; - if (last == OLD_ENV_VAR) - goto env_ovar_wrong; - } - /* - * Ok, the first thing was a USERVAR, and there - * are not two consecutive VAR or VALUE commands, - * and none of the VAR or VALUE commands are empty. - * If the client has sent us a well-formed option, - * then the number of VALUEs received should always - * be less than or equal to the number of VARs and - * USERVARs received. - * - * If we got exactly as many VALUEs as VARs and - * USERVARs, the client has the same definitions. - * - * If we got exactly as many VARs as VALUEs and - * USERVARS, the client has reversed definitions. - */ - if (got_uservar + got_var == got_value) { - env_ovar_ok: - env_ovar = OLD_ENV_VAR; - env_ovalue = OLD_ENV_VALUE; - } else if (got_uservar + got_value == got_var) { - env_ovar_wrong: - env_ovar = OLD_ENV_VALUE; - env_ovalue = OLD_ENV_VAR; - DIAG(TD_OPTIONS, {sprintf(nfrontp, - "ENVIRON VALUE and VAR are reversed!\r\n"); - nfrontp += strlen(nfrontp);}); - - } - } - SB_RESTORE(); -#endif - - while (!SB_EOF()) { - c = SB_GET(); - if ((c == env_ovar) || (c == ENV_USERVAR)) - break; - } - } - - if (SB_EOF()) - return; - - cp = varp = (char *)subpointer; - valp = 0; - - while (!SB_EOF()) { - c = SB_GET(); - if (subchar == TELOPT_OLD_ENVIRON) { - if (c == env_ovar) - c = NEW_ENV_VAR; - else if (c == env_ovalue) - c = NEW_ENV_VALUE; - } - switch (c) { - - case NEW_ENV_VALUE: - *cp = '\0'; - cp = valp = (char *)subpointer; - break; - - case NEW_ENV_VAR: - case ENV_USERVAR: - *cp = '\0'; - if (valp) - (void)setenv(varp, valp, 1); - else - unsetenv(varp); - cp = varp = (char *)subpointer; - valp = 0; - break; - - case ENV_ESC: - if (SB_EOF()) - break; - c = SB_GET(); - /* FALL THROUGH */ - default: - *cp++ = c; - break; - } - } - *cp = '\0'; - if (valp) - (void)setenv(varp, valp, 1); - else - unsetenv(varp); - break; - } /* end of case TELOPT_NEW_ENVIRON */ -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - if (SB_EOF()) - break; - switch(SB_GET()) { - case TELQUAL_SEND: - case TELQUAL_REPLY: - /* - * These are sent by us and cannot be sent by - * the client. - */ - break; - case TELQUAL_IS: - auth_is(subpointer, SB_LEN()); - break; - case TELQUAL_NAME: - auth_name(subpointer, SB_LEN()); - break; - } - break; -#endif -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - if (SB_EOF()) - break; - switch(SB_GET()) { - case ENCRYPT_SUPPORT: - encrypt_support(subpointer, SB_LEN()); - break; - case ENCRYPT_IS: - encrypt_is(subpointer, SB_LEN()); - break; - case ENCRYPT_REPLY: - encrypt_reply(subpointer, SB_LEN()); - break; - case ENCRYPT_START: - encrypt_start(subpointer, SB_LEN()); - break; - case ENCRYPT_END: - encrypt_end(); - break; - case ENCRYPT_REQSTART: - encrypt_request_start(subpointer, SB_LEN()); - break; - case ENCRYPT_REQEND: - /* - * We can always send an REQEND so that we cannot - * get stuck encrypting. We should only get this - * if we have been able to get in the correct mode - * anyhow. - */ - encrypt_request_end(); - break; - case ENCRYPT_ENC_KEYID: - encrypt_enc_keyid(subpointer, SB_LEN()); - break; - case ENCRYPT_DEC_KEYID: - encrypt_dec_keyid(subpointer, SB_LEN()); - break; - default: - break; - } - break; -#endif /* ENCRYPTION */ - - default: - break; - } /* end of switch */ - -} /* end of suboption */ - - void -doclientstat() -{ - clientstat(TELOPT_LINEMODE, WILL, 0); -} - -#define ADD(c) *ncp++ = c -#define ADD_DATA(c) { *ncp++ = c; if (c == SE || c == IAC) *ncp++ = c; } - void -send_status() -{ - unsigned char statusbuf[256]; - register unsigned char *ncp; - register unsigned char i; - - ncp = statusbuf; - - netflush(); /* get rid of anything waiting to go out */ - - ADD(IAC); - ADD(SB); - ADD(TELOPT_STATUS); - ADD(TELQUAL_IS); - - /* - * We check the want_state rather than the current state, - * because if we received a DO/WILL for an option that we - * don't support, and the other side didn't send a DONT/WONT - * in response to our WONT/DONT, then the "state" will be - * WILL/DO, and the "want_state" will be WONT/DONT. We - * need to go by the latter. - */ - for (i = 0; i < (unsigned char)NTELOPTS; i++) { - if (my_want_state_is_will(i)) { - ADD(WILL); - ADD_DATA(i); - } - if (his_want_state_is_will(i)) { - ADD(DO); - ADD_DATA(i); - } - } - - if (his_want_state_is_will(TELOPT_LFLOW)) { - ADD(SB); - ADD(TELOPT_LFLOW); - if (flowmode) { - ADD(LFLOW_ON); - } else { - ADD(LFLOW_OFF); - } - ADD(SE); - - if (restartany >= 0) { - ADD(SB); - ADD(TELOPT_LFLOW); - if (restartany) { - ADD(LFLOW_RESTART_ANY); - } else { - ADD(LFLOW_RESTART_XON); - } - ADD(SE); - } - } - -#ifdef LINEMODE - if (his_want_state_is_will(TELOPT_LINEMODE)) { - unsigned char *cp, *cpe; - int len; - - ADD(SB); - ADD(TELOPT_LINEMODE); - ADD(LM_MODE); - ADD_DATA(editmode); - ADD(SE); - - ADD(SB); - ADD(TELOPT_LINEMODE); - ADD(LM_SLC); - start_slc(0); - send_slc(); - len = end_slc(&cp); - for (cpe = cp + len; cp < cpe; cp++) - ADD_DATA(*cp); - ADD(SE); - } -#endif /* LINEMODE */ - - ADD(IAC); - ADD(SE); - - writenet(statusbuf, ncp - statusbuf); - netflush(); /* Send it on its way */ - - DIAG(TD_OPTIONS, - {printsub('>', statusbuf, ncp - statusbuf); netflush();}); -} diff --git a/secure/libexec/telnetd/sys_term.c b/secure/libexec/telnetd/sys_term.c deleted file mode 100644 index 9297afdd152ed..0000000000000 --- a/secure/libexec/telnetd/sys_term.c +++ /dev/null @@ -1,2316 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include "telnetd.h" -#include "pathnames.h" - -#if defined(AUTHENTICATION) -#include -#endif - -#if defined(CRAY) || defined(__hpux) -# define PARENT_DOES_UTMP -#endif - -int utmp_len = MAXHOSTNAMELEN; -#ifdef NEWINIT -#include -#else /* NEWINIT*/ -# ifdef UTMPX -# include -struct utmpx wtmp; -# else -# include -struct utmp wtmp; -# endif /* UTMPX */ - -# ifndef PARENT_DOES_UTMP -#ifdef _PATH_WTMP -char wtmpf[] = _PATH_WTMP; -#else -char wtmpf[] = "/usr/adm/wtmp"; -#endif -#ifdef _PATH_UTMP -char utmpf[] = _PATH_UTMP; -#else -char utmpf[] = "/etc/utmp"; -#endif -# else /* PARENT_DOES_UTMP */ -char wtmpf[] = "/etc/wtmp"; -# endif /* PARENT_DOES_UTMP */ - -# ifdef CRAY -#include -#include -# if (UNICOS_LVL == '7.0') || (UNICOS_LVL == '7.1') -# define UNICOS7x -# endif - -# ifdef UNICOS7x -#include -#include -extern int secflag; -extern struct sysv sysv; -# endif /* UNICOS7x */ -# endif /* CRAY */ -#endif /* NEWINIT */ - -#ifdef STREAMSPTY -#include -#include -#endif - -#define SCPYN(a, b) (void) strncpy(a, b, sizeof(a)) -#define SCMPN(a, b) strncmp(a, b, sizeof(a)) - -#ifdef STREAMS -#include -#endif -#ifdef __hpux -#include -#include -#endif -#include -#ifdef t_erase -#undef t_erase -#undef t_kill -#undef t_intrc -#undef t_quitc -#undef t_startc -#undef t_stopc -#undef t_eofc -#undef t_brkc -#undef t_suspc -#undef t_dsuspc -#undef t_rprntc -#undef t_flushc -#undef t_werasc -#undef t_lnextc -#endif - -#if defined(UNICOS5) && defined(CRAY2) && !defined(EXTPROC) -# define EXTPROC 0400 -#endif - -#ifndef USE_TERMIO -struct termbuf { - struct sgttyb sg; - struct tchars tc; - struct ltchars ltc; - int state; - int lflags; -} termbuf, termbuf2; -# define cfsetospeed(tp, val) (tp)->sg.sg_ospeed = (val) -# define cfsetispeed(tp, val) (tp)->sg.sg_ispeed = (val) -# define cfgetospeed(tp) (tp)->sg.sg_ospeed -# define cfgetispeed(tp) (tp)->sg.sg_ispeed -#else /* USE_TERMIO */ -# ifdef SYSV_TERMIO -# define termios termio -# endif -# ifndef TCSANOW -# ifdef TCSETS -# define TCSANOW TCSETS -# define TCSADRAIN TCSETSW -# define tcgetattr(f, t) ioctl(f, TCGETS, (char *)t) -# else -# ifdef TCSETA -# define TCSANOW TCSETA -# define TCSADRAIN TCSETAW -# define tcgetattr(f, t) ioctl(f, TCGETA, (char *)t) -# else -# define TCSANOW TIOCSETA -# define TCSADRAIN TIOCSETAW -# define tcgetattr(f, t) ioctl(f, TIOCGETA, (char *)t) -# endif -# endif -# define tcsetattr(f, a, t) ioctl(f, a, t) -# define cfsetospeed(tp, val) (tp)->c_cflag &= ~CBAUD; \ - (tp)->c_cflag |= (val) -# define cfgetospeed(tp) ((tp)->c_cflag & CBAUD) -# ifdef CIBAUD -# define cfsetispeed(tp, val) (tp)->c_cflag &= ~CIBAUD; \ - (tp)->c_cflag |= ((val)<c_cflag & CIBAUD)>>IBSHIFT) -# else -# define cfsetispeed(tp, val) (tp)->c_cflag &= ~CBAUD; \ - (tp)->c_cflag |= (val) -# define cfgetispeed(tp) ((tp)->c_cflag & CBAUD) -# endif -# endif /* TCSANOW */ -struct termios termbuf, termbuf2; /* pty control structure */ -# ifdef STREAMSPTY -int ttyfd = -1; -# endif -#endif /* USE_TERMIO */ - -/* - * init_termbuf() - * copy_termbuf(cp) - * set_termbuf() - * - * These three routines are used to get and set the "termbuf" structure - * to and from the kernel. init_termbuf() gets the current settings. - * copy_termbuf() hands in a new "termbuf" to write to the kernel, and - * set_termbuf() writes the structure into the kernel. - */ - - void -init_termbuf() -{ -#ifndef USE_TERMIO - (void) ioctl(pty, TIOCGETP, (char *)&termbuf.sg); - (void) ioctl(pty, TIOCGETC, (char *)&termbuf.tc); - (void) ioctl(pty, TIOCGLTC, (char *)&termbuf.ltc); -# ifdef TIOCGSTATE - (void) ioctl(pty, TIOCGSTATE, (char *)&termbuf.state); -# endif -#else -# ifdef STREAMSPTY - (void) tcgetattr(ttyfd, &termbuf); -# else - (void) tcgetattr(pty, &termbuf); -# endif -#endif - termbuf2 = termbuf; -} - -#if defined(LINEMODE) && defined(TIOCPKT_IOCTL) - void -copy_termbuf(cp, len) - char *cp; - int len; -{ - if (len > sizeof(termbuf)) - len = sizeof(termbuf); - memmove((char *)&termbuf, cp, len); - termbuf2 = termbuf; -} -#endif /* defined(LINEMODE) && defined(TIOCPKT_IOCTL) */ - - void -set_termbuf() -{ - /* - * Only make the necessary changes. - */ -#ifndef USE_TERMIO - if (memcmp((char *)&termbuf.sg, (char *)&termbuf2.sg, - sizeof(termbuf.sg))) - (void) ioctl(pty, TIOCSETN, (char *)&termbuf.sg); - if (memcmp((char *)&termbuf.tc, (char *)&termbuf2.tc, - sizeof(termbuf.tc))) - (void) ioctl(pty, TIOCSETC, (char *)&termbuf.tc); - if (memcmp((char *)&termbuf.ltc, (char *)&termbuf2.ltc, - sizeof(termbuf.ltc))) - (void) ioctl(pty, TIOCSLTC, (char *)&termbuf.ltc); - if (termbuf.lflags != termbuf2.lflags) - (void) ioctl(pty, TIOCLSET, (char *)&termbuf.lflags); -#else /* USE_TERMIO */ - if (memcmp((char *)&termbuf, (char *)&termbuf2, sizeof(termbuf))) -# ifdef STREAMSPTY - (void) tcsetattr(ttyfd, TCSANOW, &termbuf); -# else - (void) tcsetattr(pty, TCSANOW, &termbuf); -# endif -# if defined(CRAY2) && defined(UNICOS5) - needtermstat = 1; -# endif -#endif /* USE_TERMIO */ -} - - -/* - * spcset(func, valp, valpp) - * - * This function takes various special characters (func), and - * sets *valp to the current value of that character, and - * *valpp to point to where in the "termbuf" structure that - * value is kept. - * - * It returns the SLC_ level of support for this function. - */ - -#ifndef USE_TERMIO - int -spcset(func, valp, valpp) - int func; - cc_t *valp; - cc_t **valpp; -{ - switch(func) { - case SLC_EOF: - *valp = termbuf.tc.t_eofc; - *valpp = (cc_t *)&termbuf.tc.t_eofc; - return(SLC_VARIABLE); - case SLC_EC: - *valp = termbuf.sg.sg_erase; - *valpp = (cc_t *)&termbuf.sg.sg_erase; - return(SLC_VARIABLE); - case SLC_EL: - *valp = termbuf.sg.sg_kill; - *valpp = (cc_t *)&termbuf.sg.sg_kill; - return(SLC_VARIABLE); - case SLC_IP: - *valp = termbuf.tc.t_intrc; - *valpp = (cc_t *)&termbuf.tc.t_intrc; - return(SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT); - case SLC_ABORT: - *valp = termbuf.tc.t_quitc; - *valpp = (cc_t *)&termbuf.tc.t_quitc; - return(SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT); - case SLC_XON: - *valp = termbuf.tc.t_startc; - *valpp = (cc_t *)&termbuf.tc.t_startc; - return(SLC_VARIABLE); - case SLC_XOFF: - *valp = termbuf.tc.t_stopc; - *valpp = (cc_t *)&termbuf.tc.t_stopc; - return(SLC_VARIABLE); - case SLC_AO: - *valp = termbuf.ltc.t_flushc; - *valpp = (cc_t *)&termbuf.ltc.t_flushc; - return(SLC_VARIABLE); - case SLC_SUSP: - *valp = termbuf.ltc.t_suspc; - *valpp = (cc_t *)&termbuf.ltc.t_suspc; - return(SLC_VARIABLE); - case SLC_EW: - *valp = termbuf.ltc.t_werasc; - *valpp = (cc_t *)&termbuf.ltc.t_werasc; - return(SLC_VARIABLE); - case SLC_RP: - *valp = termbuf.ltc.t_rprntc; - *valpp = (cc_t *)&termbuf.ltc.t_rprntc; - return(SLC_VARIABLE); - case SLC_LNEXT: - *valp = termbuf.ltc.t_lnextc; - *valpp = (cc_t *)&termbuf.ltc.t_lnextc; - return(SLC_VARIABLE); - case SLC_FORW1: - *valp = termbuf.tc.t_brkc; - *valpp = (cc_t *)&termbuf.ltc.t_lnextc; - return(SLC_VARIABLE); - case SLC_BRK: - case SLC_SYNCH: - case SLC_AYT: - case SLC_EOR: - *valp = (cc_t)0; - *valpp = (cc_t *)0; - return(SLC_DEFAULT); - default: - *valp = (cc_t)0; - *valpp = (cc_t *)0; - return(SLC_NOSUPPORT); - } -} - -#else /* USE_TERMIO */ - - int -spcset(func, valp, valpp) - int func; - cc_t *valp; - cc_t **valpp; -{ - -#define setval(a, b) *valp = termbuf.c_cc[a]; \ - *valpp = &termbuf.c_cc[a]; \ - return(b); -#define defval(a) *valp = ((cc_t)a); *valpp = (cc_t *)0; return(SLC_DEFAULT); - - switch(func) { - case SLC_EOF: - setval(VEOF, SLC_VARIABLE); - case SLC_EC: - setval(VERASE, SLC_VARIABLE); - case SLC_EL: - setval(VKILL, SLC_VARIABLE); - case SLC_IP: - setval(VINTR, SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT); - case SLC_ABORT: - setval(VQUIT, SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT); - case SLC_XON: -#ifdef VSTART - setval(VSTART, SLC_VARIABLE); -#else - defval(0x13); -#endif - case SLC_XOFF: -#ifdef VSTOP - setval(VSTOP, SLC_VARIABLE); -#else - defval(0x11); -#endif - case SLC_EW: -#ifdef VWERASE - setval(VWERASE, SLC_VARIABLE); -#else - defval(0); -#endif - case SLC_RP: -#ifdef VREPRINT - setval(VREPRINT, SLC_VARIABLE); -#else - defval(0); -#endif - case SLC_LNEXT: -#ifdef VLNEXT - setval(VLNEXT, SLC_VARIABLE); -#else - defval(0); -#endif - case SLC_AO: -#if !defined(VDISCARD) && defined(VFLUSHO) -# define VDISCARD VFLUSHO -#endif -#ifdef VDISCARD - setval(VDISCARD, SLC_VARIABLE|SLC_FLUSHOUT); -#else - defval(0); -#endif - case SLC_SUSP: -#ifdef VSUSP - setval(VSUSP, SLC_VARIABLE|SLC_FLUSHIN); -#else - defval(0); -#endif -#ifdef VEOL - case SLC_FORW1: - setval(VEOL, SLC_VARIABLE); -#endif -#ifdef VEOL2 - case SLC_FORW2: - setval(VEOL2, SLC_VARIABLE); -#endif - case SLC_AYT: -#ifdef VSTATUS - setval(VSTATUS, SLC_VARIABLE); -#else - defval(0); -#endif - - case SLC_BRK: - case SLC_SYNCH: - case SLC_EOR: - defval(0); - - default: - *valp = 0; - *valpp = 0; - return(SLC_NOSUPPORT); - } -} -#endif /* USE_TERMIO */ - -#ifdef CRAY -/* - * getnpty() - * - * Return the number of pty's configured into the system. - */ - int -getnpty() -{ -#ifdef _SC_CRAY_NPTY - int numptys; - - if ((numptys = sysconf(_SC_CRAY_NPTY)) != -1) - return numptys; - else -#endif /* _SC_CRAY_NPTY */ - return 128; -} -#endif /* CRAY */ - -#ifndef convex -/* - * getpty() - * - * Allocate a pty. As a side effect, the external character - * array "line" contains the name of the slave side. - * - * Returns the file descriptor of the opened pty. - */ -#ifndef __GNUC__ -char *line = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#else -static char Xline[] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -char *line = Xline; -#endif -#ifdef CRAY -char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#endif /* CRAY */ - - int -getpty(ptynum) -int *ptynum; -{ - register int p; -#ifdef STREAMSPTY - int t; - char *ptsname(); - - p = open("/dev/ptmx", 2); - if (p > 0) { - grantpt(p); - unlockpt(p); - strcpy(line, ptsname(p)); - return(p); - } - -#else /* ! STREAMSPTY */ -#ifndef CRAY - register char *cp, *p1, *p2; - register int i; -#if defined(sun) && defined(TIOCGPGRP) && BSD < 199207 - int dummy; -#endif - -#ifndef __hpux - (void) sprintf(line, "/dev/ptyXX"); - p1 = &line[8]; - p2 = &line[9]; -#else - (void) sprintf(line, "/dev/ptym/ptyXX"); - p1 = &line[13]; - p2 = &line[14]; -#endif - - for (cp = "pqrsPQRS"; *cp; cp++) { - struct stat stb; - - *p1 = *cp; - *p2 = '0'; - /* - * This stat() check is just to keep us from - * looping through all 256 combinations if there - * aren't that many ptys available. - */ - if (stat(line, &stb) < 0) - break; - for (i = 0; i < 32; i++) { - *p2 = "0123456789abcdefghijklmnopqrstuv"[i]; - p = open(line, 2); - if (p > 0) { -#ifndef __hpux - line[5] = 't'; -#else - for (p1 = &line[8]; *p1; p1++) - *p1 = *(p1+1); - line[9] = 't'; -#endif - chown(line, 0, 0); - chmod(line, 0600); -#if defined(sun) && defined(TIOCGPGRP) && BSD < 199207 - if (ioctl(p, TIOCGPGRP, &dummy) == 0 - || errno != EIO) { - chmod(line, 0666); - close(p); - line[5] = 'p'; - } else -#endif /* defined(sun) && defined(TIOCGPGRP) && BSD < 199207 */ - return(p); - } - } - } -#else /* CRAY */ - extern lowpty, highpty; - struct stat sb; - - for (*ptynum = lowpty; *ptynum <= highpty; (*ptynum)++) { - (void) sprintf(myline, "/dev/pty/%03d", *ptynum); - p = open(myline, 2); - if (p < 0) - continue; - (void) sprintf(line, "/dev/ttyp%03d", *ptynum); - /* - * Here are some shenanigans to make sure that there - * are no listeners lurking on the line. - */ - if(stat(line, &sb) < 0) { - (void) close(p); - continue; - } - if(sb.st_uid || sb.st_gid || sb.st_mode != 0600) { - chown(line, 0, 0); - chmod(line, 0600); - (void)close(p); - p = open(myline, 2); - if (p < 0) - continue; - } - /* - * Now it should be safe...check for accessability. - */ - if (access(line, 6) == 0) - return(p); - else { - /* no tty side to pty so skip it */ - (void) close(p); - } - } -#endif /* CRAY */ -#endif /* STREAMSPTY */ - return(-1); -} -#endif /* convex */ - -#ifdef LINEMODE -/* - * tty_flowmode() Find out if flow control is enabled or disabled. - * tty_linemode() Find out if linemode (external processing) is enabled. - * tty_setlinemod(on) Turn on/off linemode. - * tty_isecho() Find out if echoing is turned on. - * tty_setecho(on) Enable/disable character echoing. - * tty_israw() Find out if terminal is in RAW mode. - * tty_binaryin(on) Turn on/off BINARY on input. - * tty_binaryout(on) Turn on/off BINARY on output. - * tty_isediting() Find out if line editing is enabled. - * tty_istrapsig() Find out if signal trapping is enabled. - * tty_setedit(on) Turn on/off line editing. - * tty_setsig(on) Turn on/off signal trapping. - * tty_issofttab() Find out if tab expansion is enabled. - * tty_setsofttab(on) Turn on/off soft tab expansion. - * tty_islitecho() Find out if typed control chars are echoed literally - * tty_setlitecho() Turn on/off literal echo of control chars - * tty_tspeed(val) Set transmit speed to val. - * tty_rspeed(val) Set receive speed to val. - */ - -#ifdef convex -static int linestate; -#endif - - int -tty_linemode() -{ -#ifndef convex -#ifndef USE_TERMIO - return(termbuf.state & TS_EXTPROC); -#else - return(termbuf.c_lflag & EXTPROC); -#endif -#else - return(linestate); -#endif -} - - void -tty_setlinemode(on) - int on; -{ -#ifdef TIOCEXT -# ifndef convex - set_termbuf(); -# else - linestate = on; -# endif - (void) ioctl(pty, TIOCEXT, (char *)&on); -# ifndef convex - init_termbuf(); -# endif -#else /* !TIOCEXT */ -# ifdef EXTPROC - if (on) - termbuf.c_lflag |= EXTPROC; - else - termbuf.c_lflag &= ~EXTPROC; -# endif -#endif /* TIOCEXT */ -} -#endif /* LINEMODE */ - - int -tty_isecho() -{ -#ifndef USE_TERMIO - return (termbuf.sg.sg_flags & ECHO); -#else - return (termbuf.c_lflag & ECHO); -#endif -} - - int -tty_flowmode() -{ -#ifndef USE_TERMIO - return(((termbuf.tc.t_startc) > 0 && (termbuf.tc.t_stopc) > 0) ? 1 : 0); -#else - return((termbuf.c_iflag & IXON) ? 1 : 0); -#endif -} - - int -tty_restartany() -{ -#ifndef USE_TERMIO -# ifdef DECCTQ - return((termbuf.lflags & DECCTQ) ? 0 : 1); -# else - return(-1); -# endif -#else - return((termbuf.c_iflag & IXANY) ? 1 : 0); -#endif -} - - void -tty_setecho(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.sg.sg_flags |= ECHO|CRMOD; - else - termbuf.sg.sg_flags &= ~(ECHO|CRMOD); -#else - if (on) - termbuf.c_lflag |= ECHO; - else - termbuf.c_lflag &= ~ECHO; -#endif -} - - int -tty_israw() -{ -#ifndef USE_TERMIO - return(termbuf.sg.sg_flags & RAW); -#else - return(!(termbuf.c_lflag & ICANON)); -#endif -} - -#if defined (AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R) - int -tty_setraw(on) -{ -# ifndef USE_TERMIO - if (on) - termbuf.sg.sg_flags |= RAW; - else - termbuf.sg.sg_flags &= ~RAW; -# else - if (on) - termbuf.c_lflag &= ~ICANON; - else - termbuf.c_lflag |= ICANON; -# endif -} -#endif - - void -tty_binaryin(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.lflags |= LPASS8; - else - termbuf.lflags &= ~LPASS8; -#else - if (on) { - termbuf.c_iflag &= ~ISTRIP; - } else { - termbuf.c_iflag |= ISTRIP; - } -#endif -} - - void -tty_binaryout(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.lflags |= LLITOUT; - else - termbuf.lflags &= ~LLITOUT; -#else - if (on) { - termbuf.c_cflag &= ~(CSIZE|PARENB); - termbuf.c_cflag |= CS8; - termbuf.c_oflag &= ~OPOST; - } else { - termbuf.c_cflag &= ~CSIZE; - termbuf.c_cflag |= CS7|PARENB; - termbuf.c_oflag |= OPOST; - } -#endif -} - - int -tty_isbinaryin() -{ -#ifndef USE_TERMIO - return(termbuf.lflags & LPASS8); -#else - return(!(termbuf.c_iflag & ISTRIP)); -#endif -} - - int -tty_isbinaryout() -{ -#ifndef USE_TERMIO - return(termbuf.lflags & LLITOUT); -#else - return(!(termbuf.c_oflag&OPOST)); -#endif -} - -#ifdef LINEMODE - int -tty_isediting() -{ -#ifndef USE_TERMIO - return(!(termbuf.sg.sg_flags & (CBREAK|RAW))); -#else - return(termbuf.c_lflag & ICANON); -#endif -} - - int -tty_istrapsig() -{ -#ifndef USE_TERMIO - return(!(termbuf.sg.sg_flags&RAW)); -#else - return(termbuf.c_lflag & ISIG); -#endif -} - - void -tty_setedit(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.sg.sg_flags &= ~CBREAK; - else - termbuf.sg.sg_flags |= CBREAK; -#else - if (on) - termbuf.c_lflag |= ICANON; - else - termbuf.c_lflag &= ~ICANON; -#endif -} - - void -tty_setsig(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - ; -#else - if (on) - termbuf.c_lflag |= ISIG; - else - termbuf.c_lflag &= ~ISIG; -#endif -} -#endif /* LINEMODE */ - - int -tty_issofttab() -{ -#ifndef USE_TERMIO - return (termbuf.sg.sg_flags & XTABS); -#else -# ifdef OXTABS - return (termbuf.c_oflag & OXTABS); -# endif -# ifdef TABDLY - return ((termbuf.c_oflag & TABDLY) == TAB3); -# endif -#endif -} - - void -tty_setsofttab(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.sg.sg_flags |= XTABS; - else - termbuf.sg.sg_flags &= ~XTABS; -#else - if (on) { -# ifdef OXTABS - termbuf.c_oflag |= OXTABS; -# endif -# ifdef TABDLY - termbuf.c_oflag &= ~TABDLY; - termbuf.c_oflag |= TAB3; -# endif - } else { -# ifdef OXTABS - termbuf.c_oflag &= ~OXTABS; -# endif -# ifdef TABDLY - termbuf.c_oflag &= ~TABDLY; - termbuf.c_oflag |= TAB0; -# endif - } -#endif -} - - int -tty_islitecho() -{ -#ifndef USE_TERMIO - return (!(termbuf.lflags & LCTLECH)); -#else -# ifdef ECHOCTL - return (!(termbuf.c_lflag & ECHOCTL)); -# endif -# ifdef TCTLECH - return (!(termbuf.c_lflag & TCTLECH)); -# endif -# if !defined(ECHOCTL) && !defined(TCTLECH) - return (0); /* assumes ctl chars are echoed '^x' */ -# endif -#endif -} - - void -tty_setlitecho(on) - int on; -{ -#ifndef USE_TERMIO - if (on) - termbuf.lflags &= ~LCTLECH; - else - termbuf.lflags |= LCTLECH; -#else -# ifdef ECHOCTL - if (on) - termbuf.c_lflag &= ~ECHOCTL; - else - termbuf.c_lflag |= ECHOCTL; -# endif -# ifdef TCTLECH - if (on) - termbuf.c_lflag &= ~TCTLECH; - else - termbuf.c_lflag |= TCTLECH; -# endif -#endif -} - - int -tty_iscrnl() -{ -#ifndef USE_TERMIO - return (termbuf.sg.sg_flags & CRMOD); -#else - return (termbuf.c_iflag & ICRNL); -#endif -} - -/* - * Try to guess whether speeds are "encoded" (4.2BSD) or just numeric (4.4BSD). - */ -#if B4800 != 4800 -#define DECODE_BAUD -#endif - -#ifdef DECODE_BAUD - -/* - * A table of available terminal speeds - */ -struct termspeeds { - int speed; - int value; -} termspeeds[] = { - { 0, B0 }, { 50, B50 }, { 75, B75 }, - { 110, B110 }, { 134, B134 }, { 150, B150 }, - { 200, B200 }, { 300, B300 }, { 600, B600 }, - { 1200, B1200 }, { 1800, B1800 }, { 2400, B2400 }, - { 4800, B4800 }, -#ifdef B7200 - { 7200, B7200 }, -#endif - { 9600, B9600 }, -#ifdef B14400 - { 14400, B14400 }, -#endif -#ifdef B19200 - { 19200, B19200 }, -#endif -#ifdef B28800 - { 28800, B28800 }, -#endif -#ifdef B38400 - { 38400, B38400 }, -#endif -#ifdef B57600 - { 57600, B57600 }, -#endif -#ifdef B115200 - { 115200, B115200 }, -#endif -#ifdef B230400 - { 230400, B230400 }, -#endif - { -1, 0 } -}; -#endif /* DECODE_BUAD */ - - void -tty_tspeed(val) - int val; -{ -#ifdef DECODE_BAUD - register struct termspeeds *tp; - - for (tp = termspeeds; (tp->speed != -1) && (val > tp->speed); tp++) - ; - if (tp->speed == -1) /* back up to last valid value */ - --tp; - cfsetospeed(&termbuf, tp->value); -#else /* DECODE_BUAD */ - cfsetospeed(&termbuf, val); -#endif /* DECODE_BUAD */ -} - - void -tty_rspeed(val) - int val; -{ -#ifdef DECODE_BAUD - register struct termspeeds *tp; - - for (tp = termspeeds; (tp->speed != -1) && (val > tp->speed); tp++) - ; - if (tp->speed == -1) /* back up to last valid value */ - --tp; - cfsetispeed(&termbuf, tp->value); -#else /* DECODE_BAUD */ - cfsetispeed(&termbuf, val); -#endif /* DECODE_BAUD */ -} - -#if defined(CRAY2) && defined(UNICOS5) - int -tty_isnewmap() -{ - return((termbuf.c_oflag & OPOST) && (termbuf.c_oflag & ONLCR) && - !(termbuf.c_oflag & ONLRET)); -} -#endif - -#ifdef PARENT_DOES_UTMP -# ifndef NEWINIT -extern struct utmp wtmp; -extern char wtmpf[]; -# else /* NEWINIT */ -int gotalarm; - - /* ARGSUSED */ - void -nologinproc(sig) - int sig; -{ - gotalarm++; -} -# endif /* NEWINIT */ -#endif /* PARENT_DOES_UTMP */ - -#ifndef NEWINIT -# ifdef PARENT_DOES_UTMP -extern void utmp_sig_init P((void)); -extern void utmp_sig_reset P((void)); -extern void utmp_sig_wait P((void)); -extern void utmp_sig_notify P((int)); -# endif /* PARENT_DOES_UTMP */ -#endif - -/* - * getptyslave() - * - * Open the slave side of the pty, and do any initialization - * that is necessary. The return value is a file descriptor - * for the slave side. - */ - int -getptyslave() -{ - register int t = -1; - char erase; - -#if !defined(CRAY) || !defined(NEWINIT) -# ifdef LINEMODE - int waslm; -# endif -# ifdef TIOCGWINSZ - struct winsize ws; - extern int def_row, def_col; -# endif - extern int def_tspeed, def_rspeed; - /* - * Opening the slave side may cause initilization of the - * kernel tty structure. We need remember the state of - * if linemode was turned on - * terminal window size - * terminal speed - * erase character - * so that we can re-set them if we need to. - */ -# ifdef LINEMODE - waslm = tty_linemode(); -# endif - erase = termbuf.c_cc[VERASE]; - - /* - * Make sure that we don't have a controlling tty, and - * that we are the session (process group) leader. - */ -# ifdef TIOCNOTTY - t = open(_PATH_TTY, O_RDWR); - if (t >= 0) { - (void) ioctl(t, TIOCNOTTY, (char *)0); - (void) close(t); - } -# endif - - -# ifdef PARENT_DOES_UTMP - /* - * Wait for our parent to get the utmp stuff to get done. - */ - utmp_sig_wait(); -# endif - - t = cleanopen(line); - if (t < 0) - fatalperror(net, line); - -#ifdef STREAMSPTY -#ifdef USE_TERMIO - ttyfd = t; -#endif - if (ioctl(t, I_PUSH, "ptem") < 0) - fatal(net, "I_PUSH ptem"); - if (ioctl(t, I_PUSH, "ldterm") < 0) - fatal(net, "I_PUSH ldterm"); - if (ioctl(t, I_PUSH, "ttcompat") < 0) - fatal(net, "I_PUSH ttcompat"); - if (ioctl(pty, I_PUSH, "pckt") < 0) - fatal(net, "I_PUSH pckt"); -#endif - - /* - * set up the tty modes as we like them to be. - */ - init_termbuf(); -# ifdef TIOCGWINSZ - if (def_row || def_col) { - memset((char *)&ws, 0, sizeof(ws)); - ws.ws_col = def_col; - ws.ws_row = def_row; - (void)ioctl(t, TIOCSWINSZ, (char *)&ws); - } -# endif - - /* - * Settings for sgtty based systems - */ -# ifndef USE_TERMIO - termbuf.sg.sg_flags |= CRMOD|ANYP|ECHO|XTABS; -# endif /* USE_TERMIO */ - - /* - * Settings for UNICOS (and HPUX) - */ -# if defined(CRAY) || defined(__hpux) - termbuf.c_oflag = OPOST|ONLCR|TAB3; - termbuf.c_iflag = IGNPAR|ISTRIP|ICRNL|IXON; - termbuf.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK; - termbuf.c_cflag = EXTB|HUPCL|CS8; -# endif - - /* - * Settings for all other termios/termio based - * systems, other than 4.4BSD. In 4.4BSD the - * kernel does the initial terminal setup. - */ -# if defined(USE_TERMIO) && !(defined(CRAY) || defined(__hpux)) && (BSD <= 43) -# ifndef OXTABS -# define OXTABS 0 -# endif - termbuf.c_lflag |= ECHO; - termbuf.c_oflag |= ONLCR|OXTABS; - termbuf.c_iflag |= ICRNL; - termbuf.c_iflag &= ~IXOFF; -# endif /* defined(USE_TERMIO) && !defined(CRAY) && (BSD <= 43) */ - tty_rspeed((def_rspeed > 0) ? def_rspeed : 9600); - tty_tspeed((def_tspeed > 0) ? def_tspeed : 9600); - if (erase) - termbuf.c_cc[VERASE] = erase; -# ifdef LINEMODE - if (waslm) - tty_setlinemode(1); -# endif /* LINEMODE */ - - /* - * Set the tty modes, and make this our controlling tty. - */ - set_termbuf(); - if (login_tty(t) == -1) - fatalperror(net, "login_tty"); -#endif /* !defined(CRAY) || !defined(NEWINIT) */ - if (net > 2) - (void) close(net); -#if defined(AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R) - /* - * Leave the pty open so that we can write out the rlogin - * protocol for /bin/login, if the authentication works. - */ -#else - if (pty > 2) { - (void) close(pty); - pty = -1; - } -#endif -} - -#if !defined(CRAY) || !defined(NEWINIT) -#ifndef O_NOCTTY -#define O_NOCTTY 0 -#endif -/* - * Open the specified slave side of the pty, - * making sure that we have a clean tty. - */ - int -cleanopen(line) - char *line; -{ - register int t; -#ifdef UNICOS7x - struct secstat secbuf; -#endif /* UNICOS7x */ - -#ifndef STREAMSPTY - /* - * Make sure that other people can't open the - * slave side of the connection. - */ - (void) chown(line, 0, 0); - (void) chmod(line, 0600); -#endif - -# if !defined(CRAY) && (BSD > 43) - (void) revoke(line); -# endif -#ifdef UNICOS7x - if (secflag) { - if (secstat(line, &secbuf) < 0) - return(-1); - if (setulvl(secbuf.st_slevel) < 0) - return(-1); - if (setucmp(secbuf.st_compart) < 0) - return(-1); - } -#endif /* UNICOS7x */ - - t = open(line, O_RDWR|O_NOCTTY); - -#ifdef UNICOS7x - if (secflag) { - if (setulvl(sysv.sy_minlvl) < 0) - return(-1); - if (setucmp(0) < 0) - return(-1); - } -#endif /* UNICOS7x */ - - if (t < 0) - return(-1); - - /* - * Hangup anybody else using this ttyp, then reopen it for - * ourselves. - */ -# if !(defined(CRAY) || defined(__hpux)) && (BSD <= 43) && !defined(STREAMSPTY) - (void) signal(SIGHUP, SIG_IGN); - vhangup(); - (void) signal(SIGHUP, SIG_DFL); - t = open(line, O_RDWR|O_NOCTTY); - if (t < 0) - return(-1); -# endif -# if defined(CRAY) && defined(TCVHUP) - { - register int i; - (void) signal(SIGHUP, SIG_IGN); - (void) ioctl(t, TCVHUP, (char *)0); - (void) signal(SIGHUP, SIG_DFL); - -#ifdef UNICOS7x - if (secflag) { - if (secstat(line, &secbuf) < 0) - return(-1); - if (setulvl(secbuf.st_slevel) < 0) - return(-1); - if (setucmp(secbuf.st_compart) < 0) - return(-1); - } -#endif /* UNICOS7x */ - - i = open(line, O_RDWR); - -#ifdef UNICOS7x - if (secflag) { - if (setulvl(sysv.sy_minlvl) < 0) - return(-1); - if (setucmp(0) < 0) - return(-1); - } -#endif /* UNICOS7x */ - - if (i < 0) - return(-1); - (void) close(t); - t = i; - } -# endif /* defined(CRAY) && defined(TCVHUP) */ - return(t); -} -#endif /* !defined(CRAY) || !defined(NEWINIT) */ - -#if BSD <= 43 - - int -login_tty(t) - int t; -{ - if (setsid() < 0) { -#ifdef ultrix - /* - * The setsid() may have failed because we - * already have a pgrp == pid. Zero out - * our pgrp and try again... - */ - if ((setpgrp(0, 0) < 0) || (setsid() < 0)) -#endif - fatalperror(net, "setsid()"); - } -# ifdef TIOCSCTTY - if (ioctl(t, TIOCSCTTY, (char *)0) < 0) - fatalperror(net, "ioctl(sctty)"); -# if defined(CRAY) - /* - * Close the hard fd to /dev/ttypXXX, and re-open through - * the indirect /dev/tty interface. - */ - close(t); - if ((t = open("/dev/tty", O_RDWR)) < 0) - fatalperror(net, "open(/dev/tty)"); -# endif -# else - /* - * We get our controlling tty assigned as a side-effect - * of opening up a tty device. But on BSD based systems, - * this only happens if our process group is zero. The - * setsid() call above may have set our pgrp, so clear - * it out before opening the tty... - */ -# ifndef SOLARIS - (void) setpgrp(0, 0); -# else - (void) setpgrp(); -# endif - close(open(line, O_RDWR)); -# endif - if (t != 0) - (void) dup2(t, 0); - if (t != 1) - (void) dup2(t, 1); - if (t != 2) - (void) dup2(t, 2); - if (t > 2) - close(t); - return(0); -} -#endif /* BSD <= 43 */ - -#ifdef NEWINIT -char *gen_id = "fe"; -#endif - -/* - * startslave(host) - * - * Given a hostname, do whatever - * is necessary to startup the login process on the slave side of the pty. - */ - -/* ARGSUSED */ - void -startslave(host, autologin, autoname) - char *host; - int autologin; - char *autoname; -{ - register int i; - long time(); - char name[256]; -#ifdef NEWINIT - extern char *ptyip; - struct init_request request; - void nologinproc(); - register int n; -#endif /* NEWINIT */ - -#if defined(AUTHENTICATION) - if (!autoname || !autoname[0]) - autologin = 0; - - if (autologin < auth_level) { - fatal(net, "Authorization failed"); - exit(1); - } -#endif - -#ifndef NEWINIT -# ifdef PARENT_DOES_UTMP - utmp_sig_init(); -# endif /* PARENT_DOES_UTMP */ - - if ((i = fork()) < 0) - fatalperror(net, "fork"); - if (i) { -# ifdef PARENT_DOES_UTMP - /* - * Cray parent will create utmp entry for child and send - * signal to child to tell when done. Child waits for signal - * before doing anything important. - */ - register int pid = i; - void sigjob P((int)); - - setpgrp(); - utmp_sig_reset(); /* reset handler to default */ - /* - * Create utmp entry for child - */ - (void) time(&wtmp.ut_time); - wtmp.ut_type = LOGIN_PROCESS; - wtmp.ut_pid = pid; - SCPYN(wtmp.ut_user, "LOGIN"); - SCPYN(wtmp.ut_host, host); - SCPYN(wtmp.ut_line, line + sizeof("/dev/") - 1); -#ifndef __hpux - SCPYN(wtmp.ut_id, wtmp.ut_line+3); -#else - SCPYN(wtmp.ut_id, wtmp.ut_line+7); -#endif - pututline(&wtmp); - endutent(); - if ((i = open(wtmpf, O_WRONLY|O_APPEND)) >= 0) { - (void) write(i, (char *)&wtmp, sizeof(struct utmp)); - (void) close(i); - } -#ifdef CRAY - (void) signal(WJSIGNAL, sigjob); -#endif - utmp_sig_notify(pid); -# endif /* PARENT_DOES_UTMP */ - } else { - getptyslave(autologin); - start_login(host, autologin, autoname); - /*NOTREACHED*/ - } -#else /* NEWINIT */ - - /* - * Init will start up login process if we ask nicely. We only wait - * for it to start up and begin normal telnet operation. - */ - if ((i = open(INIT_FIFO, O_WRONLY)) < 0) { - char tbuf[128]; - (void) sprintf(tbuf, "Can't open %s\n", INIT_FIFO); - fatalperror(net, tbuf); - } - memset((char *)&request, 0, sizeof(request)); - request.magic = INIT_MAGIC; - SCPYN(request.gen_id, gen_id); - SCPYN(request.tty_id, &line[8]); - SCPYN(request.host, host); - SCPYN(request.term_type, terminaltype ? terminaltype : "network"); -#if !defined(UNICOS5) - request.signal = SIGCLD; - request.pid = getpid(); -#endif -#ifdef BFTPDAEMON - /* - * Are we working as the bftp daemon? - */ - if (bftpd) { - SCPYN(request.exec_name, BFTPPATH); - } -#endif /* BFTPDAEMON */ - if (write(i, (char *)&request, sizeof(request)) < 0) { - char tbuf[128]; - (void) sprintf(tbuf, "Can't write to %s\n", INIT_FIFO); - fatalperror(net, tbuf); - } - (void) close(i); - (void) signal(SIGALRM, nologinproc); - for (i = 0; ; i++) { - char tbuf[128]; - alarm(15); - n = read(pty, ptyip, BUFSIZ); - if (i == 3 || n >= 0 || !gotalarm) - break; - gotalarm = 0; - sprintf(tbuf, "telnetd: waiting for /etc/init to start login process on %s\r\n", line); - (void) write(net, tbuf, strlen(tbuf)); - } - if (n < 0 && gotalarm) - fatal(net, "/etc/init didn't start login process"); - pcc += n; - alarm(0); - (void) signal(SIGALRM, SIG_DFL); - - return; -#endif /* NEWINIT */ -} - -char *envinit[3]; -extern char **environ; - - void -init_env() -{ - extern char *getenv(); - char **envp; - - envp = envinit; - if (*envp = getenv("TZ")) - *envp++ -= 3; -#if defined(CRAY) || defined(__hpux) - else - *envp++ = "TZ=GMT0"; -#endif - *envp = 0; - environ = envinit; -} - -#ifndef NEWINIT - -/* - * start_login(host) - * - * Assuming that we are now running as a child processes, this - * function will turn us into the login process. - */ - - void -start_login(host, autologin, name) - char *host; - int autologin; - char *name; -{ - register char *cp; - register char **argv; - char **addarg(), *user; - extern char *getenv(); -#ifdef UTMPX - register int pid = getpid(); - struct utmpx utmpx; -#endif -#ifdef SOLARIS - char *term; - char termbuf[64]; -#endif - -#ifdef UTMPX - /* - * Create utmp entry for child - */ - - memset(&utmpx, 0, sizeof(utmpx)); - SCPYN(utmpx.ut_user, ".telnet"); - SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1); - utmpx.ut_pid = pid; - utmpx.ut_id[0] = 't'; - utmpx.ut_id[1] = 'n'; - utmpx.ut_id[2] = SC_WILDC; - utmpx.ut_id[3] = SC_WILDC; - utmpx.ut_type = LOGIN_PROCESS; - (void) time(&utmpx.ut_tv.tv_sec); - if (makeutx(&utmpx) == NULL) - fatal(net, "makeutx failed"); -#endif - - scrub_env(); - - /* - * -h : pass on name of host. - * WARNING: -h is accepted by login if and only if - * getuid() == 0. - * -p : don't clobber the environment (so terminal type stays set). - * - * -f : force this login, he has already been authenticated - */ - argv = addarg(0, "login"); - -#if !defined(NO_LOGIN_H) - -# if defined (AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R) - /* - * Don't add the "-h host" option if we are going - * to be adding the "-r host" option down below... - */ - if ((auth_level < 0) || (autologin != AUTH_VALID)) -# endif - { - argv = addarg(argv, "-h"); - argv = addarg(argv, host); -#ifdef SOLARIS - /* - * SVR4 version of -h takes TERM= as second arg, or - - */ - term = getenv("TERM"); - if (term == NULL || term[0] == 0) { - term = "-"; - } else { - strcpy(termbuf, "TERM="); - strncat(termbuf, term, sizeof(termbuf) - 6); - term = termbuf; - } - argv = addarg(argv, term); -#endif - } -#endif -#if !defined(NO_LOGIN_P) - argv = addarg(argv, "-p"); -#endif -#ifdef LINEMODE - /* - * Set the environment variable "LINEMODE" to either - * "real" or "kludge" if we are operating in either - * real or kludge linemode. - */ - if (lmodetype == REAL_LINEMODE) - setenv("LINEMODE", "real", 1); -# ifdef KLUDGELINEMODE - else if (lmodetype == KLUDGE_LINEMODE || lmodetype == KLUDGE_OK) - setenv("LINEMODE", "kludge", 1); -# endif -#endif -#ifdef BFTPDAEMON - /* - * Are we working as the bftp daemon? If so, then ask login - * to start bftp instead of shell. - */ - if (bftpd) { - argv = addarg(argv, "-e"); - argv = addarg(argv, BFTPPATH); - } else -#endif -#if defined (SecurID) - /* - * don't worry about the -f that might get sent. - * A -s is supposed to override it anyhow. - */ - if (require_SecurID) - argv = addarg(argv, "-s"); -#endif -#if defined (AUTHENTICATION) - if (auth_level >= 0 && autologin == AUTH_VALID) { -# if !defined(NO_LOGIN_F) - argv = addarg(argv, "-f"); - argv = addarg(argv, "--"); - argv = addarg(argv, name); -# else -# if defined(LOGIN_R) - /* - * We don't have support for "login -f", but we - * can fool /bin/login into thinking that we are - * rlogind, and allow us to log in without a - * password. The rlogin protocol expects - * local-user\0remote-user\0term/speed\0 - */ - - if (pty > 2) { - register char *cp; - char speed[128]; - int isecho, israw, xpty, len; - extern int def_rspeed; -# ifndef LOGIN_HOST - /* - * Tell login that we are coming from "localhost". - * If we passed in the real host name, then the - * user would have to allow .rhost access from - * every machine that they want authenticated - * access to work from, which sort of defeats - * the purpose of an authenticated login... - * So, we tell login that the session is coming - * from "localhost", and the user will only have - * to have "localhost" in their .rhost file. - */ -# define LOGIN_HOST "localhost" -# endif - argv = addarg(argv, "-r"); - argv = addarg(argv, LOGIN_HOST); - - xpty = pty; -# ifndef STREAMSPTY - pty = 0; -# else - ttyfd = 0; -# endif - init_termbuf(); - isecho = tty_isecho(); - israw = tty_israw(); - if (isecho || !israw) { - tty_setecho(0); /* Turn off echo */ - tty_setraw(1); /* Turn on raw */ - set_termbuf(); - } - len = strlen(name)+1; - write(xpty, name, len); - write(xpty, name, len); - sprintf(speed, "%s/%d", (cp = getenv("TERM")) ? cp : "", - (def_rspeed > 0) ? def_rspeed : 9600); - len = strlen(speed)+1; - write(xpty, speed, len); - - if (isecho || !israw) { - init_termbuf(); - tty_setecho(isecho); - tty_setraw(israw); - set_termbuf(); - if (!israw) { - /* - * Write a newline to ensure - * that login will be able to - * read the line... - */ - write(xpty, "\n", 1); - } - } - pty = xpty; - } -# else - argv = addarg(argv, "--"); - argv = addarg(argv, name); -# endif -# endif - } else -#endif - if (getenv("USER")) { - argv = addarg(argv, "--"); - argv = addarg(argv, getenv("USER")); -#if defined(LOGIN_ARGS) && defined(NO_LOGIN_P) - { - register char **cpp; - for (cpp = environ; *cpp; cpp++) - argv = addarg(argv, *cpp); - } -#endif - /* - * Assume that login will set the USER variable - * correctly. For SysV systems, this means that - * USER will no longer be set, just LOGNAME by - * login. (The problem is that if the auto-login - * fails, and the user then specifies a different - * account name, he can get logged in with both - * LOGNAME and USER in his environment, but the - * USER value will be wrong. - */ - unsetenv("USER"); - } -#ifdef SOLARIS - else { - char **p; - - argv = addarg(argv, ""); /* no login name */ - for (p = environ; *p; p++) { - argv = addarg(argv, *p); - } - } -#endif /* SOLARIS */ -#if defined(AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R) - if (pty > 2) - close(pty); -#endif - closelog(); - execv(_PATH_LOGIN, argv); - - syslog(LOG_ERR, "%s: %m\n", _PATH_LOGIN); - fatalperror(net, _PATH_LOGIN); - /*NOTREACHED*/ -} - - char ** -addarg(argv, val) - register char **argv; - register char *val; -{ - register char **cpp; - - if (argv == NULL) { - /* - * 10 entries, a leading length, and a null - */ - argv = (char **)malloc(sizeof(*argv) * 12); - if (argv == NULL) - return(NULL); - *argv++ = (char *)10; - *argv = (char *)0; - } - for (cpp = argv; *cpp; cpp++) - ; - if (cpp == &argv[(int)argv[-1]]) { - --argv; - *argv = (char *)((int)(*argv) + 10); - argv = (char **)realloc(argv, sizeof(*argv)*((int)(*argv) + 2)); - if (argv == NULL) - return(NULL); - argv++; - cpp = &argv[(int)argv[-1] - 10]; - } - *cpp++ = val; - *cpp = 0; - return(argv); -} -#endif /* NEWINIT */ - -/* - * scrub_env() - * - * Remove a few things from the environment that - * don't need to be there. - */ -scrub_env() -{ - register char **cpp, **cpp2; - - for (cpp2 = cpp = environ; *cpp; cpp++) { -#ifdef __FreeBSD__ - if (strncmp(*cpp, "LD_LIBRARY_PATH=", 16) && - strncmp(*cpp, "LD_PRELOAD=", 11) && -#else - if (strncmp(*cpp, "LD_", 3) && - strncmp(*cpp, "_RLD_", 5) && - strncmp(*cpp, "LIBPATH=", 8) && -#endif - strncmp(*cpp, "IFS=", 4)) - *cpp2++ = *cpp; - } - *cpp2 = 0; -} - -/* - * cleanup() - * - * This is the routine to call when we are all through, to - * clean up anything that needs to be cleaned up. - */ - /* ARGSUSED */ - void -cleanup(sig) - int sig; -{ -#ifndef PARENT_DOES_UTMP -# if (BSD > 43) || defined(convex) - char *p; - - p = line + sizeof("/dev/") - 1; - if (logout(p)) - logwtmp(p, "", ""); - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - *p = 'p'; - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - (void) shutdown(net, 2); - exit(1); -# else - void rmut(); - - rmut(); - vhangup(); /* XXX */ - (void) shutdown(net, 2); - exit(1); -# endif -#else /* PARENT_DOES_UTMP */ -# ifdef NEWINIT - (void) shutdown(net, 2); - exit(1); -# else /* NEWINIT */ -# ifdef CRAY - static int incleanup = 0; - register int t; - int child_status; /* status of child process as returned by waitpid */ - int flags = WNOHANG|WUNTRACED; - - /* - * 1: Pick up the zombie, if we are being called - * as the signal handler. - * 2: If we are a nested cleanup(), return. - * 3: Try to clean up TMPDIR. - * 4: Fill in utmp with shutdown of process. - * 5: Close down the network and pty connections. - * 6: Finish up the TMPDIR cleanup, if needed. - */ - if (sig == SIGCHLD) { - while (waitpid(-1, &child_status, flags) > 0) - ; /* VOID */ - /* Check if the child process was stopped - * rather than exited. We want cleanup only if - * the child has died. - */ - if (WIFSTOPPED(child_status)) { - return; - } - } - t = sigblock(sigmask(SIGCHLD)); - if (incleanup) { - sigsetmask(t); - return; - } - incleanup = 1; - sigsetmask(t); -#ifdef UNICOS7x - if (secflag) { - /* - * We need to set ourselves back to a null - * label to clean up. - */ - - setulvl(sysv.sy_minlvl); - setucmp((long)0); - } -#endif /* UNICOS7x */ - - t = cleantmp(&wtmp); - setutent(); /* just to make sure */ -# endif /* CRAY */ - rmut(line); - close(pty); - (void) shutdown(net, 2); -# ifdef CRAY - if (t == 0) - cleantmp(&wtmp); -# endif /* CRAY */ - exit(1); -# endif /* NEWINT */ -#endif /* PARENT_DOES_UTMP */ -} - -#if defined(PARENT_DOES_UTMP) && !defined(NEWINIT) -/* - * _utmp_sig_rcv - * utmp_sig_init - * utmp_sig_wait - * These three functions are used to coordinate the handling of - * the utmp file between the server and the soon-to-be-login shell. - * The server actually creates the utmp structure, the child calls - * utmp_sig_wait(), until the server calls utmp_sig_notify() and - * signals the future-login shell to proceed. - */ -static int caught=0; /* NZ when signal intercepted */ -static void (*func)(); /* address of previous handler */ - - void -_utmp_sig_rcv(sig) - int sig; -{ - caught = 1; - (void) signal(SIGUSR1, func); -} - - void -utmp_sig_init() -{ - /* - * register signal handler for UTMP creation - */ - if ((int)(func = signal(SIGUSR1, _utmp_sig_rcv)) == -1) - fatalperror(net, "telnetd/signal"); -} - - void -utmp_sig_reset() -{ - (void) signal(SIGUSR1, func); /* reset handler to default */ -} - -# ifdef __hpux -# define sigoff() /* do nothing */ -# define sigon() /* do nothing */ -# endif - - void -utmp_sig_wait() -{ - /* - * Wait for parent to write our utmp entry. - */ - sigoff(); - while (caught == 0) { - pause(); /* wait until we get a signal (sigon) */ - sigoff(); /* turn off signals while we check caught */ - } - sigon(); /* turn on signals again */ -} - - void -utmp_sig_notify(pid) -{ - kill(pid, SIGUSR1); -} - -# ifdef CRAY -static int gotsigjob = 0; - - /*ARGSUSED*/ - void -sigjob(sig) - int sig; -{ - register int jid; - register struct jobtemp *jp; - - while ((jid = waitjob(NULL)) != -1) { - if (jid == 0) { - return; - } - gotsigjob++; - jobend(jid, NULL, NULL); - } -} - -/* - * jid_getutid: - * called by jobend() before calling cleantmp() - * to find the correct $TMPDIR to cleanup. - */ - - struct utmp * -jid_getutid(jid) - int jid; -{ - struct utmp *cur = NULL; - - setutent(); /* just to make sure */ - while (cur = getutent()) { - if ( (cur->ut_type != NULL) && (jid == cur->ut_jid) ) { - return(cur); - } - } - - return(0); -} - -/* - * Clean up the TMPDIR that login created. - * The first time this is called we pick up the info - * from the utmp. If the job has already gone away, - * then we'll clean up and be done. If not, then - * when this is called the second time it will wait - * for the signal that the job is done. - */ - int -cleantmp(wtp) - register struct utmp *wtp; -{ - struct utmp *utp; - static int first = 1; - register int mask, omask, ret; - extern struct utmp *getutid P((const struct utmp *_Id)); - - - mask = sigmask(WJSIGNAL); - - if (first == 0) { - omask = sigblock(mask); - while (gotsigjob == 0) - sigpause(omask); - return(1); - } - first = 0; - setutent(); /* just to make sure */ - - utp = getutid(wtp); - if (utp == 0) { - syslog(LOG_ERR, "Can't get /etc/utmp entry to clean TMPDIR"); - return(-1); - } - /* - * Nothing to clean up if the user shell was never started. - */ - if (utp->ut_type != USER_PROCESS || utp->ut_jid == 0) - return(1); - - /* - * Block the WJSIGNAL while we are in jobend(). - */ - omask = sigblock(mask); - ret = jobend(utp->ut_jid, utp->ut_tpath, utp->ut_user); - sigsetmask(omask); - return(ret); -} - - int -jobend(jid, path, user) - register int jid; - register char *path; - register char *user; -{ - static int saved_jid = 0; - static int pty_saved_jid = 0; - static char saved_path[sizeof(wtmp.ut_tpath)+1]; - static char saved_user[sizeof(wtmp.ut_user)+1]; - - /* - * this little piece of code comes into play - * only when ptyreconnect is used to reconnect - * to an previous session. - * - * this is the only time when the - * "saved_jid != jid" code is executed. - */ - - if ( saved_jid && saved_jid != jid ) { - if (!path) { /* called from signal handler */ - pty_saved_jid = jid; - } else { - pty_saved_jid = saved_jid; - } - } - - if (path) { - strncpy(saved_path, path, sizeof(wtmp.ut_tpath)); - strncpy(saved_user, user, sizeof(wtmp.ut_user)); - saved_path[sizeof(saved_path)] = '\0'; - saved_user[sizeof(saved_user)] = '\0'; - } - if (saved_jid == 0) { - saved_jid = jid; - return(0); - } - - /* if the jid has changed, get the correct entry from the utmp file */ - - if ( saved_jid != jid ) { - struct utmp *utp = NULL; - struct utmp *jid_getutid(); - - utp = jid_getutid(pty_saved_jid); - - if (utp == 0) { - syslog(LOG_ERR, "Can't get /etc/utmp entry to clean TMPDIR"); - return(-1); - } - - cleantmpdir(jid, utp->ut_tpath, utp->ut_user); - return(1); - } - - cleantmpdir(jid, saved_path, saved_user); - return(1); -} - -/* - * Fork a child process to clean up the TMPDIR - */ -cleantmpdir(jid, tpath, user) - register int jid; - register char *tpath; - register char *user; -{ - switch(fork()) { - case -1: - syslog(LOG_ERR, "TMPDIR cleanup(%s): fork() failed: %m\n", - tpath); - break; - case 0: - execl(CLEANTMPCMD, CLEANTMPCMD, user, tpath, 0); - syslog(LOG_ERR, "TMPDIR cleanup(%s): execl(%s) failed: %m\n", - tpath, CLEANTMPCMD); - exit(1); - default: - /* - * Forget about child. We will exit, and - * /etc/init will pick it up. - */ - break; - } -} -# endif /* CRAY */ -#endif /* defined(PARENT_DOES_UTMP) && !defined(NEWINIT) */ - -/* - * rmut() - * - * This is the function called by cleanup() to - * remove the utmp entry for this person. - */ - -#ifdef UTMPX - void -rmut() -{ - register f; - int found = 0; - struct utmp *u, *utmp; - int nutmp; - struct stat statbf; - - struct utmpx *utxp, utmpx; - - /* - * This updates the utmpx and utmp entries and make a wtmp/x entry - */ - - SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1); - utxp = getutxline(&utmpx); - if (utxp) { - utxp->ut_type = DEAD_PROCESS; - utxp->ut_exit.e_termination = 0; - utxp->ut_exit.e_exit = 0; - (void) time(&utmpx.ut_tv.tv_sec); - utmpx.ut_tv.tv_usec = 0; - modutx(utxp); - } - endutxent(); -} /* end of rmut */ -#endif - -#if !defined(UTMPX) && !(defined(CRAY) || defined(__hpux)) && BSD <= 43 - void -rmut() -{ - register f; - int found = 0; - struct utmp *u, *utmp; - int nutmp; - struct stat statbf; - - f = open(utmpf, O_RDWR); - if (f >= 0) { - (void) fstat(f, &statbf); - utmp = (struct utmp *)malloc((unsigned)statbf.st_size); - if (!utmp) - syslog(LOG_ERR, "utmp malloc failed"); - if (statbf.st_size && utmp) { - nutmp = read(f, (char *)utmp, (int)statbf.st_size); - nutmp /= sizeof(struct utmp); - - for (u = utmp ; u < &utmp[nutmp] ; u++) { - if (SCMPN(u->ut_line, line+5) || - u->ut_name[0]==0) - continue; - (void) lseek(f, ((long)u)-((long)utmp), L_SET); - SCPYN(u->ut_name, ""); - SCPYN(u->ut_host, ""); - (void) time(&u->ut_time); - (void) write(f, (char *)u, sizeof(wtmp)); - found++; - } - } - (void) close(f); - } - if (found) { - f = open(wtmpf, O_WRONLY|O_APPEND); - if (f >= 0) { - SCPYN(wtmp.ut_line, line+5); - SCPYN(wtmp.ut_name, ""); - SCPYN(wtmp.ut_host, ""); - (void) time(&wtmp.ut_time); - (void) write(f, (char *)&wtmp, sizeof(wtmp)); - (void) close(f); - } - } - (void) chmod(line, 0666); - (void) chown(line, 0, 0); - line[strlen("/dev/")] = 'p'; - (void) chmod(line, 0666); - (void) chown(line, 0, 0); -} /* end of rmut */ -#endif /* CRAY */ - -#ifdef __hpux -rmut (line) -char *line; -{ - struct utmp utmp; - struct utmp *utptr; - int fd; /* for /etc/wtmp */ - - utmp.ut_type = USER_PROCESS; - (void) strncpy(utmp.ut_id, line+12, sizeof(utmp.ut_id)); - (void) setutent(); - utptr = getutid(&utmp); - /* write it out only if it exists */ - if (utptr) { - utptr->ut_type = DEAD_PROCESS; - utptr->ut_time = time((long *) 0); - (void) pututline(utptr); - /* set wtmp entry if wtmp file exists */ - if ((fd = open(wtmpf, O_WRONLY | O_APPEND)) >= 0) { - (void) write(fd, utptr, sizeof(utmp)); - (void) close(fd); - } - } - (void) endutent(); - - (void) chmod(line, 0666); - (void) chown(line, 0, 0); - line[14] = line[13]; - line[13] = line[12]; - line[8] = 'm'; - line[9] = '/'; - line[10] = 'p'; - line[11] = 't'; - line[12] = 'y'; - (void) chmod(line, 0666); - (void) chown(line, 0, 0); -} -#endif diff --git a/secure/libexec/telnetd/telnetd.8 b/secure/libexec/telnetd/telnetd.8 deleted file mode 100644 index f618385ed09b0..0000000000000 --- a/secure/libexec/telnetd/telnetd.8 +++ /dev/null @@ -1,607 +0,0 @@ -.\" Copyright (c) 1983, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)telnetd.8 8.4 (Berkeley) 6/1/94 -.\" -.Dd June 1, 1994 -.Dt TELNETD 8 -.Os BSD 4.2 -.Sh NAME -.Nm telnetd -.Nd DARPA -.Tn TELNET -protocol server -.Sh SYNOPSIS -.Nm /usr/libexec/telnetd -.Op Fl BUhlkns -.Op Fl D Ar debugmode -.Op Fl I Ns Ar initid -.Op Fl S Ar tos -.Op Fl X Ar authtype -.Op Fl a Ar authmode -.Op Fl edebug -.Op Fl r Ns Ar lowpty-highpty -.Op Fl u Ar len -.Op Fl debug Op Ar port -.Sh DESCRIPTION -The -.Nm telnetd -command is a server which supports the -.Tn DARPA -standard -.Tn TELNET -virtual terminal protocol. -.Nm Telnetd -is normally invoked by the internet server (see -.Xr inetd 8 ) -for requests to connect to the -.Tn TELNET -port as indicated by the -.Pa /etc/services -file (see -.Xr services 5 ) . -The -.Fl debug -option may be used to start up -.Nm telnetd -manually, instead of through -.Xr inetd 8 . -If started up this way, -.Ar port -may be specified to run -.Nm telnetd -on an alternate -.Tn TCP -port number. -.Pp -The -.Nm telnetd -command accepts the following options: -.Bl -tag -width "-a authmode" -.It Fl a Ar authmode -This option may be used for specifying what mode should -be used for authentication. -Note that this option is only useful if -.Nm telnetd -has been compiled with support for the -.Dv AUTHENTICATION -option. -There are several valid values for -.Ar authmode: -.Bl -tag -width debug -.It debug -Turns on authentication debugging code. -.It user -Only allow connections when the remote user -can provide valid authentication information -to identify the remote user, -and is allowed access to the specified account -without providing a password. -.It valid -Only allow connections when the remote user -can provide valid authentication information -to identify the remote user. -The -.Xr login 1 -command will provide any additional user verification -needed if the remote user is not allowed automatic -access to the specified account. -.It other -Only allow connections that supply some authentication information. -This option is currently not supported -by any of the existing authentication mechanisms, -and is thus the same as specifying -.Fl a -.Cm valid . -.It none -This is the default state. -Authentication information is not required. -If no or insufficient authentication information -is provided, then the -.Xr login 1 -program will provide the necessary user -verification. -.It off -This disables the authentication code. -All user verification will happen through the -.Xr login 1 -program. -.El -.It Fl B -Specifies bftp server mode. In this mode, -.Nm telnetd -causes login to start a -.Xr bftp 1 -session rather than the user's -normal shell. In bftp daemon mode normal -logins are not supported, and it must be used -on a port other than the normal -.Tn TELNET -port. -.It Fl D Ar debugmode -This option may be used for debugging purposes. -This allows -.Nm telnetd -to print out debugging information -to the connection, allowing the user to see what -.Nm telnetd -is doing. -There are several possible values for -.Ar debugmode: -.Bl -tag -width exercise -.It Cm options -Prints information about the negotiation of -.Tn TELNET -options. -.It Cm report -Prints the -.Cm options -information, plus some additional information -about what processing is going on. -.It Cm netdata -Displays the data stream received by -.Nm telnetd. -.It Cm ptydata -Displays data written to the pty. -.It Cm exercise -Has not been implemented yet. -.El -.It Fl debug -Enables debugging on each socket created by -.Nm telnetd -(see -.Dv SO_DEBUG -in -.Xr socket 2 ) . -.It Fl edebug -If -.Nm telnetd -has been compiled with support for data encryption, then the -.Fl edebug -option may be used to enable encryption debugging code. -.It Fl h -Disables the printing of host-specific information before -login has been completed. -.It Fl I Ar initid -This option is only applicable to -.Tn UNICOS -systems prior to 7.0. -It specifies the -.Dv ID -from -.Pa /etc/inittab -to use when init starts login sessions. The default -.Dv ID -is -.Dv fe. -.It Fl k -This option is only useful if -.Nm telnetd -has been compiled with both linemode and kludge linemode -support. If the -.Fl k -option is specified, then if the remote client does not -support the -.Dv LINEMODE -option, then -.Nm telnetd -will operate in character at a time mode. -It will still support kludge linemode, but will only -go into kludge linemode if the remote client requests -it. -(This is done by by the client sending -.Dv DONT SUPPRESS-GO-AHEAD -and -.Dv DONT ECHO . ) -The -.Fl k -option is most useful when there are remote clients -that do not support kludge linemode, but pass the heuristic -(if they respond with -.Dv WILL TIMING-MARK -in response to a -.Dv DO TIMING-MARK) -for kludge linemode support. -.It Fl l -Specifies line mode. Tries to force clients to use line- -at-a-time mode. -If the -.Dv LINEMODE -option is not supported, it will go -into kludge linemode. -.It Fl n -Disable -.Dv TCP -keep-alives. Normally -.Nm telnetd -enables the -.Tn TCP -keep-alive mechanism to probe connections that -have been idle for some period of time to determine -if the client is still there, so that idle connections -from machines that have crashed or can no longer -be reached may be cleaned up. -.It Fl r Ar lowpty-highpty -This option is only enabled when -.Nm telnetd -is compiled for -.Dv UNICOS. -It specifies an inclusive range of pseudo-terminal devices to -use. If the system has sysconf variable -.Dv _SC_CRAY_NPTY -configured, the default pty search range is 0 to -.Dv _SC_CRAY_NPTY; -otherwise, the default range is 0 to 128. Either -.Ar lowpty -or -.Ar highpty -may be omitted to allow changing -either end of the search range. If -.Ar lowpty -is omitted, the - character is still required so that -.Nm telnetd -can differentiate -.Ar highpty -from -.Ar lowpty . -.It Fl s -This option is only enabled if -.Nm telnetd -is compiled with support for -.Tn SecurID -cards. -It causes the -.Fl s -option to be passed on to -.Xr login 1 , -and thus is only useful if -.Xr login 1 -supports the -.Fl s -flag to indicate that only -.Tn SecurID -validated logins are allowed, and is -usually useful for controlling remote logins -from outside of a firewall. -.It Fl S Ar tos -.It Fl u Ar len -This option is used to specify the size of the field -in the -.Dv utmp -structure that holds the remote host name. -If the resolved host name is longer than -.Ar len , -the dotted decimal value will be used instead. -This allows hosts with very long host names that -overflow this field to still be uniquely identified. -Specifying -.Fl u0 -indicates that only dotted decimal addresses -should be put into the -.Pa utmp -file. -.ne 1i -.It Fl U -This option causes -.Nm telnetd -to refuse connections from addresses that -cannot be mapped back into a symbolic name -via the -.Xr gethostbyaddr 3 -routine. -.It Fl X Ar authtype -This option is only valid if -.Nm telnetd -has been built with support for the authentication option. -It disables the use of -.Ar authtype -authentication, and -can be used to temporarily disable -a specific authentication type without having to recompile -.Nm telnetd . -.El -.Pp -.Nm Telnetd -operates by allocating a pseudo-terminal device (see -.Xr pty 4 ) -for a client, then creating a login process which has -the slave side of the pseudo-terminal as -.Dv stdin , -.Dv stdout -and -.Dv stderr . -.Nm Telnetd -manipulates the master side of the pseudo-terminal, -implementing the -.Tn TELNET -protocol and passing characters -between the remote client and the login process. -.Pp -When a -.Tn TELNET -session is started up, -.Nm telnetd -sends -.Tn TELNET -options to the client side indicating -a willingness to do the -following -.Tn TELNET -options, which are described in more detail below: -.Bd -literal -offset indent -DO AUTHENTICATION -WILL ENCRYPT -DO TERMINAL TYPE -DO TSPEED -DO XDISPLOC -DO NEW-ENVIRON -DO ENVIRON -WILL SUPPRESS GO AHEAD -DO ECHO -DO LINEMODE -DO NAWS -WILL STATUS -DO LFLOW -DO TIMING-MARK -.Ed -.Pp -The pseudo-terminal allocated to the client is configured -to operate in \*(lqcooked\*(rq mode, and with -.Dv XTABS and -.Dv CRMOD -enabled (see -.Xr tty 4 ) . -.Pp -.Nm Telnetd -has support for enabling locally the following -.Tn TELNET -options: -.Bl -tag -width "DO AUTHENTICATION" -.It "WILL ECHO" -When the -.Dv LINEMODE -option is enabled, a -.Dv WILL ECHO -or -.Dv WONT ECHO -will be sent to the client to indicate the -current state of terminal echoing. -When terminal echo is not desired, a -.Dv WILL ECHO -is sent to indicate that -.Tn telnetd -will take care of echoing any data that needs to be -echoed to the terminal, and then nothing is echoed. -When terminal echo is desired, a -.Dv WONT ECHO -is sent to indicate that -.Tn telnetd -will not be doing any terminal echoing, so the -client should do any terminal echoing that is needed. -.It "WILL BINARY" -Indicates that the client is willing to send a -8 bits of data, rather than the normal 7 bits -of the Network Virtual Terminal. -.It "WILL SGA" -Indicates that it will not be sending -.Dv IAC GA, -go ahead, commands. -.It "WILL STATUS" -Indicates a willingness to send the client, upon -request, of the current status of all -.Tn TELNET -options. -.It "WILL TIMING-MARK" -Whenever a -.Dv DO TIMING-MARK -command is received, it is always responded -to with a -.Dv WILL TIMING-MARK -.ne 1i -.It "WILL LOGOUT" -When a -.Dv DO LOGOUT -is received, a -.Dv WILL LOGOUT -is sent in response, and the -.Tn TELNET -session is shut down. -.It "WILL ENCRYPT" -Only sent if -.Nm telnetd -is compiled with support for data encryption, and -indicates a willingness to decrypt -the data stream. -.El -.Pp -.Nm Telnetd -has support for enabling remotely the following -.Tn TELNET -options: -.Bl -tag -width "DO AUTHENTICATION" -.It "DO BINARY" -Sent to indicate that -.Tn telnetd -is willing to receive an 8 bit data stream. -.It "DO LFLOW" -Requests that the client handle flow control -characters remotely. -.It "DO ECHO" -This is not really supported, but is sent to identify a 4.2BSD -.Xr telnet 1 -client, which will improperly respond with -.Dv WILL ECHO. -If a -.Dv WILL ECHO -is received, a -.Dv DONT ECHO -will be sent in response. -.It "DO TERMINAL-TYPE" -Indicates a desire to be able to request the -name of the type of terminal that is attached -to the client side of the connection. -.It "DO SGA" -Indicates that it does not need to receive -.Dv IAC GA, -the go ahead command. -.It "DO NAWS" -Requests that the client inform the server when -the window (display) size changes. -.It "DO TERMINAL-SPEED" -Indicates a desire to be able to request information -about the speed of the serial line to which -the client is attached. -.It "DO XDISPLOC" -Indicates a desire to be able to request the name -of the X windows display that is associated with -the telnet client. -.It "DO NEW-ENVIRON" -Indicates a desire to be able to request environment -variable information, as described in RFC 1572. -.It "DO ENVIRON" -Indicates a desire to be able to request environment -variable information, as described in RFC 1408. -.It "DO LINEMODE" -Only sent if -.Nm telnetd -is compiled with support for linemode, and -requests that the client do line by line processing. -.It "DO TIMING-MARK" -Only sent if -.Nm telnetd -is compiled with support for both linemode and -kludge linemode, and the client responded with -.Dv WONT LINEMODE. -If the client responds with -.Dv WILL TM, -the it is assumed that the client supports -kludge linemode. -Note that the -.Op Fl k -option can be used to disable this. -.It "DO AUTHENTICATION" -Only sent if -.Nm telnetd -is compiled with support for authentication, and -indicates a willingness to receive authentication -information for automatic login. -.It "DO ENCRYPT" -Only sent if -.Nm telnetd -is compiled with support for data encryption, and -indicates a willingness to decrypt -the data stream. -.Sh ENVIRONMENT -.Sh FILES -.Pa /etc/services -.br -.Pa /etc/inittab -(UNICOS systems only) -.br -.Pa /etc/iptos -(if supported) -.br -.Pa /usr/ucb/bftp -(if supported) -.Sh "SEE ALSO" -.Xr telnet 1 , -.Xr login 1 , -.Xr bftp 1 -(if supported) -.Sh STANDARDS -.Bl -tag -compact -width RFC-1572 -.It Cm RFC-854 -.Tn TELNET -PROTOCOL SPECIFICATION -.It Cm RFC-855 -TELNET OPTION SPECIFICATIONS -.It Cm RFC-856 -TELNET BINARY TRANSMISSION -.It Cm RFC-857 -TELNET ECHO OPTION -.It Cm RFC-858 -TELNET SUPPRESS GO AHEAD OPTION -.It Cm RFC-859 -TELNET STATUS OPTION -.It Cm RFC-860 -TELNET TIMING MARK OPTION -.It Cm RFC-861 -TELNET EXTENDED OPTIONS - LIST OPTION -.It Cm RFC-885 -TELNET END OF RECORD OPTION -.It Cm RFC-1073 -Telnet Window Size Option -.It Cm RFC-1079 -Telnet Terminal Speed Option -.It Cm RFC-1091 -Telnet Terminal-Type Option -.It Cm RFC-1096 -Telnet X Display Location Option -.It Cm RFC-1123 -Requirements for Internet Hosts -- Application and Support -.It Cm RFC-1184 -Telnet Linemode Option -.It Cm RFC-1372 -Telnet Remote Flow Control Option -.It Cm RFC-1416 -Telnet Authentication Option -.It Cm RFC-1411 -Telnet Authentication: Kerberos Version 4 -.It Cm RFC-1412 -Telnet Authentication: SPX -.It Cm RFC-1571 -Telnet Environment Option Interoperability Issues -.It Cm RFC-1572 -Telnet Environment Option -.Sh BUGS -Some -.Tn TELNET -commands are only partially implemented. -.Pp -Because of bugs in the original 4.2 BSD -.Xr telnet 1 , -.Nm telnetd -performs some dubious protocol exchanges to try to discover if the remote -client is, in fact, a 4.2 BSD -.Xr telnet 1 . -.Pp -Binary mode -has no common interpretation except between similar operating systems -(Unix in this case). -.Pp -The terminal type name received from the remote client is converted to -lower case. -.Pp -.Nm Telnetd -never sends -.Tn TELNET -.Dv IAC GA -(go ahead) commands. diff --git a/secure/libexec/telnetd/telnetd.c b/secure/libexec/telnetd/telnetd.c deleted file mode 100644 index ead62cd8a77bf..0000000000000 --- a/secure/libexec/telnetd/telnetd.c +++ /dev/null @@ -1,1597 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include "telnetd.h" -#include "pathnames.h" - -#if defined(_SC_CRAY_SECURE_SYS) && !defined(SCM_SECURITY) -/* - * UNICOS 6.0/6.1 do not have SCM_SECURITY defined, so we can - * use it to tell us to turn off all the socket security code, - * since that is only used in UNICOS 7.0 and later. - */ -# undef _SC_CRAY_SECURE_SYS -#endif - -#if defined(_SC_CRAY_SECURE_SYS) -#include -#include -# ifdef SO_SEC_MULTI /* 8.0 code */ -#include -#include -# endif /* SO_SEC_MULTI */ -int secflag; -char tty_dev[16]; -struct secdev dv; -struct sysv sysv; -# ifdef SO_SEC_MULTI /* 8.0 code */ -struct socksec ss; -# else /* SO_SEC_MULTI */ /* 7.0 code */ -struct socket_security ss; -# endif /* SO_SEC_MULTI */ -#endif /* _SC_CRAY_SECURE_SYS */ - -#if defined(AUTHENTICATION) -#include -int auth_level = 0; -#endif -#if defined(SecurID) -int require_SecurID = 0; -#endif - -extern int utmp_len; -int registerd_host_only = 0; - -#ifdef STREAMSPTY -# include -# include -/* make sure we don't get the bsd version */ -# include "/usr/include/sys/tty.h" -# include - -/* - * Because of the way ptyibuf is used with streams messages, we need - * ptyibuf+1 to be on a full-word boundary. The following wierdness - * is simply to make that happen. - */ -long ptyibufbuf[BUFSIZ/sizeof(long)+1]; -char *ptyibuf = ((char *)&ptyibufbuf[1])-1; -char *ptyip = ((char *)&ptyibufbuf[1])-1; -char ptyibuf2[BUFSIZ]; -unsigned char ctlbuf[BUFSIZ]; -struct strbuf strbufc, strbufd; - -int readstream(); - -#else /* ! STREAMPTY */ - -/* - * I/O data buffers, - * pointers, and counters. - */ -char ptyibuf[BUFSIZ], *ptyip = ptyibuf; -char ptyibuf2[BUFSIZ]; - -#endif /* ! STREAMPTY */ - -int hostinfo = 1; /* do we print login banner? */ - -#ifdef CRAY -extern int newmap; /* nonzero if \n maps to ^M^J */ -int lowpty = 0, highpty; /* low, high pty numbers */ -#endif /* CRAY */ - -int debug = 0; -int keepalive = 1; -char *progname; - -extern void usage P((void)); - -/* - * The string to pass to getopt(). We do it this way so - * that only the actual options that we support will be - * passed off to getopt(). - */ -char valid_opts[] = { - 'd', ':', 'h', 'k', 'n', 'S', ':', 'u', ':', 'U', -#ifdef AUTHENTICATION - 'a', ':', 'X', ':', -#endif -#ifdef BFTPDAEMON - 'B', -#endif -#ifdef DIAGNOSTICS - 'D', ':', -#endif -#ifdef ENCRYPTION - 'e', ':', -#endif -#if defined(CRAY) && defined(NEWINIT) - 'I', ':', -#endif -#ifdef LINEMODE - 'l', -#endif -#ifdef CRAY - 'r', ':', -#endif -#ifdef SecurID - 's', -#endif - '\0' -}; - -main(argc, argv) - char *argv[]; -{ - struct sockaddr_in from; - int on = 1, fromlen; - register int ch; - extern char *optarg; - extern int optind; -#if defined(IPPROTO_IP) && defined(IP_TOS) - int tos = -1; -#endif - - pfrontp = pbackp = ptyobuf; - netip = netibuf; - nfrontp = nbackp = netobuf; -#ifdef ENCRYPTION - nclearto = 0; -#endif /* ENCRYPTION */ - - progname = *argv; - -#ifdef CRAY - /* - * Get number of pty's before trying to process options, - * which may include changing pty range. - */ - highpty = getnpty(); -#endif /* CRAY */ - - while ((ch = getopt(argc, argv, valid_opts)) != EOF) { - switch(ch) { - -#ifdef AUTHENTICATION - case 'a': - /* - * Check for required authentication level - */ - if (strcmp(optarg, "debug") == 0) { - extern int auth_debug_mode; - auth_debug_mode = 1; - } else if (strcasecmp(optarg, "none") == 0) { - auth_level = 0; - } else if (strcasecmp(optarg, "other") == 0) { - auth_level = AUTH_OTHER; - } else if (strcasecmp(optarg, "user") == 0) { - auth_level = AUTH_USER; - } else if (strcasecmp(optarg, "valid") == 0) { - auth_level = AUTH_VALID; - } else if (strcasecmp(optarg, "off") == 0) { - /* - * This hack turns off authentication - */ - auth_level = -1; - } else { - fprintf(stderr, - "telnetd: unknown authorization level for -a\n"); - } - break; -#endif /* AUTHENTICATION */ - -#ifdef BFTPDAEMON - case 'B': - bftpd++; - break; -#endif /* BFTPDAEMON */ - - case 'd': - if (strcmp(optarg, "ebug") == 0) { - debug++; - break; - } - usage(); - /* NOTREACHED */ - break; - -#ifdef DIAGNOSTICS - case 'D': - /* - * Check for desired diagnostics capabilities. - */ - if (!strcmp(optarg, "report")) { - diagnostic |= TD_REPORT|TD_OPTIONS; - } else if (!strcmp(optarg, "exercise")) { - diagnostic |= TD_EXERCISE; - } else if (!strcmp(optarg, "netdata")) { - diagnostic |= TD_NETDATA; - } else if (!strcmp(optarg, "ptydata")) { - diagnostic |= TD_PTYDATA; - } else if (!strcmp(optarg, "options")) { - diagnostic |= TD_OPTIONS; - } else { - usage(); - /* NOT REACHED */ - } - break; -#endif /* DIAGNOSTICS */ - -#ifdef ENCRYPTION - case 'e': - if (strcmp(optarg, "debug") == 0) { - extern int encrypt_debug_mode; - encrypt_debug_mode = 1; - break; - } - usage(); - /* NOTREACHED */ - break; -#endif /* ENCRYPTION */ - - case 'h': - hostinfo = 0; - break; - -#if defined(CRAY) && defined(NEWINIT) - case 'I': - { - extern char *gen_id; - gen_id = optarg; - break; - } -#endif /* defined(CRAY) && defined(NEWINIT) */ - -#ifdef LINEMODE - case 'l': - alwayslinemode = 1; - break; -#endif /* LINEMODE */ - - case 'k': -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - lmodetype = NO_AUTOKLUDGE; -#else - /* ignore -k option if built without kludge linemode */ -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - break; - - case 'n': - keepalive = 0; - break; - -#ifdef CRAY - case 'r': - { - char *strchr(); - char *c; - - /* - * Allow the specification of alterations - * to the pty search range. It is legal to - * specify only one, and not change the - * other from its default. - */ - c = strchr(optarg, '-'); - if (c) { - *c++ = '\0'; - highpty = atoi(c); - } - if (*optarg != '\0') - lowpty = atoi(optarg); - if ((lowpty > highpty) || (lowpty < 0) || - (highpty > 32767)) { - usage(); - /* NOT REACHED */ - } - break; - } -#endif /* CRAY */ - -#ifdef SecurID - case 's': - /* SecurID required */ - require_SecurID = 1; - break; -#endif /* SecurID */ - case 'S': -#ifdef HAS_GETTOS - if ((tos = parsetos(optarg, "tcp")) < 0) - fprintf(stderr, "%s%s%s\n", - "telnetd: Bad TOS argument '", optarg, - "'; will try to use default TOS"); -#else - fprintf(stderr, "%s%s\n", "TOS option unavailable; ", - "-S flag not supported\n"); -#endif - break; - - case 'u': - utmp_len = atoi(optarg); - break; - - case 'U': - registerd_host_only = 1; - break; - -#ifdef AUTHENTICATION - case 'X': - /* - * Check for invalid authentication types - */ - auth_disable_name(optarg); - break; -#endif /* AUTHENTICATION */ - - default: - fprintf(stderr, "telnetd: %c: unknown option\n", ch); - /* FALLTHROUGH */ - case '?': - usage(); - /* NOTREACHED */ - } - } - - argc -= optind; - argv += optind; - - if (debug) { - int s, ns, foo; - struct servent *sp; - static struct sockaddr_in sin = { AF_INET }; - - if (argc > 1) { - usage(); - /* NOT REACHED */ - } else if (argc == 1) { - if (sp = getservbyname(*argv, "tcp")) { - sin.sin_port = sp->s_port; - } else { - sin.sin_port = atoi(*argv); - if ((int)sin.sin_port <= 0) { - fprintf(stderr, "telnetd: %s: bad port #\n", *argv); - usage(); - /* NOT REACHED */ - } - sin.sin_port = htons((u_short)sin.sin_port); - } - } else { - sp = getservbyname("telnet", "tcp"); - if (sp == 0) { - fprintf(stderr, "telnetd: tcp/telnet: unknown service\n"); - exit(1); - } - sin.sin_port = sp->s_port; - } - - s = socket(AF_INET, SOCK_STREAM, 0); - if (s < 0) { - perror("telnetd: socket");; - exit(1); - } - (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, - (char *)&on, sizeof(on)); - if (bind(s, (struct sockaddr *)&sin, sizeof sin) < 0) { - perror("bind"); - exit(1); - } - if (listen(s, 1) < 0) { - perror("listen"); - exit(1); - } - foo = sizeof sin; - ns = accept(s, (struct sockaddr *)&sin, &foo); - if (ns < 0) { - perror("accept"); - exit(1); - } - (void) dup2(ns, 0); - (void) close(ns); - (void) close(s); -#ifdef convex - } else if (argc == 1) { - ; /* VOID*/ /* Just ignore the host/port name */ -#endif - } else if (argc > 0) { - usage(); - /* NOT REACHED */ - } - -#if defined(_SC_CRAY_SECURE_SYS) - secflag = sysconf(_SC_CRAY_SECURE_SYS); - - /* - * Get socket's security label - */ - if (secflag) { - int szss = sizeof(ss); -#ifdef SO_SEC_MULTI /* 8.0 code */ - int sock_multi; - int szi = sizeof(int); -#endif /* SO_SEC_MULTI */ - - memset((char *)&dv, 0, sizeof(dv)); - - if (getsysv(&sysv, sizeof(struct sysv)) != 0) { - perror("getsysv"); - exit(1); - } - - /* - * Get socket security label and set device values - * {security label to be set on ttyp device} - */ -#ifdef SO_SEC_MULTI /* 8.0 code */ - if ((getsockopt(0, SOL_SOCKET, SO_SECURITY, - (char *)&ss, &szss) < 0) || - (getsockopt(0, SOL_SOCKET, SO_SEC_MULTI, - (char *)&sock_multi, &szi) < 0)) { - perror("getsockopt"); - exit(1); - } else { - dv.dv_actlvl = ss.ss_actlabel.lt_level; - dv.dv_actcmp = ss.ss_actlabel.lt_compart; - if (!sock_multi) { - dv.dv_minlvl = dv.dv_maxlvl = dv.dv_actlvl; - dv.dv_valcmp = dv.dv_actcmp; - } else { - dv.dv_minlvl = ss.ss_minlabel.lt_level; - dv.dv_maxlvl = ss.ss_maxlabel.lt_level; - dv.dv_valcmp = ss.ss_maxlabel.lt_compart; - } - dv.dv_devflg = 0; - } -#else /* SO_SEC_MULTI */ /* 7.0 code */ - if (getsockopt(0, SOL_SOCKET, SO_SECURITY, - (char *)&ss, &szss) >= 0) { - dv.dv_actlvl = ss.ss_slevel; - dv.dv_actcmp = ss.ss_compart; - dv.dv_minlvl = ss.ss_minlvl; - dv.dv_maxlvl = ss.ss_maxlvl; - dv.dv_valcmp = ss.ss_maxcmp; - } -#endif /* SO_SEC_MULTI */ - } -#endif /* _SC_CRAY_SECURE_SYS */ - - openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON); - fromlen = sizeof (from); - if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) { - fprintf(stderr, "%s: ", progname); - perror("getpeername"); - _exit(1); - } - if (keepalive && - setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, - (char *)&on, sizeof (on)) < 0) { - syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m"); - } - -#if defined(IPPROTO_IP) && defined(IP_TOS) - { -# if defined(HAS_GETTOS) - struct tosent *tp; - if (tos < 0 && (tp = gettosbyname("telnet", "tcp"))) - tos = tp->t_tos; -# endif - if (tos < 0) - tos = 020; /* Low Delay bit */ - if (tos - && (setsockopt(0, IPPROTO_IP, IP_TOS, - (char *)&tos, sizeof(tos)) < 0) - && (errno != ENOPROTOOPT) ) - syslog(LOG_WARNING, "setsockopt (IP_TOS): %m"); - } -#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - net = 0; - doit(&from); - /* NOTREACHED */ -} /* end of main */ - - void -usage() -{ - fprintf(stderr, "Usage: telnetd"); -#ifdef AUTHENTICATION - fprintf(stderr, " [-a (debug|other|user|valid|off|none)]\n\t"); -#endif -#ifdef BFTPDAEMON - fprintf(stderr, " [-B]"); -#endif - fprintf(stderr, " [-debug]"); -#ifdef DIAGNOSTICS - fprintf(stderr, " [-D (options|report|exercise|netdata|ptydata)]\n\t"); -#endif -#ifdef AUTHENTICATION - fprintf(stderr, " [-edebug]"); -#endif - fprintf(stderr, " [-h]"); -#if defined(CRAY) && defined(NEWINIT) - fprintf(stderr, " [-Iinitid]"); -#endif -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - fprintf(stderr, " [-k]"); -#endif -#ifdef LINEMODE - fprintf(stderr, " [-l]"); -#endif - fprintf(stderr, " [-n]"); -#ifdef CRAY - fprintf(stderr, " [-r[lowpty]-[highpty]]"); -#endif - fprintf(stderr, "\n\t"); -#ifdef SecurID - fprintf(stderr, " [-s]"); -#endif -#ifdef HAS_GETTOS - fprintf(stderr, " [-S tos]"); -#endif -#ifdef AUTHENTICATION - fprintf(stderr, " [-X auth-type]"); -#endif - fprintf(stderr, " [-u utmp_hostname_length] [-U]"); - fprintf(stderr, " [port]\n"); - exit(1); -} - -/* - * getterminaltype - * - * Ask the other end to send along its terminal type and speed. - * Output is the variable terminaltype filled in. - */ -static unsigned char ttytype_sbbuf[] = { - IAC, SB, TELOPT_TTYPE, TELQUAL_SEND, IAC, SE -}; - - int -getterminaltype(name) - char *name; -{ - int retval = -1; - void _gettermname(); - - settimer(baseline); -#if defined(AUTHENTICATION) - /* - * Handle the Authentication option before we do anything else. - */ - send_do(TELOPT_AUTHENTICATION, 1); - while (his_will_wont_is_changing(TELOPT_AUTHENTICATION)) - ttloop(); - if (his_state_is_will(TELOPT_AUTHENTICATION)) { - retval = auth_wait(name); - } -#endif - -#ifdef ENCRYPTION - send_will(TELOPT_ENCRYPT, 1); -#endif /* ENCRYPTION */ - send_do(TELOPT_TTYPE, 1); - send_do(TELOPT_TSPEED, 1); - send_do(TELOPT_XDISPLOC, 1); - send_do(TELOPT_NEW_ENVIRON, 1); - send_do(TELOPT_OLD_ENVIRON, 1); - while ( -#ifdef ENCRYPTION - his_do_dont_is_changing(TELOPT_ENCRYPT) || -#endif /* ENCRYPTION */ - his_will_wont_is_changing(TELOPT_TTYPE) || - his_will_wont_is_changing(TELOPT_TSPEED) || - his_will_wont_is_changing(TELOPT_XDISPLOC) || - his_will_wont_is_changing(TELOPT_NEW_ENVIRON) || - his_will_wont_is_changing(TELOPT_OLD_ENVIRON)) { - ttloop(); - } -#ifdef ENCRYPTION - /* - * Wait for the negotiation of what type of encryption we can - * send with. If autoencrypt is not set, this will just return. - */ - if (his_state_is_will(TELOPT_ENCRYPT)) { - encrypt_wait(); - } -#endif /* ENCRYPTION */ - if (his_state_is_will(TELOPT_TSPEED)) { - static unsigned char sb[] = - { IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE }; - - memmove(nfrontp, sb, sizeof sb); - nfrontp += sizeof sb; - DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); - } - if (his_state_is_will(TELOPT_XDISPLOC)) { - static unsigned char sb[] = - { IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE }; - - memmove(nfrontp, sb, sizeof sb); - nfrontp += sizeof sb; - DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); - } - if (his_state_is_will(TELOPT_NEW_ENVIRON)) { - static unsigned char sb[] = - { IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE }; - - memmove(nfrontp, sb, sizeof sb); - nfrontp += sizeof sb; - DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); - } - else if (his_state_is_will(TELOPT_OLD_ENVIRON)) { - static unsigned char sb[] = - { IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE }; - - memmove(nfrontp, sb, sizeof sb); - nfrontp += sizeof sb; - DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); - } - if (his_state_is_will(TELOPT_TTYPE)) { - - memmove(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); - nfrontp += sizeof ttytype_sbbuf; - DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2, - sizeof ttytype_sbbuf - 2);); - } - if (his_state_is_will(TELOPT_TSPEED)) { - while (sequenceIs(tspeedsubopt, baseline)) - ttloop(); - } - if (his_state_is_will(TELOPT_XDISPLOC)) { - while (sequenceIs(xdisplocsubopt, baseline)) - ttloop(); - } - if (his_state_is_will(TELOPT_NEW_ENVIRON)) { - while (sequenceIs(environsubopt, baseline)) - ttloop(); - } - if (his_state_is_will(TELOPT_OLD_ENVIRON)) { - while (sequenceIs(oenvironsubopt, baseline)) - ttloop(); - } - if (his_state_is_will(TELOPT_TTYPE)) { - char first[256], last[256]; - - while (sequenceIs(ttypesubopt, baseline)) - ttloop(); - - /* - * If the other side has already disabled the option, then - * we have to just go with what we (might) have already gotten. - */ - if (his_state_is_will(TELOPT_TTYPE) && !terminaltypeok(terminaltype)) { - (void) strncpy(first, terminaltype, sizeof(first)-1); - first[sizeof(first)-1] = '\0'; - for(;;) { - /* - * Save the unknown name, and request the next name. - */ - (void) strncpy(last, terminaltype, sizeof(last)-1); - last[sizeof(last)-1] = '\0'; - _gettermname(); - if (terminaltypeok(terminaltype)) - break; - if ((strncmp(last, terminaltype, sizeof(last)) == 0) || - his_state_is_wont(TELOPT_TTYPE)) { - /* - * We've hit the end. If this is the same as - * the first name, just go with it. - */ - if (strncmp(first, terminaltype, sizeof(first)) == 0) - break; - /* - * Get the terminal name one more time, so that - * RFC1091 compliant telnets will cycle back to - * the start of the list. - */ - _gettermname(); - if (strncmp(first, terminaltype, sizeof(first)) != 0) { - (void) strncpy(terminaltype, first, sizeof(terminaltype)-1); - terminaltype[sizeof(terminaltype)-1] = '\0'; - } - break; - } - } - } - } - return(retval); -} /* end of getterminaltype */ - - void -_gettermname() -{ - /* - * If the client turned off the option, - * we can't send another request, so we - * just return. - */ - if (his_state_is_wont(TELOPT_TTYPE)) - return; - settimer(baseline); - memmove(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); - nfrontp += sizeof ttytype_sbbuf; - DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2, - sizeof ttytype_sbbuf - 2);); - while (sequenceIs(ttypesubopt, baseline)) - ttloop(); -} - - int -terminaltypeok(s) - char *s; -{ - char buf[1024]; - - if (terminaltype == NULL) - return(1); - - /* - * tgetent() will return 1 if the type is known, and - * 0 if it is not known. If it returns -1, it couldn't - * open the database. But if we can't open the database, - * it won't help to say we failed, because we won't be - * able to verify anything else. So, we treat -1 like 1. - */ - if (tgetent(buf, s) == 0) - return(0); - return(1); -} - -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif /* MAXHOSTNAMELEN */ - -char *hostname; -char host_name[MAXHOSTNAMELEN]; -char remote_host_name[MAXHOSTNAMELEN]; - -extern void telnet P((int, int, char *)); - -int level; -char user_name[256]; -/* - * Get a pty, scan input lines. - */ -doit(who) - struct sockaddr_in *who; -{ - char *host, *inet_ntoa(); - int t; - struct hostent *hp; - int ptynum; - - /* - * Find an available pty to use. - */ -#ifndef convex - pty = getpty(&ptynum); - if (pty < 0) - fatal(net, "All network ports in use"); -#else - for (;;) { - char *lp; - extern char *line, *getpty(); - - if ((lp = getpty()) == NULL) - fatal(net, "Out of ptys"); - - if ((pty = open(lp, 2)) >= 0) { - strcpy(line,lp); - line[5] = 't'; - break; - } - } -#endif - -#if defined(_SC_CRAY_SECURE_SYS) - /* - * set ttyp line security label - */ - if (secflag) { - char slave_dev[16]; - - sprintf(tty_dev, "/dev/pty/%03d", ptynum); - if (setdevs(tty_dev, &dv) < 0) - fatal(net, "cannot set pty security"); - sprintf(slave_dev, "/dev/ttyp%03d", ptynum); - if (setdevs(slave_dev, &dv) < 0) - fatal(net, "cannot set tty security"); - } -#endif /* _SC_CRAY_SECURE_SYS */ - - /* get name of connected client */ - hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr), - who->sin_family); - - if (hp == NULL && registerd_host_only) { - fatal(net, "Couldn't resolve your address into a host name.\r\n\ - Please contact your net administrator"); - } else if (hp && - (strlen(hp->h_name) <= (unsigned int)((utmp_len < 0) ? -utmp_len - : utmp_len))) { - host = hp->h_name; - } else { - host = inet_ntoa(who->sin_addr); - } - /* - * We must make a copy because Kerberos is probably going - * to also do a gethost* and overwrite the static data... - */ - strncpy(remote_host_name, host, sizeof(remote_host_name)-1); - remote_host_name[sizeof(remote_host_name)-1] = 0; - host = remote_host_name; - - (void) gethostname(host_name, sizeof (host_name)); - hostname = host_name; - -#if defined(AUTHENTICATION) || defined(ENCRYPTION) - auth_encrypt_init(hostname, host, "TELNETD", 1); -#endif - - init_env(); - /* - * get terminal type. - */ - *user_name = 0; - level = getterminaltype(user_name); - setenv("TERM", terminaltype ? terminaltype : "network", 1); - -#if defined(_SC_CRAY_SECURE_SYS) - if (secflag) { - if (setulvl(dv.dv_actlvl) < 0) - fatal(net,"cannot setulvl()"); - if (setucmp(dv.dv_actcmp) < 0) - fatal(net, "cannot setucmp()"); - } -#endif /* _SC_CRAY_SECURE_SYS */ - - telnet(net, pty, host); /* begin server process */ - - /*NOTREACHED*/ -} /* end of doit */ - -#if defined(CRAY2) && defined(UNICOS5) && defined(UNICOS50) - int -Xterm_output(ibufp, obuf, icountp, ocount) - char **ibufp, *obuf; - int *icountp, ocount; -{ - int ret; - ret = term_output(*ibufp, obuf, *icountp, ocount); - *ibufp += *icountp; - *icountp = 0; - return(ret); -} -#define term_output Xterm_output -#endif /* defined(CRAY2) && defined(UNICOS5) && defined(UNICOS50) */ - -/* - * Main loop. Select from pty and network, and - * hand data to telnet receiver finite state machine. - */ - void -telnet(f, p, host) - int f, p; - char *host; -{ - int on = 1; -#define TABBUFSIZ 512 - char defent[TABBUFSIZ]; - char defstrs[TABBUFSIZ]; -#undef TABBUFSIZ - char *HE; - char *HN; - char *IM; - void netflush(); - int nfd; - - /* - * Initialize the slc mapping table. - */ - get_slc_defaults(); - - /* - * Do some tests where it is desireable to wait for a response. - * Rather than doing them slowly, one at a time, do them all - * at once. - */ - if (my_state_is_wont(TELOPT_SGA)) - send_will(TELOPT_SGA, 1); - /* - * Is the client side a 4.2 (NOT 4.3) system? We need to know this - * because 4.2 clients are unable to deal with TCP urgent data. - * - * To find out, we send out a "DO ECHO". If the remote system - * answers "WILL ECHO" it is probably a 4.2 client, and we note - * that fact ("WILL ECHO" ==> that the client will echo what - * WE, the server, sends it; it does NOT mean that the client will - * echo the terminal input). - */ - send_do(TELOPT_ECHO, 1); - -#ifdef LINEMODE - if (his_state_is_wont(TELOPT_LINEMODE)) { - /* Query the peer for linemode support by trying to negotiate - * the linemode option. - */ - linemode = 0; - editmode = 0; - send_do(TELOPT_LINEMODE, 1); /* send do linemode */ - } -#endif /* LINEMODE */ - - /* - * Send along a couple of other options that we wish to negotiate. - */ - send_do(TELOPT_NAWS, 1); - send_will(TELOPT_STATUS, 1); - flowmode = 1; /* default flow control state */ - restartany = -1; /* uninitialized... */ - send_do(TELOPT_LFLOW, 1); - - /* - * Spin, waiting for a response from the DO ECHO. However, - * some REALLY DUMB telnets out there might not respond - * to the DO ECHO. So, we spin looking for NAWS, (most dumb - * telnets so far seem to respond with WONT for a DO that - * they don't understand...) because by the time we get the - * response, it will already have processed the DO ECHO. - * Kludge upon kludge. - */ - while (his_will_wont_is_changing(TELOPT_NAWS)) - ttloop(); - - /* - * But... - * The client might have sent a WILL NAWS as part of its - * startup code; if so, we'll be here before we get the - * response to the DO ECHO. We'll make the assumption - * that any implementation that understands about NAWS - * is a modern enough implementation that it will respond - * to our DO ECHO request; hence we'll do another spin - * waiting for the ECHO option to settle down, which is - * what we wanted to do in the first place... - */ - if (his_want_state_is_will(TELOPT_ECHO) && - his_state_is_will(TELOPT_NAWS)) { - while (his_will_wont_is_changing(TELOPT_ECHO)) - ttloop(); - } - /* - * On the off chance that the telnet client is broken and does not - * respond to the DO ECHO we sent, (after all, we did send the - * DO NAWS negotiation after the DO ECHO, and we won't get here - * until a response to the DO NAWS comes back) simulate the - * receipt of a will echo. This will also send a WONT ECHO - * to the client, since we assume that the client failed to - * respond because it believes that it is already in DO ECHO - * mode, which we do not want. - */ - if (his_want_state_is_will(TELOPT_ECHO)) { - DIAG(TD_OPTIONS, - {sprintf(nfrontp, "td: simulating recv\r\n"); - nfrontp += strlen(nfrontp);}); - willoption(TELOPT_ECHO); - } - - /* - * Finally, to clean things up, we turn on our echo. This - * will break stupid 4.2 telnets out of local terminal echo. - */ - - if (my_state_is_wont(TELOPT_ECHO)) - send_will(TELOPT_ECHO, 1); - -#ifndef STREAMSPTY - /* - * Turn on packet mode - */ - (void) ioctl(p, TIOCPKT, (char *)&on); -#endif - -#if defined(LINEMODE) && defined(KLUDGELINEMODE) - /* - * Continuing line mode support. If client does not support - * real linemode, attempt to negotiate kludge linemode by sending - * the do timing mark sequence. - */ - if (lmodetype < REAL_LINEMODE) - send_do(TELOPT_TM, 1); -#endif /* defined(LINEMODE) && defined(KLUDGELINEMODE) */ - - /* - * Call telrcv() once to pick up anything received during - * terminal type negotiation, 4.2/4.3 determination, and - * linemode negotiation. - */ - telrcv(); - - (void) ioctl(f, FIONBIO, (char *)&on); - (void) ioctl(p, FIONBIO, (char *)&on); -#if defined(CRAY2) && defined(UNICOS5) - init_termdriver(f, p, interrupt, sendbrk); -#endif - -#if defined(SO_OOBINLINE) - (void) setsockopt(net, SOL_SOCKET, SO_OOBINLINE, - (char *)&on, sizeof on); -#endif /* defined(SO_OOBINLINE) */ - -#ifdef SIGTSTP - (void) signal(SIGTSTP, SIG_IGN); -#endif -#ifdef SIGTTOU - /* - * Ignoring SIGTTOU keeps the kernel from blocking us - * in ttioct() in /sys/tty.c. - */ - (void) signal(SIGTTOU, SIG_IGN); -#endif - - (void) signal(SIGCHLD, cleanup); - -#if defined(CRAY2) && defined(UNICOS5) - /* - * Cray-2 will send a signal when pty modes are changed by slave - * side. Set up signal handler now. - */ - if ((int)signal(SIGUSR1, termstat) < 0) - perror("signal"); - else if (ioctl(p, TCSIGME, (char *)SIGUSR1) < 0) - perror("ioctl:TCSIGME"); - /* - * Make processing loop check terminal characteristics early on. - */ - termstat(); -#endif - -#ifdef TIOCNOTTY - { - register int t; - t = open(_PATH_TTY, O_RDWR); - if (t >= 0) { - (void) ioctl(t, TIOCNOTTY, (char *)0); - (void) close(t); - } - } -#endif - -#if defined(CRAY) && defined(NEWINIT) && defined(TIOCSCTTY) - (void) setsid(); - ioctl(p, TIOCSCTTY, 0); -#endif - - /* - * Show banner that getty never gave. - * - * We put the banner in the pty input buffer. This way, it - * gets carriage return null processing, etc., just like all - * other pty --> client data. - */ - -#if !defined(CRAY) || !defined(NEWINIT) - if (getenv("USER")) - hostinfo = 0; -#endif - - if (getent(defent, "default") == 1) { - char *getstr(); - char *cp=defstrs; - - HE = getstr("he", &cp); - HN = getstr("hn", &cp); - IM = getstr("im", &cp); - if (HN && *HN) - (void) strcpy(host_name, HN); - if (IM == 0) - IM = ""; - } else { - IM = DEFAULT_IM; - HE = 0; - } - edithost(HE, host_name); - if (hostinfo && *IM) - putf(IM, ptyibuf2); - - if (pcc) - (void) strncat(ptyibuf2, ptyip, pcc+1); - ptyip = ptyibuf2; - pcc = strlen(ptyip); -#ifdef LINEMODE - /* - * Last check to make sure all our states are correct. - */ - init_termbuf(); - localstat(); -#endif /* LINEMODE */ - - DIAG(TD_REPORT, - {sprintf(nfrontp, "td: Entering processing loop\r\n"); - nfrontp += strlen(nfrontp);}); - - /* - * Startup the login process on the slave side of the terminal - * now. We delay this until here to insure option negotiation - * is complete. - */ - startslave(host, level, user_name); - - nfd = ((f > p) ? f : p) + 1; - for (;;) { - fd_set ibits, obits, xbits; - register int c; - - if (ncc < 0 && pcc < 0) - break; - -#if defined(CRAY2) && defined(UNICOS5) - if (needtermstat) - _termstat(); -#endif /* defined(CRAY2) && defined(UNICOS5) */ - FD_ZERO(&ibits); - FD_ZERO(&obits); - FD_ZERO(&xbits); - /* - * Never look for input if there's still - * stuff in the corresponding output buffer - */ - if (nfrontp - nbackp || pcc > 0) { - FD_SET(f, &obits); - } else { - FD_SET(p, &ibits); - } - if (pfrontp - pbackp || ncc > 0) { - FD_SET(p, &obits); - } else { - FD_SET(f, &ibits); - } - if (!SYNCHing) { - FD_SET(f, &xbits); - } - if ((c = select(nfd, &ibits, &obits, &xbits, - (struct timeval *)0)) < 1) { - if (c == -1) { - if (errno == EINTR) { - continue; - } - } - sleep(5); - continue; - } - - /* - * Any urgent data? - */ - if (FD_ISSET(net, &xbits)) { - SYNCHing = 1; - } - - /* - * Something to read from the network... - */ - if (FD_ISSET(net, &ibits)) { -#if !defined(SO_OOBINLINE) - /* - * In 4.2 (and 4.3 beta) systems, the - * OOB indication and data handling in the kernel - * is such that if two separate TCP Urgent requests - * come in, one byte of TCP data will be overlaid. - * This is fatal for Telnet, but we try to live - * with it. - * - * In addition, in 4.2 (and...), a special protocol - * is needed to pick up the TCP Urgent data in - * the correct sequence. - * - * What we do is: if we think we are in urgent - * mode, we look to see if we are "at the mark". - * If we are, we do an OOB receive. If we run - * this twice, we will do the OOB receive twice, - * but the second will fail, since the second - * time we were "at the mark", but there wasn't - * any data there (the kernel doesn't reset - * "at the mark" until we do a normal read). - * Once we've read the OOB data, we go ahead - * and do normal reads. - * - * There is also another problem, which is that - * since the OOB byte we read doesn't put us - * out of OOB state, and since that byte is most - * likely the TELNET DM (data mark), we would - * stay in the TELNET SYNCH (SYNCHing) state. - * So, clocks to the rescue. If we've "just" - * received a DM, then we test for the - * presence of OOB data when the receive OOB - * fails (and AFTER we did the normal mode read - * to clear "at the mark"). - */ - if (SYNCHing) { - int atmark; - - (void) ioctl(net, SIOCATMARK, (char *)&atmark); - if (atmark) { - ncc = recv(net, netibuf, sizeof (netibuf), MSG_OOB); - if ((ncc == -1) && (errno == EINVAL)) { - ncc = read(net, netibuf, sizeof (netibuf)); - if (sequenceIs(didnetreceive, gotDM)) { - SYNCHing = stilloob(net); - } - } - } else { - ncc = read(net, netibuf, sizeof (netibuf)); - } - } else { - ncc = read(net, netibuf, sizeof (netibuf)); - } - settimer(didnetreceive); -#else /* !defined(SO_OOBINLINE)) */ - ncc = read(net, netibuf, sizeof (netibuf)); -#endif /* !defined(SO_OOBINLINE)) */ - if (ncc < 0 && errno == EWOULDBLOCK) - ncc = 0; - else { - if (ncc <= 0) { - break; - } - netip = netibuf; - } - DIAG((TD_REPORT | TD_NETDATA), - {sprintf(nfrontp, "td: netread %d chars\r\n", ncc); - nfrontp += strlen(nfrontp);}); - DIAG(TD_NETDATA, printdata("nd", netip, ncc)); - } - - /* - * Something to read from the pty... - */ - if (FD_ISSET(p, &ibits)) { -#ifndef STREAMSPTY - pcc = read(p, ptyibuf, BUFSIZ); -#else - pcc = readstream(p, ptyibuf, BUFSIZ); -#endif - /* - * On some systems, if we try to read something - * off the master side before the slave side is - * opened, we get EIO. - */ - if (pcc < 0 && (errno == EWOULDBLOCK || -#ifdef EAGAIN - errno == EAGAIN || -#endif - errno == EIO)) { - pcc = 0; - } else { - if (pcc <= 0) - break; -#if !defined(CRAY2) || !defined(UNICOS5) -#ifdef LINEMODE - /* - * If ioctl from pty, pass it through net - */ - if (ptyibuf[0] & TIOCPKT_IOCTL) { - copy_termbuf(ptyibuf+1, pcc-1); - localstat(); - pcc = 1; - } -#endif /* LINEMODE */ - if (ptyibuf[0] & TIOCPKT_FLUSHWRITE) { - netclear(); /* clear buffer back */ -#ifndef NO_URGENT - /* - * There are client telnets on some - * operating systems get screwed up - * royally if we send them urgent - * mode data. - */ - *nfrontp++ = IAC; - *nfrontp++ = DM; - neturg = nfrontp-1; /* off by one XXX */ - DIAG(TD_OPTIONS, - printoption("td: send IAC", DM)); - -#endif - } - if (his_state_is_will(TELOPT_LFLOW) && - (ptyibuf[0] & - (TIOCPKT_NOSTOP|TIOCPKT_DOSTOP))) { - int newflow = - ptyibuf[0] & TIOCPKT_DOSTOP ? 1 : 0; - if (newflow != flowmode) { - flowmode = newflow; - (void) sprintf(nfrontp, - "%c%c%c%c%c%c", - IAC, SB, TELOPT_LFLOW, - flowmode ? LFLOW_ON - : LFLOW_OFF, - IAC, SE); - nfrontp += 6; - DIAG(TD_OPTIONS, printsub('>', - (unsigned char *)nfrontp-4, - 4);); - } - } - pcc--; - ptyip = ptyibuf+1; -#else /* defined(CRAY2) && defined(UNICOS5) */ - if (!uselinemode) { - unpcc = pcc; - unptyip = ptyibuf; - pcc = term_output(&unptyip, ptyibuf2, - &unpcc, BUFSIZ); - ptyip = ptyibuf2; - } else - ptyip = ptyibuf; -#endif /* defined(CRAY2) && defined(UNICOS5) */ - } - } - - while (pcc > 0) { - if ((&netobuf[BUFSIZ] - nfrontp) < 2) - break; - c = *ptyip++ & 0377, pcc--; - if (c == IAC) - *nfrontp++ = c; -#if defined(CRAY2) && defined(UNICOS5) - else if (c == '\n' && - my_state_is_wont(TELOPT_BINARY) && newmap) - *nfrontp++ = '\r'; -#endif /* defined(CRAY2) && defined(UNICOS5) */ - *nfrontp++ = c; - if ((c == '\r') && (my_state_is_wont(TELOPT_BINARY))) { - if (pcc > 0 && ((*ptyip & 0377) == '\n')) { - *nfrontp++ = *ptyip++ & 0377; - pcc--; - } else - *nfrontp++ = '\0'; - } - } -#if defined(CRAY2) && defined(UNICOS5) - /* - * If chars were left over from the terminal driver, - * note their existence. - */ - if (!uselinemode && unpcc) { - pcc = unpcc; - unpcc = 0; - ptyip = unptyip; - } -#endif /* defined(CRAY2) && defined(UNICOS5) */ - - if (FD_ISSET(f, &obits) && (nfrontp - nbackp) > 0) - netflush(); - if (ncc > 0) - telrcv(); - if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0) - ptyflush(); - } - cleanup(0); -} /* end of telnet */ - -#ifndef TCSIG -# ifdef TIOCSIG -# define TCSIG TIOCSIG -# endif -#endif - -#ifdef STREAMSPTY - -int flowison = -1; /* current state of flow: -1 is unknown */ - -int readstream(p, ibuf, bufsize) - int p; - char *ibuf; - int bufsize; -{ - int flags = 0; - int ret = 0; - struct termios *tsp; - struct termio *tp; - struct iocblk *ip; - char vstop, vstart; - int ixon; - int newflow; - - strbufc.maxlen = BUFSIZ; - strbufc.buf = (char *)ctlbuf; - strbufd.maxlen = bufsize-1; - strbufd.len = 0; - strbufd.buf = ibuf+1; - ibuf[0] = 0; - - ret = getmsg(p, &strbufc, &strbufd, &flags); - if (ret < 0) /* error of some sort -- probably EAGAIN */ - return(-1); - - if (strbufc.len <= 0 || ctlbuf[0] == M_DATA) { - /* data message */ - if (strbufd.len > 0) { /* real data */ - return(strbufd.len + 1); /* count header char */ - } else { - /* nothing there */ - errno = EAGAIN; - return(-1); - } - } - - /* - * It's a control message. Return 1, to look at the flag we set - */ - - switch (ctlbuf[0]) { - case M_FLUSH: - if (ibuf[1] & FLUSHW) - ibuf[0] = TIOCPKT_FLUSHWRITE; - return(1); - - case M_IOCTL: - ip = (struct iocblk *) (ibuf+1); - - switch (ip->ioc_cmd) { - case TCSETS: - case TCSETSW: - case TCSETSF: - tsp = (struct termios *) - (ibuf+1 + sizeof(struct iocblk)); - vstop = tsp->c_cc[VSTOP]; - vstart = tsp->c_cc[VSTART]; - ixon = tsp->c_iflag & IXON; - break; - case TCSETA: - case TCSETAW: - case TCSETAF: - tp = (struct termio *) (ibuf+1 + sizeof(struct iocblk)); - vstop = tp->c_cc[VSTOP]; - vstart = tp->c_cc[VSTART]; - ixon = tp->c_iflag & IXON; - break; - default: - errno = EAGAIN; - return(-1); - } - - newflow = (ixon && (vstart == 021) && (vstop == 023)) ? 1 : 0; - if (newflow != flowison) { /* it's a change */ - flowison = newflow; - ibuf[0] = newflow ? TIOCPKT_DOSTOP : TIOCPKT_NOSTOP; - return(1); - } - } - - /* nothing worth doing anything about */ - errno = EAGAIN; - return(-1); -} -#endif /* STREAMSPTY */ - -/* - * Send interrupt to process on other side of pty. - * If it is in raw mode, just write NULL; - * otherwise, write intr char. - */ - void -interrupt() -{ - ptyflush(); /* half-hearted */ - -#if defined(STREAMSPTY) && defined(TIOCSIGNAL) - /* Streams PTY style ioctl to post a signal */ - { - int sig = SIGINT; - (void) ioctl(pty, TIOCSIGNAL, &sig); - (void) ioctl(pty, I_FLUSH, FLUSHR); - } -#else -#ifdef TCSIG - (void) ioctl(pty, TCSIG, (char *)SIGINT); -#else /* TCSIG */ - init_termbuf(); - *pfrontp++ = slctab[SLC_IP].sptr ? - (unsigned char)*slctab[SLC_IP].sptr : '\177'; -#endif /* TCSIG */ -#endif -} - -/* - * Send quit to process on other side of pty. - * If it is in raw mode, just write NULL; - * otherwise, write quit char. - */ - void -sendbrk() -{ - ptyflush(); /* half-hearted */ -#ifdef TCSIG - (void) ioctl(pty, TCSIG, (char *)SIGQUIT); -#else /* TCSIG */ - init_termbuf(); - *pfrontp++ = slctab[SLC_ABORT].sptr ? - (unsigned char)*slctab[SLC_ABORT].sptr : '\034'; -#endif /* TCSIG */ -} - - void -sendsusp() -{ -#ifdef SIGTSTP - ptyflush(); /* half-hearted */ -# ifdef TCSIG - (void) ioctl(pty, TCSIG, (char *)SIGTSTP); -# else /* TCSIG */ - *pfrontp++ = slctab[SLC_SUSP].sptr ? - (unsigned char)*slctab[SLC_SUSP].sptr : '\032'; -# endif /* TCSIG */ -#endif /* SIGTSTP */ -} - -/* - * When we get an AYT, if ^T is enabled, use that. Otherwise, - * just send back "[Yes]". - */ - void -recv_ayt() -{ -#if defined(SIGINFO) && defined(TCSIG) - if (slctab[SLC_AYT].sptr && *slctab[SLC_AYT].sptr != _POSIX_VDISABLE) { - (void) ioctl(pty, TCSIG, (char *)SIGINFO); - return; - } -#endif - (void) strcpy(nfrontp, "\r\n[Yes]\r\n"); - nfrontp += 9; -} - - void -doeof() -{ - init_termbuf(); - -#if defined(LINEMODE) && defined(USE_TERMIO) && (VEOF == VMIN) - if (!tty_isediting()) { - extern char oldeofc; - *pfrontp++ = oldeofc; - return; - } -#endif - *pfrontp++ = slctab[SLC_EOF].sptr ? - (unsigned char)*slctab[SLC_EOF].sptr : '\004'; -} diff --git a/secure/libexec/telnetd/telnetd.h b/secure/libexec/telnetd/telnetd.h deleted file mode 100644 index 234b9739e7580..0000000000000 --- a/secure/libexec/telnetd/telnetd.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)telnetd.h 8.1 (Berkeley) 6/4/93 - */ - - -#include "defs.h" -#include "ext.h" - -#ifdef DIAGNOSTICS -#define DIAG(a,b) if (diagnostic & (a)) b -#else -#define DIAG(a,b) -#endif - -/* other external variables */ -extern char **environ; -extern int errno; - diff --git a/secure/libexec/telnetd/termstat.c b/secure/libexec/telnetd/termstat.c deleted file mode 100644 index f499137366d2e..0000000000000 --- a/secure/libexec/telnetd/termstat.c +++ /dev/null @@ -1,669 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include "telnetd.h" - -/* - * local variables - */ -int def_tspeed = -1, def_rspeed = -1; -#ifdef TIOCSWINSZ -int def_row = 0, def_col = 0; -#endif -#ifdef LINEMODE -static int _terminit = 0; -#endif /* LINEMODE */ - -#if defined(CRAY2) && defined(UNICOS5) -int newmap = 1; /* nonzero if \n maps to ^M^J */ -#endif - -#ifdef LINEMODE -/* - * localstat - * - * This function handles all management of linemode. - * - * Linemode allows the client to do the local editing of data - * and send only complete lines to the server. Linemode state is - * based on the state of the pty driver. If the pty is set for - * external processing, then we can use linemode. Further, if we - * can use real linemode, then we can look at the edit control bits - * in the pty to determine what editing the client should do. - * - * Linemode support uses the following state flags to keep track of - * current and desired linemode state. - * alwayslinemode : true if -l was specified on the telnetd - * command line. It means to have linemode on as much as - * possible. - * - * lmodetype: signifies whether the client can - * handle real linemode, or if use of kludgeomatic linemode - * is preferred. It will be set to one of the following: - * REAL_LINEMODE : use linemode option - * NO_KLUDGE : don't initiate kludge linemode. - * KLUDGE_LINEMODE : use kludge linemode - * NO_LINEMODE : client is ignorant of linemode - * - * linemode, uselinemode : linemode is true if linemode - * is currently on, uselinemode is the state that we wish - * to be in. If another function wishes to turn linemode - * on or off, it sets or clears uselinemode. - * - * editmode, useeditmode : like linemode/uselinemode, but - * these contain the edit mode states (edit and trapsig). - * - * The state variables correspond to some of the state information - * in the pty. - * linemode: - * In real linemode, this corresponds to whether the pty - * expects external processing of incoming data. - * In kludge linemode, this more closely corresponds to the - * whether normal processing is on or not. (ICANON in - * system V, or COOKED mode in BSD.) - * If the -l option was specified (alwayslinemode), then - * an attempt is made to force external processing on at - * all times. - * - * The following heuristics are applied to determine linemode - * handling within the server. - * 1) Early on in starting up the server, an attempt is made - * to negotiate the linemode option. If this succeeds - * then lmodetype is set to REAL_LINEMODE and all linemode - * processing occurs in the context of the linemode option. - * 2) If the attempt to negotiate the linemode option failed, - * and the "-k" (don't initiate kludge linemode) isn't set, - * then we try to use kludge linemode. We test for this - * capability by sending "do Timing Mark". If a positive - * response comes back, then we assume that the client - * understands kludge linemode (ech!) and the - * lmodetype flag is set to KLUDGE_LINEMODE. - * 3) Otherwise, linemode is not supported at all and - * lmodetype remains set to NO_LINEMODE (which happens - * to be 0 for convenience). - * 4) At any time a command arrives that implies a higher - * state of linemode support in the client, we move to that - * linemode support. - * - * A short explanation of kludge linemode is in order here. - * 1) The heuristic to determine support for kludge linemode - * is to send a do timing mark. We assume that a client - * that supports timing marks also supports kludge linemode. - * A risky proposition at best. - * 2) Further negotiation of linemode is done by changing the - * the server's state regarding SGA. If server will SGA, - * then linemode is off, if server won't SGA, then linemode - * is on. - */ - void -localstat() -{ - void netflush(); - int need_will_echo = 0; - -#if defined(CRAY2) && defined(UNICOS5) - /* - * Keep track of that ol' CR/NL mapping while we're in the - * neighborhood. - */ - newmap = tty_isnewmap(); -#endif /* defined(CRAY2) && defined(UNICOS5) */ - - /* - * Check for changes to flow control if client supports it. - */ - flowstat(); - - /* - * Check linemode on/off state - */ - uselinemode = tty_linemode(); - - /* - * If alwayslinemode is on, and pty is changing to turn it off, then - * force linemode back on. - */ - if (alwayslinemode && linemode && !uselinemode) { - uselinemode = 1; - tty_setlinemode(uselinemode); - } - - if (uselinemode) { - /* - * Check for state of BINARY options. - * - * We only need to do the binary dance if we are actually going - * to use linemode. As this confuses some telnet clients - * that don't support linemode, and doesn't gain us - * anything, we don't do it unless we're doing linemode. - * -Crh (henrich@msu.edu) - */ - - if (tty_isbinaryin()) { - if (his_want_state_is_wont(TELOPT_BINARY)) - send_do(TELOPT_BINARY, 1); - } else { - if (his_want_state_is_will(TELOPT_BINARY)) - send_dont(TELOPT_BINARY, 1); - } - - if (tty_isbinaryout()) { - if (my_want_state_is_wont(TELOPT_BINARY)) - send_will(TELOPT_BINARY, 1); - } else { - if (my_want_state_is_will(TELOPT_BINARY)) - send_wont(TELOPT_BINARY, 1); - } - } - -#ifdef ENCRYPTION - /* - * If the terminal is not echoing, but editing is enabled, - * something like password input is going to happen, so - * if we the other side is not currently sending encrypted - * data, ask the other side to start encrypting. - */ - if (his_state_is_will(TELOPT_ENCRYPT)) { - static int enc_passwd = 0; - if (uselinemode && !tty_isecho() && tty_isediting() - && (enc_passwd == 0) && !decrypt_input) { - encrypt_send_request_start(); - enc_passwd = 1; - } else if (enc_passwd) { - encrypt_send_request_end(); - enc_passwd = 0; - } - } -#endif /* ENCRYPTION */ - - /* - * Do echo mode handling as soon as we know what the - * linemode is going to be. - * If the pty has echo turned off, then tell the client that - * the server will echo. If echo is on, then the server - * will echo if in character mode, but in linemode the - * client should do local echoing. The state machine will - * not send anything if it is unnecessary, so don't worry - * about that here. - * - * If we need to send the WILL ECHO (because echo is off), - * then delay that until after we have changed the MODE. - * This way, when the user is turning off both editing - * and echo, the client will get editing turned off first. - * This keeps the client from going into encryption mode - * and then right back out if it is doing auto-encryption - * when passwords are being typed. - */ - if (uselinemode) { - if (tty_isecho()) - send_wont(TELOPT_ECHO, 1); - else - need_will_echo = 1; -#ifdef KLUDGELINEMODE - if (lmodetype == KLUDGE_OK) - lmodetype = KLUDGE_LINEMODE; -#endif - } - - /* - * If linemode is being turned off, send appropriate - * command and then we're all done. - */ - if (!uselinemode && linemode) { -# ifdef KLUDGELINEMODE - if (lmodetype == REAL_LINEMODE) { -# endif /* KLUDGELINEMODE */ - send_dont(TELOPT_LINEMODE, 1); -# ifdef KLUDGELINEMODE - } else if (lmodetype == KLUDGE_LINEMODE) - send_will(TELOPT_SGA, 1); -# endif /* KLUDGELINEMODE */ - send_will(TELOPT_ECHO, 1); - linemode = uselinemode; - goto done; - } - -# ifdef KLUDGELINEMODE - /* - * If using real linemode check edit modes for possible later use. - * If we are in kludge linemode, do the SGA negotiation. - */ - if (lmodetype == REAL_LINEMODE) { -# endif /* KLUDGELINEMODE */ - useeditmode = 0; - if (tty_isediting()) - useeditmode |= MODE_EDIT; - if (tty_istrapsig()) - useeditmode |= MODE_TRAPSIG; - if (tty_issofttab()) - useeditmode |= MODE_SOFT_TAB; - if (tty_islitecho()) - useeditmode |= MODE_LIT_ECHO; -# ifdef KLUDGELINEMODE - } else if (lmodetype == KLUDGE_LINEMODE) { - if (tty_isediting() && uselinemode) - send_wont(TELOPT_SGA, 1); - else - send_will(TELOPT_SGA, 1); - } -# endif /* KLUDGELINEMODE */ - - /* - * Negotiate linemode on if pty state has changed to turn it on. - * Send appropriate command and send along edit mode, then all done. - */ - if (uselinemode && !linemode) { -# ifdef KLUDGELINEMODE - if (lmodetype == KLUDGE_LINEMODE) { - send_wont(TELOPT_SGA, 1); - } else if (lmodetype == REAL_LINEMODE) { -# endif /* KLUDGELINEMODE */ - send_do(TELOPT_LINEMODE, 1); - /* send along edit modes */ - (void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, SB, - TELOPT_LINEMODE, LM_MODE, useeditmode, - IAC, SE); - nfrontp += 7; - editmode = useeditmode; -# ifdef KLUDGELINEMODE - } -# endif /* KLUDGELINEMODE */ - linemode = uselinemode; - goto done; - } - -# ifdef KLUDGELINEMODE - /* - * None of what follows is of any value if not using - * real linemode. - */ - if (lmodetype < REAL_LINEMODE) - goto done; -# endif /* KLUDGELINEMODE */ - - if (linemode && his_state_is_will(TELOPT_LINEMODE)) { - /* - * If edit mode changed, send edit mode. - */ - if (useeditmode != editmode) { - /* - * Send along appropriate edit mode mask. - */ - (void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, SB, - TELOPT_LINEMODE, LM_MODE, useeditmode, - IAC, SE); - nfrontp += 7; - editmode = useeditmode; - } - - - /* - * Check for changes to special characters in use. - */ - start_slc(0); - check_slc(); - (void) end_slc(0); - } - -done: - if (need_will_echo) - send_will(TELOPT_ECHO, 1); - /* - * Some things should be deferred until after the pty state has - * been set by the local process. Do those things that have been - * deferred now. This only happens once. - */ - if (_terminit == 0) { - _terminit = 1; - defer_terminit(); - } - - netflush(); - set_termbuf(); - return; - -} /* end of localstat */ -#endif /* LINEMODE */ - -/* - * flowstat - * - * Check for changes to flow control - */ - void -flowstat() -{ - if (his_state_is_will(TELOPT_LFLOW)) { - if (tty_flowmode() != flowmode) { - flowmode = tty_flowmode(); - (void) sprintf(nfrontp, "%c%c%c%c%c%c", - IAC, SB, TELOPT_LFLOW, - flowmode ? LFLOW_ON : LFLOW_OFF, - IAC, SE); - nfrontp += 6; - } - if (tty_restartany() != restartany) { - restartany = tty_restartany(); - (void) sprintf(nfrontp, "%c%c%c%c%c%c", - IAC, SB, TELOPT_LFLOW, - restartany ? LFLOW_RESTART_ANY - : LFLOW_RESTART_XON, - IAC, SE); - nfrontp += 6; - } - } -} - -/* - * clientstat - * - * Process linemode related requests from the client. - * Client can request a change to only one of linemode, editmode or slc's - * at a time, and if using kludge linemode, then only linemode may be - * affected. - */ - void -clientstat(code, parm1, parm2) - register int code, parm1, parm2; -{ - void netflush(); - - /* - * Get a copy of terminal characteristics. - */ - init_termbuf(); - - /* - * Process request from client. code tells what it is. - */ - switch (code) { -#ifdef LINEMODE - case TELOPT_LINEMODE: - /* - * Don't do anything unless client is asking us to change - * modes. - */ - uselinemode = (parm1 == WILL); - if (uselinemode != linemode) { -# ifdef KLUDGELINEMODE - /* - * If using kludge linemode, make sure that - * we can do what the client asks. - * We can not turn off linemode if alwayslinemode - * and the ICANON bit is set. - */ - if (lmodetype == KLUDGE_LINEMODE) { - if (alwayslinemode && tty_isediting()) { - uselinemode = 1; - } - } - - /* - * Quit now if we can't do it. - */ - if (uselinemode == linemode) - return; - - /* - * If using real linemode and linemode is being - * turned on, send along the edit mode mask. - */ - if (lmodetype == REAL_LINEMODE && uselinemode) -# else /* KLUDGELINEMODE */ - if (uselinemode) -# endif /* KLUDGELINEMODE */ - { - useeditmode = 0; - if (tty_isediting()) - useeditmode |= MODE_EDIT; - if (tty_istrapsig) - useeditmode |= MODE_TRAPSIG; - if (tty_issofttab()) - useeditmode |= MODE_SOFT_TAB; - if (tty_islitecho()) - useeditmode |= MODE_LIT_ECHO; - (void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, - SB, TELOPT_LINEMODE, LM_MODE, - useeditmode, IAC, SE); - nfrontp += 7; - editmode = useeditmode; - } - - - tty_setlinemode(uselinemode); - - linemode = uselinemode; - - if (!linemode) - send_will(TELOPT_ECHO, 1); - } - break; - - case LM_MODE: - { - register int ack, changed; - - /* - * Client has sent along a mode mask. If it agrees with - * what we are currently doing, ignore it; if not, it could - * be viewed as a request to change. Note that the server - * will change to the modes in an ack if it is different from - * what we currently have, but we will not ack the ack. - */ - useeditmode &= MODE_MASK; - ack = (useeditmode & MODE_ACK); - useeditmode &= ~MODE_ACK; - - if (changed = (useeditmode ^ editmode)) { - /* - * This check is for a timing problem. If the - * state of the tty has changed (due to the user - * application) we need to process that info - * before we write in the state contained in the - * ack!!! This gets out the new MODE request, - * and when the ack to that command comes back - * we'll set it and be in the right mode. - */ - if (ack) - localstat(); - if (changed & MODE_EDIT) - tty_setedit(useeditmode & MODE_EDIT); - - if (changed & MODE_TRAPSIG) - tty_setsig(useeditmode & MODE_TRAPSIG); - - if (changed & MODE_SOFT_TAB) - tty_setsofttab(useeditmode & MODE_SOFT_TAB); - - if (changed & MODE_LIT_ECHO) - tty_setlitecho(useeditmode & MODE_LIT_ECHO); - - set_termbuf(); - - if (!ack) { - (void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, - SB, TELOPT_LINEMODE, LM_MODE, - useeditmode|MODE_ACK, - IAC, SE); - nfrontp += 7; - } - - editmode = useeditmode; - } - - break; - - } /* end of case LM_MODE */ -#endif /* LINEMODE */ - - case TELOPT_NAWS: -#ifdef TIOCSWINSZ - { - struct winsize ws; - - def_col = parm1; - def_row = parm2; -#ifdef LINEMODE - /* - * Defer changing window size until after terminal is - * initialized. - */ - if (terminit() == 0) - return; -#endif /* LINEMODE */ - - /* - * Change window size as requested by client. - */ - - ws.ws_col = parm1; - ws.ws_row = parm2; - (void) ioctl(pty, TIOCSWINSZ, (char *)&ws); - } -#endif /* TIOCSWINSZ */ - - break; - - case TELOPT_TSPEED: - { - def_tspeed = parm1; - def_rspeed = parm2; -#ifdef LINEMODE - /* - * Defer changing the terminal speed. - */ - if (terminit() == 0) - return; -#endif /* LINEMODE */ - /* - * Change terminal speed as requested by client. - * We set the receive speed first, so that if we can't - * store seperate receive and transmit speeds, the transmit - * speed will take precedence. - */ - tty_rspeed(parm2); - tty_tspeed(parm1); - set_termbuf(); - - break; - - } /* end of case TELOPT_TSPEED */ - - default: - /* What? */ - break; - } /* end of switch */ - -#if defined(CRAY2) && defined(UNICOS5) - /* - * Just in case of the likely event that we changed the pty state. - */ - rcv_ioctl(); -#endif /* defined(CRAY2) && defined(UNICOS5) */ - - netflush(); - -} /* end of clientstat */ - -#if defined(CRAY2) && defined(UNICOS5) - void -termstat() -{ - needtermstat = 1; -} - - void -_termstat() -{ - needtermstat = 0; - init_termbuf(); - localstat(); - rcv_ioctl(); -} -#endif /* defined(CRAY2) && defined(UNICOS5) */ - -#ifdef LINEMODE -/* - * defer_terminit - * - * Some things should not be done until after the login process has started - * and all the pty modes are set to what they are supposed to be. This - * function is called when the pty state has been processed for the first time. - * It calls other functions that do things that were deferred in each module. - */ - void -defer_terminit() -{ - - /* - * local stuff that got deferred. - */ - if (def_tspeed != -1) { - clientstat(TELOPT_TSPEED, def_tspeed, def_rspeed); - def_tspeed = def_rspeed = 0; - } - -#ifdef TIOCSWINSZ - if (def_col || def_row) { - struct winsize ws; - - memset((char *)&ws, 0, sizeof(ws)); - ws.ws_col = def_col; - ws.ws_row = def_row; - (void) ioctl(pty, TIOCSWINSZ, (char *)&ws); - } -#endif - - /* - * The only other module that currently defers anything. - */ - deferslc(); - -} /* end of defer_terminit */ - -/* - * terminit - * - * Returns true if the pty state has been processed yet. - */ - int -terminit() -{ - return(_terminit); - -} /* end of terminit */ -#endif /* LINEMODE */ diff --git a/secure/libexec/telnetd/utility.c b/secure/libexec/telnetd/utility.c deleted file mode 100644 index daf0849694160..0000000000000 --- a/secure/libexec/telnetd/utility.c +++ /dev/null @@ -1,1203 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#ifdef __FreeBSD__ -#include -#endif -#define PRINTOPTIONS -#include "telnetd.h" - -/* - * utility functions performing io related tasks - */ - -/* - * ttloop - * - * A small subroutine to flush the network output buffer, get some data - * from the network, and pass it through the telnet state machine. We - * also flush the pty input buffer (by dropping its data) if it becomes - * too full. - */ - - void -ttloop() -{ - void netflush(); - - DIAG(TD_REPORT, {sprintf(nfrontp, "td: ttloop\r\n"); - nfrontp += strlen(nfrontp);}); - if (nfrontp-nbackp) { - netflush(); - } - ncc = read(net, netibuf, sizeof netibuf); - if (ncc < 0) { - syslog(LOG_INFO, "ttloop: read: %m\n"); - exit(1); - } else if (ncc == 0) { - syslog(LOG_INFO, "ttloop: peer died: %m\n"); - exit(1); - } - DIAG(TD_REPORT, {sprintf(nfrontp, "td: ttloop read %d chars\r\n", ncc); - nfrontp += strlen(nfrontp);}); - netip = netibuf; - telrcv(); /* state machine */ - if (ncc > 0) { - pfrontp = pbackp = ptyobuf; - telrcv(); - } -} /* end of ttloop */ - -/* - * Check a descriptor to see if out of band data exists on it. - */ - int -stilloob(s) - int s; /* socket number */ -{ - static struct timeval timeout = { 0 }; - fd_set excepts; - int value; - - do { - FD_ZERO(&excepts); - FD_SET(s, &excepts); - memset((char *)&timeout, 0, sizeof timeout); - value = select(s+1, (fd_set *)0, (fd_set *)0, &excepts, &timeout); - } while ((value == -1) && (errno == EINTR)); - - if (value < 0) { - fatalperror(pty, "select"); - } - if (FD_ISSET(s, &excepts)) { - return 1; - } else { - return 0; - } -} - - void -ptyflush() -{ - int n; - - if ((n = pfrontp - pbackp) > 0) { - DIAG((TD_REPORT | TD_PTYDATA), - { sprintf(nfrontp, "td: ptyflush %d chars\r\n", n); - nfrontp += strlen(nfrontp); }); - DIAG(TD_PTYDATA, printdata("pd", pbackp, n)); - n = write(pty, pbackp, n); - } - if (n < 0) { - if (errno == EWOULDBLOCK || errno == EINTR) - return; - cleanup(0); - } - pbackp += n; - if (pbackp == pfrontp) - pbackp = pfrontp = ptyobuf; -} - -/* - * nextitem() - * - * Return the address of the next "item" in the TELNET data - * stream. This will be the address of the next character if - * the current address is a user data character, or it will - * be the address of the character following the TELNET command - * if the current address is a TELNET IAC ("I Am a Command") - * character. - */ - char * -nextitem(current) - char *current; -{ - if ((*current&0xff) != IAC) { - return current+1; - } - switch (*(current+1)&0xff) { - case DO: - case DONT: - case WILL: - case WONT: - return current+3; - case SB: /* loop forever looking for the SE */ - { - register char *look = current+2; - - for (;;) { - if ((*look++&0xff) == IAC) { - if ((*look++&0xff) == SE) { - return look; - } - } - } - } - default: - return current+2; - } -} /* end of nextitem */ - - -/* - * netclear() - * - * We are about to do a TELNET SYNCH operation. Clear - * the path to the network. - * - * Things are a bit tricky since we may have sent the first - * byte or so of a previous TELNET command into the network. - * So, we have to scan the network buffer from the beginning - * until we are up to where we want to be. - * - * A side effect of what we do, just to keep things - * simple, is to clear the urgent data pointer. The principal - * caller should be setting the urgent data pointer AFTER calling - * us in any case. - */ - void -netclear() -{ - register char *thisitem, *next; - char *good; -#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \ - ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL)) - -#ifdef ENCRYPTION - thisitem = nclearto > netobuf ? nclearto : netobuf; -#else /* ENCRYPTION */ - thisitem = netobuf; -#endif /* ENCRYPTION */ - - while ((next = nextitem(thisitem)) <= nbackp) { - thisitem = next; - } - - /* Now, thisitem is first before/at boundary. */ - -#ifdef ENCRYPTION - good = nclearto > netobuf ? nclearto : netobuf; -#else /* ENCRYPTION */ - good = netobuf; /* where the good bytes go */ -#endif /* ENCRYPTION */ - - while (nfrontp > thisitem) { - if (wewant(thisitem)) { - int length; - - next = thisitem; - do { - next = nextitem(next); - } while (wewant(next) && (nfrontp > next)); - length = next-thisitem; - memmove(good, thisitem, length); - good += length; - thisitem = next; - } else { - thisitem = nextitem(thisitem); - } - } - - nbackp = netobuf; - nfrontp = good; /* next byte to be sent */ - neturg = 0; -} /* end of netclear */ - -/* - * netflush - * Send as much data as possible to the network, - * handling requests for urgent data. - */ - void -netflush() -{ - int n; - extern int not42; - - if ((n = nfrontp - nbackp) > 0) { - DIAG(TD_REPORT, - { sprintf(nfrontp, "td: netflush %d chars\r\n", n); - n += strlen(nfrontp); /* get count first */ - nfrontp += strlen(nfrontp); /* then move pointer */ - }); -#ifdef ENCRYPTION - if (encrypt_output) { - char *s = nclearto ? nclearto : nbackp; - if (nfrontp - s > 0) { - (*encrypt_output)((unsigned char *)s, nfrontp-s); - nclearto = nfrontp; - } - } -#endif /* ENCRYPTION */ - /* - * if no urgent data, or if the other side appears to be an - * old 4.2 client (and thus unable to survive TCP urgent data), - * write the entire buffer in non-OOB mode. - */ - if ((neturg == 0) || (not42 == 0)) { - n = write(net, nbackp, n); /* normal write */ - } else { - n = neturg - nbackp; - /* - * In 4.2 (and 4.3) systems, there is some question about - * what byte in a sendOOB operation is the "OOB" data. - * To make ourselves compatible, we only send ONE byte - * out of band, the one WE THINK should be OOB (though - * we really have more the TCP philosophy of urgent data - * rather than the Unix philosophy of OOB data). - */ - if (n > 1) { - n = send(net, nbackp, n-1, 0); /* send URGENT all by itself */ - } else { - n = send(net, nbackp, n, MSG_OOB); /* URGENT data */ - } - } - } - if (n < 0) { - if (errno == EWOULDBLOCK || errno == EINTR) - return; - cleanup(0); - } - nbackp += n; -#ifdef ENCRYPTION - if (nbackp > nclearto) - nclearto = 0; -#endif /* ENCRYPTION */ - if (nbackp >= neturg) { - neturg = 0; - } - if (nbackp == nfrontp) { - nbackp = nfrontp = netobuf; -#ifdef ENCRYPTION - nclearto = 0; -#endif /* ENCRYPTION */ - } - return; -} /* end of netflush */ - - -/* - * writenet - * - * Just a handy little function to write a bit of raw data to the net. - * It will force a transmit of the buffer if necessary - * - * arguments - * ptr - A pointer to a character string to write - * len - How many bytes to write - */ - void -writenet(ptr, len) - register unsigned char *ptr; - register int len; -{ - /* flush buffer if no room for new data) */ - if ((&netobuf[BUFSIZ] - nfrontp) < len) { - /* if this fails, don't worry, buffer is a little big */ - netflush(); - } - - memmove(nfrontp, ptr, len); - nfrontp += len; - -} /* end of writenet */ - - -/* - * miscellaneous functions doing a variety of little jobs follow ... - */ - - - void -fatal(f, msg) - int f; - char *msg; -{ - char buf[BUFSIZ]; - - (void) sprintf(buf, "telnetd: %s.\r\n", msg); -#ifdef ENCRYPTION - if (encrypt_output) { - /* - * Better turn off encryption first.... - * Hope it flushes... - */ - encrypt_send_end(); - netflush(); - } -#endif /* ENCRYPTION */ - (void) write(f, buf, (int)strlen(buf)); - sleep(1); /*XXX*/ - exit(1); -} - - void -fatalperror(f, msg) - int f; - char *msg; -{ - char buf[BUFSIZ], *strerror(); - - (void) sprintf(buf, "%s: %s", msg, strerror(errno)); - fatal(f, buf); -} - -char editedhost[32]; - - void -edithost(pat, host) - register char *pat; - register char *host; -{ - register char *res = editedhost; - char *strncpy(); - - if (!pat) - pat = ""; - while (*pat) { - switch (*pat) { - - case '#': - if (*host) - host++; - break; - - case '@': - if (*host) - *res++ = *host++; - break; - - default: - *res++ = *pat; - break; - } - if (res == &editedhost[sizeof editedhost - 1]) { - *res = '\0'; - return; - } - pat++; - } - if (*host) - (void) strncpy(res, host, - sizeof editedhost - (res - editedhost) -1); - else - *res = '\0'; - editedhost[sizeof editedhost - 1] = '\0'; -} - -static char *putlocation; - - void -putstr(s) - register char *s; -{ - - while (*s) - putchr(*s++); -} - - void -putchr(cc) - int cc; -{ - *putlocation++ = cc; -} - -#ifdef __FreeBSD__ -static char fmtstr[] = { "%+" }; -#else -/* - * This is split on two lines so that SCCS will not see the M - * between two % signs and expand it... - */ -static char fmtstr[] = { "%l:%M\ -%P on %A, %d %B %Y" }; -#endif - - void -putf(cp, where) - register char *cp; - char *where; -{ - char *slash; - time_t t; - char db[100]; -#ifdef STREAMSPTY - extern char *strchr(); -#else - extern char *strrchr(); -#endif - - putlocation = where; - - while (*cp) { - if (*cp != '%') { - putchr(*cp++); - continue; - } - switch (*++cp) { - - case 't': -#ifdef STREAMSPTY - /* names are like /dev/pts/2 -- we want pts/2 */ - slash = strchr(line+1, '/'); -#else - slash = strrchr(line, '/'); -#endif - if (slash == (char *) 0) - putstr(line); - else - putstr(&slash[1]); - break; - - case 'h': - putstr(editedhost); - break; - - case 'd': -#ifdef __FreeBSD__ - setlocale(LC_TIME, ""); -#endif - (void)time(&t); - (void)strftime(db, sizeof(db), fmtstr, localtime(&t)); - putstr(db); - break; - - case '%': - putchr('%'); - break; - } - cp++; - } -} - -#ifdef DIAGNOSTICS -/* - * Print telnet options and commands in plain text, if possible. - */ - void -printoption(fmt, option) - register char *fmt; - register int option; -{ - if (TELOPT_OK(option)) - sprintf(nfrontp, "%s %s\r\n", fmt, TELOPT(option)); - else if (TELCMD_OK(option)) - sprintf(nfrontp, "%s %s\r\n", fmt, TELCMD(option)); - else - sprintf(nfrontp, "%s %d\r\n", fmt, option); - nfrontp += strlen(nfrontp); - return; -} - - void -printsub(direction, pointer, length) - char direction; /* '<' or '>' */ - unsigned char *pointer; /* where suboption data sits */ - int length; /* length of suboption data */ -{ - register int i; - char buf[512]; - - if (!(diagnostic & TD_OPTIONS)) - return; - - if (direction) { - sprintf(nfrontp, "td: %s suboption ", - direction == '<' ? "recv" : "send"); - nfrontp += strlen(nfrontp); - if (length >= 3) { - register int j; - - i = pointer[length-2]; - j = pointer[length-1]; - - if (i != IAC || j != SE) { - sprintf(nfrontp, "(terminated by "); - nfrontp += strlen(nfrontp); - if (TELOPT_OK(i)) - sprintf(nfrontp, "%s ", TELOPT(i)); - else if (TELCMD_OK(i)) - sprintf(nfrontp, "%s ", TELCMD(i)); - else - sprintf(nfrontp, "%d ", i); - nfrontp += strlen(nfrontp); - if (TELOPT_OK(j)) - sprintf(nfrontp, "%s", TELOPT(j)); - else if (TELCMD_OK(j)) - sprintf(nfrontp, "%s", TELCMD(j)); - else - sprintf(nfrontp, "%d", j); - nfrontp += strlen(nfrontp); - sprintf(nfrontp, ", not IAC SE!) "); - nfrontp += strlen(nfrontp); - } - } - length -= 2; - } - if (length < 1) { - sprintf(nfrontp, "(Empty suboption??\?)"); - nfrontp += strlen(nfrontp); - return; - } - switch (pointer[0]) { - case TELOPT_TTYPE: - sprintf(nfrontp, "TERMINAL-TYPE "); - nfrontp += strlen(nfrontp); - switch (pointer[1]) { - case TELQUAL_IS: - sprintf(nfrontp, "IS \"%.*s\"", length-2, (char *)pointer+2); - break; - case TELQUAL_SEND: - sprintf(nfrontp, "SEND"); - break; - default: - sprintf(nfrontp, - "- unknown qualifier %d (0x%x).", - pointer[1], pointer[1]); - } - nfrontp += strlen(nfrontp); - break; - case TELOPT_TSPEED: - sprintf(nfrontp, "TERMINAL-SPEED"); - nfrontp += strlen(nfrontp); - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[1]) { - case TELQUAL_IS: - sprintf(nfrontp, " IS %.*s", length-2, (char *)pointer+2); - nfrontp += strlen(nfrontp); - break; - default: - if (pointer[1] == 1) - sprintf(nfrontp, " SEND"); - else - sprintf(nfrontp, " %d (unknown)", pointer[1]); - nfrontp += strlen(nfrontp); - for (i = 2; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - } - break; - - case TELOPT_LFLOW: - sprintf(nfrontp, "TOGGLE-FLOW-CONTROL"); - nfrontp += strlen(nfrontp); - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[1]) { - case LFLOW_OFF: - sprintf(nfrontp, " OFF"); break; - case LFLOW_ON: - sprintf(nfrontp, " ON"); break; - case LFLOW_RESTART_ANY: - sprintf(nfrontp, " RESTART-ANY"); break; - case LFLOW_RESTART_XON: - sprintf(nfrontp, " RESTART-XON"); break; - default: - sprintf(nfrontp, " %d (unknown)", pointer[1]); - } - nfrontp += strlen(nfrontp); - for (i = 2; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - - case TELOPT_NAWS: - sprintf(nfrontp, "NAWS"); - nfrontp += strlen(nfrontp); - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - if (length == 2) { - sprintf(nfrontp, " ?%d?", pointer[1]); - nfrontp += strlen(nfrontp); - break; - } - sprintf(nfrontp, " %d %d (%d)", - pointer[1], pointer[2], - (int)((((unsigned int)pointer[1])<<8)|((unsigned int)pointer[2]))); - nfrontp += strlen(nfrontp); - if (length == 4) { - sprintf(nfrontp, " ?%d?", pointer[3]); - nfrontp += strlen(nfrontp); - break; - } - sprintf(nfrontp, " %d %d (%d)", - pointer[3], pointer[4], - (int)((((unsigned int)pointer[3])<<8)|((unsigned int)pointer[4]))); - nfrontp += strlen(nfrontp); - for (i = 5; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - - case TELOPT_LINEMODE: - sprintf(nfrontp, "LINEMODE "); - nfrontp += strlen(nfrontp); - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[1]) { - case WILL: - sprintf(nfrontp, "WILL "); - goto common; - case WONT: - sprintf(nfrontp, "WONT "); - goto common; - case DO: - sprintf(nfrontp, "DO "); - goto common; - case DONT: - sprintf(nfrontp, "DONT "); - common: - nfrontp += strlen(nfrontp); - if (length < 3) { - sprintf(nfrontp, "(no option??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[2]) { - case LM_FORWARDMASK: - sprintf(nfrontp, "Forward Mask"); - nfrontp += strlen(nfrontp); - for (i = 3; i < length; i++) { - sprintf(nfrontp, " %x", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - default: - sprintf(nfrontp, "%d (unknown)", pointer[2]); - nfrontp += strlen(nfrontp); - for (i = 3; i < length; i++) { - sprintf(nfrontp, " %d", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - } - break; - - case LM_SLC: - sprintf(nfrontp, "SLC"); - nfrontp += strlen(nfrontp); - for (i = 2; i < length - 2; i += 3) { - if (SLC_NAME_OK(pointer[i+SLC_FUNC])) - sprintf(nfrontp, " %s", SLC_NAME(pointer[i+SLC_FUNC])); - else - sprintf(nfrontp, " %d", pointer[i+SLC_FUNC]); - nfrontp += strlen(nfrontp); - switch (pointer[i+SLC_FLAGS]&SLC_LEVELBITS) { - case SLC_NOSUPPORT: - sprintf(nfrontp, " NOSUPPORT"); break; - case SLC_CANTCHANGE: - sprintf(nfrontp, " CANTCHANGE"); break; - case SLC_VARIABLE: - sprintf(nfrontp, " VARIABLE"); break; - case SLC_DEFAULT: - sprintf(nfrontp, " DEFAULT"); break; - } - nfrontp += strlen(nfrontp); - sprintf(nfrontp, "%s%s%s", - pointer[i+SLC_FLAGS]&SLC_ACK ? "|ACK" : "", - pointer[i+SLC_FLAGS]&SLC_FLUSHIN ? "|FLUSHIN" : "", - pointer[i+SLC_FLAGS]&SLC_FLUSHOUT ? "|FLUSHOUT" : ""); - nfrontp += strlen(nfrontp); - if (pointer[i+SLC_FLAGS]& ~(SLC_ACK|SLC_FLUSHIN| - SLC_FLUSHOUT| SLC_LEVELBITS)) { - sprintf(nfrontp, "(0x%x)", pointer[i+SLC_FLAGS]); - nfrontp += strlen(nfrontp); - } - sprintf(nfrontp, " %d;", pointer[i+SLC_VALUE]); - nfrontp += strlen(nfrontp); - if ((pointer[i+SLC_VALUE] == IAC) && - (pointer[i+SLC_VALUE+1] == IAC)) - i++; - } - for (; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - - case LM_MODE: - sprintf(nfrontp, "MODE "); - nfrontp += strlen(nfrontp); - if (length < 3) { - sprintf(nfrontp, "(no mode??\?)"); - nfrontp += strlen(nfrontp); - break; - } - { - char tbuf[32]; - sprintf(tbuf, "%s%s%s%s%s", - pointer[2]&MODE_EDIT ? "|EDIT" : "", - pointer[2]&MODE_TRAPSIG ? "|TRAPSIG" : "", - pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "", - pointer[2]&MODE_LIT_ECHO ? "|LIT_ECHO" : "", - pointer[2]&MODE_ACK ? "|ACK" : ""); - sprintf(nfrontp, "%s", tbuf[1] ? &tbuf[1] : "0"); - nfrontp += strlen(nfrontp); - } - if (pointer[2]&~(MODE_EDIT|MODE_TRAPSIG|MODE_ACK)) { - sprintf(nfrontp, " (0x%x)", pointer[2]); - nfrontp += strlen(nfrontp); - } - for (i = 3; i < length; i++) { - sprintf(nfrontp, " ?0x%x?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - default: - sprintf(nfrontp, "%d (unknown)", pointer[1]); - nfrontp += strlen(nfrontp); - for (i = 2; i < length; i++) { - sprintf(nfrontp, " %d", pointer[i]); - nfrontp += strlen(nfrontp); - } - } - break; - - case TELOPT_STATUS: { - register char *cp; - register int j, k; - - sprintf(nfrontp, "STATUS"); - nfrontp += strlen(nfrontp); - - switch (pointer[1]) { - default: - if (pointer[1] == TELQUAL_SEND) - sprintf(nfrontp, " SEND"); - else - sprintf(nfrontp, " %d (unknown)", pointer[1]); - nfrontp += strlen(nfrontp); - for (i = 2; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - case TELQUAL_IS: - sprintf(nfrontp, " IS\r\n"); - nfrontp += strlen(nfrontp); - - for (i = 2; i < length; i++) { - switch(pointer[i]) { - case DO: cp = "DO"; goto common2; - case DONT: cp = "DONT"; goto common2; - case WILL: cp = "WILL"; goto common2; - case WONT: cp = "WONT"; goto common2; - common2: - i++; - if (TELOPT_OK(pointer[i])) - sprintf(nfrontp, " %s %s", cp, TELOPT(pointer[i])); - else - sprintf(nfrontp, " %s %d", cp, pointer[i]); - nfrontp += strlen(nfrontp); - - sprintf(nfrontp, "\r\n"); - nfrontp += strlen(nfrontp); - break; - - case SB: - sprintf(nfrontp, " SB "); - nfrontp += strlen(nfrontp); - i++; - j = k = i; - while (j < length) { - if (pointer[j] == SE) { - if (j+1 == length) - break; - if (pointer[j+1] == SE) - j++; - else - break; - } - pointer[k++] = pointer[j++]; - } - printsub(0, &pointer[i], k - i); - if (i < length) { - sprintf(nfrontp, " SE"); - nfrontp += strlen(nfrontp); - i = j; - } else - i = j - 1; - - sprintf(nfrontp, "\r\n"); - nfrontp += strlen(nfrontp); - - break; - - default: - sprintf(nfrontp, " %d", pointer[i]); - nfrontp += strlen(nfrontp); - break; - } - } - break; - } - break; - } - - case TELOPT_XDISPLOC: - sprintf(nfrontp, "X-DISPLAY-LOCATION "); - nfrontp += strlen(nfrontp); - switch (pointer[1]) { - case TELQUAL_IS: - sprintf(nfrontp, "IS \"%.*s\"", length-2, (char *)pointer+2); - break; - case TELQUAL_SEND: - sprintf(nfrontp, "SEND"); - break; - default: - sprintf(nfrontp, "- unknown qualifier %d (0x%x).", - pointer[1], pointer[1]); - } - nfrontp += strlen(nfrontp); - break; - - case TELOPT_NEW_ENVIRON: - sprintf(nfrontp, "NEW-ENVIRON "); - goto env_common1; - case TELOPT_OLD_ENVIRON: - sprintf(nfrontp, "OLD-ENVIRON"); - env_common1: - nfrontp += strlen(nfrontp); - switch (pointer[1]) { - case TELQUAL_IS: - sprintf(nfrontp, "IS "); - goto env_common; - case TELQUAL_SEND: - sprintf(nfrontp, "SEND "); - goto env_common; - case TELQUAL_INFO: - sprintf(nfrontp, "INFO "); - env_common: - nfrontp += strlen(nfrontp); - { - register int noquote = 2; - for (i = 2; i < length; i++ ) { - switch (pointer[i]) { - case NEW_ENV_VAR: - sprintf(nfrontp, "\" VAR " + noquote); - nfrontp += strlen(nfrontp); - noquote = 2; - break; - - case NEW_ENV_VALUE: - sprintf(nfrontp, "\" VALUE " + noquote); - nfrontp += strlen(nfrontp); - noquote = 2; - break; - - case ENV_ESC: - sprintf(nfrontp, "\" ESC " + noquote); - nfrontp += strlen(nfrontp); - noquote = 2; - break; - - case ENV_USERVAR: - sprintf(nfrontp, "\" USERVAR " + noquote); - nfrontp += strlen(nfrontp); - noquote = 2; - break; - - default: - def_case: - if (isprint(pointer[i]) && pointer[i] != '"') { - if (noquote) { - *nfrontp++ = '"'; - noquote = 0; - } - *nfrontp++ = pointer[i]; - } else { - sprintf(nfrontp, "\" %03o " + noquote, - pointer[i]); - nfrontp += strlen(nfrontp); - noquote = 2; - } - break; - } - } - if (!noquote) - *nfrontp++ = '"'; - break; - } - } - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - sprintf(nfrontp, "AUTHENTICATION"); - nfrontp += strlen(nfrontp); - - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[1]) { - case TELQUAL_REPLY: - case TELQUAL_IS: - sprintf(nfrontp, " %s ", (pointer[1] == TELQUAL_IS) ? - "IS" : "REPLY"); - nfrontp += strlen(nfrontp); - if (AUTHTYPE_NAME_OK(pointer[2])) - sprintf(nfrontp, "%s ", AUTHTYPE_NAME(pointer[2])); - else - sprintf(nfrontp, "%d ", pointer[2]); - nfrontp += strlen(nfrontp); - if (length < 3) { - sprintf(nfrontp, "(partial suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - sprintf(nfrontp, "%s|%s", - ((pointer[3] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ? - "CLIENT" : "SERVER", - ((pointer[3] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ? - "MUTUAL" : "ONE-WAY"); - nfrontp += strlen(nfrontp); - - auth_printsub(&pointer[1], length - 1, buf, sizeof(buf)); - sprintf(nfrontp, "%s", buf); - nfrontp += strlen(nfrontp); - break; - - case TELQUAL_SEND: - i = 2; - sprintf(nfrontp, " SEND "); - nfrontp += strlen(nfrontp); - while (i < length) { - if (AUTHTYPE_NAME_OK(pointer[i])) - sprintf(nfrontp, "%s ", AUTHTYPE_NAME(pointer[i])); - else - sprintf(nfrontp, "%d ", pointer[i]); - nfrontp += strlen(nfrontp); - if (++i >= length) { - sprintf(nfrontp, "(partial suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - sprintf(nfrontp, "%s|%s ", - ((pointer[i] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ? - "CLIENT" : "SERVER", - ((pointer[i] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ? - "MUTUAL" : "ONE-WAY"); - nfrontp += strlen(nfrontp); - ++i; - } - break; - - case TELQUAL_NAME: - i = 2; - sprintf(nfrontp, " NAME \""); - nfrontp += strlen(nfrontp); - while (i < length) - *nfrontp += pointer[i++]; - *nfrontp += '"'; - break; - - default: - for (i = 2; i < length; i++) { - sprintf(nfrontp, " ?%d?", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - } - break; -#endif - -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - sprintf(nfrontp, "ENCRYPT"); - nfrontp += strlen(nfrontp); - if (length < 2) { - sprintf(nfrontp, " (empty suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - switch (pointer[1]) { - case ENCRYPT_START: - sprintf(nfrontp, " START"); - nfrontp += strlen(nfrontp); - break; - - case ENCRYPT_END: - sprintf(nfrontp, " END"); - nfrontp += strlen(nfrontp); - break; - - case ENCRYPT_REQSTART: - sprintf(nfrontp, " REQUEST-START"); - nfrontp += strlen(nfrontp); - break; - - case ENCRYPT_REQEND: - sprintf(nfrontp, " REQUEST-END"); - nfrontp += strlen(nfrontp); - break; - - case ENCRYPT_IS: - case ENCRYPT_REPLY: - sprintf(nfrontp, " %s ", (pointer[1] == ENCRYPT_IS) ? - "IS" : "REPLY"); - nfrontp += strlen(nfrontp); - if (length < 3) { - sprintf(nfrontp, " (partial suboption??\?)"); - nfrontp += strlen(nfrontp); - break; - } - if (ENCTYPE_NAME_OK(pointer[2])) - sprintf(nfrontp, "%s ", ENCTYPE_NAME(pointer[2])); - else - sprintf(nfrontp, " %d (unknown)", pointer[2]); - nfrontp += strlen(nfrontp); - - encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf)); - sprintf(nfrontp, "%s", buf); - nfrontp += strlen(nfrontp); - break; - - case ENCRYPT_SUPPORT: - i = 2; - sprintf(nfrontp, " SUPPORT "); - nfrontp += strlen(nfrontp); - while (i < length) { - if (ENCTYPE_NAME_OK(pointer[i])) - sprintf(nfrontp, "%s ", ENCTYPE_NAME(pointer[i])); - else - sprintf(nfrontp, "%d ", pointer[i]); - nfrontp += strlen(nfrontp); - i++; - } - break; - - case ENCRYPT_ENC_KEYID: - sprintf(nfrontp, " ENC_KEYID", pointer[1]); - nfrontp += strlen(nfrontp); - goto encommon; - - case ENCRYPT_DEC_KEYID: - sprintf(nfrontp, " DEC_KEYID", pointer[1]); - nfrontp += strlen(nfrontp); - goto encommon; - - default: - sprintf(nfrontp, " %d (unknown)", pointer[1]); - nfrontp += strlen(nfrontp); - encommon: - for (i = 2; i < length; i++) { - sprintf(nfrontp, " %d", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - } - break; -#endif /* ENCRYPTION */ - - default: - if (TELOPT_OK(pointer[0])) - sprintf(nfrontp, "%s (unknown)", TELOPT(pointer[0])); - else - sprintf(nfrontp, "%d (unknown)", pointer[i]); - nfrontp += strlen(nfrontp); - for (i = 1; i < length; i++) { - sprintf(nfrontp, " %d", pointer[i]); - nfrontp += strlen(nfrontp); - } - break; - } - sprintf(nfrontp, "\r\n"); - nfrontp += strlen(nfrontp); -} - -/* - * Dump a data buffer in hex and ascii to the output data stream. - */ - void -printdata(tag, ptr, cnt) - register char *tag; - register char *ptr; - register int cnt; -{ - register int i; - char xbuf[30]; - - while (cnt) { - /* flush net output buffer if no room for new data) */ - if ((&netobuf[BUFSIZ] - nfrontp) < 80) { - netflush(); - } - - /* add a line of output */ - sprintf(nfrontp, "%s: ", tag); - nfrontp += strlen(nfrontp); - for (i = 0; i < 20 && cnt; i++) { - sprintf(nfrontp, "%02x", *ptr); - nfrontp += strlen(nfrontp); - if (isprint(*ptr)) { - xbuf[i] = *ptr; - } else { - xbuf[i] = '.'; - } - if (i % 2) { - *nfrontp = ' '; - nfrontp++; - } - cnt--; - ptr++; - } - xbuf[i] = '\0'; - sprintf(nfrontp, " %s\r\n", xbuf ); - nfrontp += strlen(nfrontp); - } -} -#endif /* DIAGNOSTICS */ diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile deleted file mode 100644 index 94e0a3d8a7a8b..0000000000000 --- a/secure/usr.bin/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $Id$ - -SUBDIR= bdes - -.include - diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc deleted file mode 100644 index e09ccebf3f5db..0000000000000 --- a/secure/usr.bin/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -# $Id: Makefile.inc,v 1.1 1994/09/07 07:16:50 pst Exp $ - -BINDIR= /usr/bin -.include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile deleted file mode 100644 index 0878ccc72b3aa..0000000000000 --- a/secure/usr.bin/bdes/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id$ - -PROG= bdes -SRCS= bdes.c - -.if exists(${.CURDIR}/../../lib/libcipher/obj) -LDFLAGS+= -L${.CURDIR}/../../lib/libcipher/obj -.else -LDFLAGS+= -L${.CURDIR}/../../lib/libcipher -.endif - -LDADD+= -lcipher -DPADD+= libcipher.a - -.include diff --git a/secure/usr.bin/bdes/bdes.1 b/secure/usr.bin/bdes/bdes.1 deleted file mode 100644 index 48179fda7624e..0000000000000 --- a/secure/usr.bin/bdes/bdes.1 +++ /dev/null @@ -1,304 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Matt Bishop of Dartmouth College. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)bdes.1 8.1 (Berkeley) 6/29/93 -.\" -.TH BDES 1 "June 29, 1993" -.UC 6 -.SH NAME -bdes \- encrypt/decrypt using the Data Encryption Standard -.SH SYNOPSIS -.nf -.ft B -bdes [ \-abdp ] [ \-F N ] [ \-f N ] [ \-k key ] -.ti +5 -[ \-m N ] [ \-o N ] [ \-v vector ] -.ft R -.fi -.SH DESCRIPTION -.I Bdes -implements all DES modes of operation described in FIPS PUB 81, -including alternative cipher feedback mode and both authentication -modes. -.I Bdes -reads from the standard input and writes to the standard output. -By default, the input is encrypted using cipher block chaining mode. -Using the same key for encryption and decryption preserves plain text. -.PP -All modes but the electronic code book mode require an initialization -vector; if none is supplied, the zero vector is used. -If no -.I key -is specified on the command line, the user is prompted for one (see -.IR getpass (3) -for more details). -.PP -The options are as follows: -.TP -\-a -The key and initialization vector strings are to be taken as ASCII, -suppressing the special interpretation given to leading ``0X'', ``0x'', -``0B'', and ``0b'' characters. -This flag applies to -.I both -the key and initialization vector. -.TP -\-b -Use electronic code book mode. -.TP -\-d -Decrypt the input. -.TP -\-F -Use -.IR N -bit -alternative cipher feedback mode. -Currently -.I N -must be a multiple of 7 between 7 and 56 inclusive (this does not conform -to the alternative CFB mode specification). -.TP -\-f -Use -.IR N -bit -cipher feedback mode. -Currently -.I N -must be a multiple of 8 between 8 and 64 inclusive (this does not conform -to the standard CFB mode specification). -.TP -\-k -Use -.I key -as the cryptographic key. -.TP -\-m -Compute a message authentication code (MAC) of -.I N -bits on the input. -The value of -.I N -must be between 1 and 64 inclusive; if -.I N -is not a multiple of 8, enough 0 bits will be added to pad the MAC length -to the nearest multiple of 8. -Only the MAC is output. -MACs are only available in cipher block chaining mode or in cipher feedback -mode. -.TP -\-o -Use -.IR N -bit -output feedback mode. -Currently -.I N -must be a multiple of 8 between 8 and 64 inclusive (this does not conform -to the OFB mode specification). -.TP -\-p -Disable the resetting of the parity bit. -This flag forces the parity bit of the key to be used as typed, rather than -making each character be of odd parity. -It is used only if the key is given in ASCII. -.TP -\-v -Set the initialization vector to -.IR vector ; -the vector is interpreted in the same way as the key. -The vector is ignored in electronic codebook mode. -.PP -The key and initialization vector are taken as sequences of ASCII -characters which are then mapped into their bit representations. -If either begins with ``0X'' or ``0x'', -that one is taken as a sequence of hexadecimal digits indicating the -bit pattern; -if either begins with ``0B'' or ``0b'', -that one is taken as a sequence of binary digits indicating the bit pattern. -In either case, -only the leading 64 bits of the key or initialization vector -are used, -and if fewer than 64 bits are provided, enough 0 bits are appended -to pad the key to 64 bits. -.PP -According to the DES standard, the low-order bit of each character in the -key string is deleted. -Since most ASCII representations set the high-order bit to 0, simply -deleting the low-order bit effectively reduces the size of the key space -from 2\u\s-356\s0\d to 2\u\s-348\s0\d keys. -To prevent this, the high-order bit must be a function depending in part -upon the low-order bit; so, the high-order bit is set to whatever value -gives odd parity. -This preserves the key space size. -Note this resetting of the parity bit is -.I not -done if the key is given in binary or hex, and can be disabled for ASCII -keys as well. -.PP -The DES is considered a very strong cryptosystem, and other than table lookup -attacks, key search attacks, and Hellman's time-memory tradeoff (all of which -are very expensive and time-consuming), no cryptanalytic methods for breaking -the DES are known in the open literature. -No doubt the choice of keys and key security are the most vulnerable aspect -of -.IR bdes . -.SH IMPLEMENTATION NOTES -For implementors wishing to write software compatible with this program, -the following notes are provided. -This software is believed to be compatible with the implementation of the -data encryption standard distributed by Sun Microsystems, Inc. -.PP -In the ECB and CBC modes, plaintext is encrypted in units of 64 bits (8 bytes, -also called a block). -To ensure that the plaintext file is encrypted correctly, -.I bdes -will (internally) append from 1 to 8 bytes, the last byte containing an -integer stating how many bytes of that final block are from the plaintext -file, and encrypt the resulting block. -Hence, when decrypting, the last block may contain from 0 to 7 characters -present in the plaintext file, and the last byte tells how many. -Note that if during decryption the last byte of the file does not contain an -integer between 0 and 7, either the file has been corrupted or an incorrect -key has been given. -A similar mechanism is used for the OFB and CFB modes, except that those -simply require the length of the input to be a multiple of the mode size, -and the final byte contains an integer between 0 and one less than the number -of bytes being used as the mode. -(This was another reason that the mode size must be a multiple of 8 for those -modes.) -.PP -Unlike Sun's implementation, unused bytes of that last block are not filled -with random data, but instead contain what was in those byte positions in -the preceding block. -This is quicker and more portable, and does not weaken the encryption -significantly. -.PP -If the key is entered in ASCII, the parity bits of the key characters are set -so that each key character is of odd parity. -Unlike Sun's implementation, it is possible to enter binary or hexadecimal -keys on the command line, and if this is done, the parity bits are -.I not -reset. -This allows testing using arbitrary bit patterns as keys. -.PP -The Sun implementation always uses an initialization vector of 0 -(that is, all zeroes). -By default, -.I bdes -does too, but this may be changed from the command line. -.SH SEE ALSO -crypt(3), getpass(3) -.sp -.IR "Data Encryption Standard" , -Federal Information Processing Standard #46, -National Bureau of Standards, -U.S. Department of Commerce, -Washington DC -(Jan. 1977) -.sp -.IR "DES Modes of Operation" , -Federal Information Processing Standard #81, -National Bureau of Standards, -U.S. Department of Commerce -Washington DC -(Dec. 1980) -.sp -Dorothy Denning, -.IR "Cryptography and Data Security" , -Addison-Wesley Publishing Co., -Reading, MA -\(co1982. -.sp -Matt Bishop, -.IR "Implementation Notes on bdes(1)" , -Technical Report PCS-TR-91-158, -Department of Mathematics and Computer Science, -Dartmouth College, -Hanover, NH 03755 -(Apr. 1991). -.SH DISCLAIMER -.nf -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. -.fi -.SH BUGS -There is a controversy raging over whether the DES will still be secure -in a few years. -The advent of special-purpose hardware could reduce the cost of any of the -methods of attack named above so that they are no longer computationally -infeasible. -.PP -As the key or key schedule is stored in memory, the encryption can be -compromised if memory is readable. -Additionally, programs which display programs' arguments may compromise the -key and initialization vector, if they are specified on the command line. -To avoid this -.I bdes -overwrites its arguments, however, the obvious race cannot currently be -avoided. -.PP -Certain specific keys should be avoided because they introduce potential -weaknesses; these keys, called the -.I weak -and -.I semiweak -keys, are (in hex notation, where p is either 0 or 1, and P is either -e or f): -.sp -.nf -.in +10n -.ta \w'0x0p0p0p0p0p0p0p0p\0\0\0'u+5n -0x0p0p0p0p0p0p0p0p 0x0p1P0p1P0p0P0p0P -0x0pep0pep0pfp0pfp 0x0pfP0pfP0pfP0pfP -0x1P0p1P0p0P0p0P0p 0x1P1P1P1P0P0P0P0P -0x1Pep1Pep0Pfp0Pfp 0x1PfP1PfP0PfP0PfP -0xep0pep0pfp0pfp0p 0xep1Pep1pfp0Pfp0P -0xepepepepepepepep 0xepfPepfPfpfPfpfP -0xfP0pfP0pfP0pfP0p 0xfP1PfP1PfP0PfP0P -0xfPepfPepfPepfPep 0xfPfPfPfPfPfPfPfP -.fi -.in -10n -.sp -This is inherent in the DES algorithm (see Moore and Simmons, -\*(LqCycle structure of the DES with weak and semi-weak keys,\*(Rq -.I "Advances in Cryptology \- Crypto '86 Proceedings" , -Springer-Verlag New York, \(co1987, pp. 9-32.) diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c deleted file mode 100644 index 257d549689533..0000000000000 --- a/secure/usr.bin/bdes/bdes.c +++ /dev/null @@ -1,1046 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Matt Bishop of Dartmouth College. - * - * The United States Government has rights in this work pursuant - * to contract no. NAG 2-680 between the National Aeronautics and - * Space Administration and Dartmouth College. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - -/* - * BDES -- DES encryption package for Berkeley Software Distribution 4.4 - * options: - * -a key is in ASCII - * -b use ECB (electronic code book) mode - * -d invert (decrypt) input - * -f b use b-bit CFB (cipher feedback) mode - * -F b use b-bit CFB (cipher feedback) alternative mode - * -k key use key as the cryptographic key - * -m b generate a MAC of length b - * -o b use b-bit OFB (output feedback) mode - * -p don't reset the parity bit - * -v v use v as the initialization vector (ignored for ECB) - * note: the last character of the last block is the integer indicating - * how many characters of that block are to be output - * - * Author: Matt Bishop - * Department of Mathematics and Computer Science - * Dartmouth College - * Hanover, NH 03755 - * Email: Matt.Bishop@dartmouth.edu - * ...!decvax!dartvax!Matt.Bishop - * - * See Technical Report PCS-TR91-158, Department of Mathematics and Computer - * Science, Dartmouth College, for a detailed description of the implemen- - * tation and differences between it and Sun's. The DES is described in - * FIPS PUB 46, and the modes in FIPS PUB 81 (see either the manual page - * or the technical report for a complete reference). - */ - -#include -#include -#include -#include -#include -#include - -/* - * BSD and System V systems offer special library calls that do - * block moves and fills, so if possible we take advantage of them - */ -#define MEMCPY(dest,src,len) bcopy((src),(dest),(len)) -#define MEMZERO(dest,len) bzero((dest),(len)) - -/* Hide the calls to the primitive encryption routines. */ -#define FASTWAY -#ifdef FASTWAY -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - err("des_setkey", 0); -#define DES_XFORM(buf) \ - if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \ - err("des_cipher", 0); -#else -#define DES_KEY(buf) { \ - char bits1[64]; /* bits of key */ \ - expand(buf, bits1); \ - if (setkey(bits1)) \ - err("setkey", 0); \ - } -#define DES_XFORM(buf) { \ - char bits1[64]; /* bits of message */ \ - expand(buf, bits1); \ - if (encrypt(bits1, inverse)) \ - err("encrypt", 0); \ - compress(bits1, buf); \ - } -#endif - -/* - * this does an error-checking write - */ -#define READ(buf, n) fread(buf, sizeof(char), n, stdin) -#define WRITE(buf,n) \ - if (fwrite(buf, sizeof(char), n, stdout) != n) \ - err(bn, NULL); - -/* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* - * global variables and related macros - */ -#define KEY_DEFAULT 0 /* interpret radix of key from key */ -#define KEY_ASCII 1 /* key is in ASCII characters */ -int keybase = KEY_DEFAULT; /* how to interpret the key */ - -enum { /* encrypt, decrypt, authenticate */ - MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE -} mode = MODE_ENCRYPT; -enum { /* ecb, cbc, cfb, cfba, ofb? */ - ALG_ECB, ALG_CBC, ALG_CFB, ALG_OFB, ALG_CFBA -} alg = ALG_CBC; - -Desbuf ivec; /* initialization vector */ -char bits[] = { /* used to extract bits from a char */ - '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' -}; -int inverse; /* 0 to encrypt, 1 to decrypt */ -int macbits = -1; /* number of bits in authentication */ -int fbbits = -1; /* number of feedback bits */ -int pflag; /* 1 to preserve parity bits */ - -main(ac, av) - int ac; /* arg count */ - char **av; /* arg vector */ -{ - extern int optind; /* option (argument) number */ - extern char *optarg; /* argument to option if any */ - register int i; /* counter in a for loop */ - register char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ - int kflag; /* command-line encryptiooon key */ - int argc; /* the real arg count */ - char **argv; /* the real argument vector */ - - /* - * Hide the arguments from ps(1) by making private copies of them - * and clobbering the global (visible to ps(1)) ones. - */ - argc = ac; - ac = 1; - argv = malloc((argc + 1) * sizeof(char *)); - for (i = 0; i < argc; ++i) { - argv[i] = strdup(av[i]); - MEMZERO(av[i], strlen(av[i])); - } - argv[argc] = NULL; - - /* initialize the initialization vctor */ - MEMZERO(ivec, 8); - - /* process the argument list */ - kflag = 0; - while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != EOF) - switch(i) { - case 'a': /* key is ASCII */ - keybase = KEY_ASCII; - break; - case 'b': /* use ECB mode */ - alg = ALG_ECB; - break; - case 'd': /* decrypt */ - mode = MODE_DECRYPT; - break; - case 'F': /* use alternative CFB mode */ - alg = ALG_CFBA; - if ((fbbits = setbits(optarg, 7)) > 56 || fbbits == 0) - err(-1, "-F: number must be 1-56 inclusive"); - else if (fbbits == -1) - err(-1, "-F: number must be a multiple of 7"); - break; - case 'f': /* use CFB mode */ - alg = ALG_CFB; - if ((fbbits = setbits(optarg, 8)) > 64 || fbbits == 0) - err(-1, "-f: number must be 1-64 inclusive"); - else if (fbbits == -1) - err(-1, "-f: number must be a multiple of 8"); - break; - case 'k': /* encryption key */ - kflag = 1; - cvtkey(BUFFER(msgbuf), optarg); - break; - case 'm': /* number of bits for MACing */ - mode = MODE_AUTHENTICATE; - if ((macbits = setbits(optarg, 1)) > 64) - err(-1, "-m: number must be 0-64 inclusive"); - break; - case 'o': /* use OFB mode */ - alg = ALG_OFB; - if ((fbbits = setbits(optarg, 8)) > 64 || fbbits == 0) - err(-1, "-o: number must be 1-64 inclusive"); - else if (fbbits == -1) - err(-1, "-o: number must be a multiple of 8"); - break; - case 'p': /* preserve parity bits */ - pflag = 1; - break; - case 'v': /* set initialization vector */ - cvtkey(BUFFER(ivec), optarg); - break; - default: /* error */ - usage(); - } - - if (!kflag) { - /* - * if the key's not ASCII, assume it is - */ - keybase = KEY_ASCII; - /* - * get the key - */ - p = getpass("Enter key: "); - /* - * copy it, nul-padded, into the key area - */ - cvtkey(BUFFER(msgbuf), p); - } - - makekey(msgbuf); - inverse = (alg == ALG_CBC || alg == ALG_ECB) && mode == MODE_DECRYPT; - - switch(alg) { - case ALG_CBC: - switch(mode) { - case MODE_AUTHENTICATE: /* authenticate using CBC mode */ - cbcauth(); - break; - case MODE_DECRYPT: /* decrypt using CBC mode */ - cbcdec(); - break; - case MODE_ENCRYPT: /* encrypt using CBC mode */ - cbcenc(); - break; - } - break; - case ALG_CFB: - switch(mode) { - case MODE_AUTHENTICATE: /* authenticate using CFB mode */ - cfbauth(); - break; - case MODE_DECRYPT: /* decrypt using CFB mode */ - cfbdec(); - break; - case MODE_ENCRYPT: /* encrypt using CFB mode */ - cfbenc(); - break; - } - break; - case ALG_CFBA: - switch(mode) { - case MODE_AUTHENTICATE: /* authenticate using CFBA mode */ - err(-1, "can't authenticate with CFBA mode"); - break; - case MODE_DECRYPT: /* decrypt using CFBA mode */ - cfbadec(); - break; - case MODE_ENCRYPT: /* encrypt using CFBA mode */ - cfbaenc(); - break; - } - break; - case ALG_ECB: - switch(mode) { - case MODE_AUTHENTICATE: /* authenticate using ECB mode */ - err(-1, "can't authenticate with ECB mode"); - break; - case MODE_DECRYPT: /* decrypt using ECB mode */ - ecbdec(); - break; - case MODE_ENCRYPT: /* encrypt using ECB mode */ - ecbenc(); - break; - } - break; - case ALG_OFB: - switch(mode) { - case MODE_AUTHENTICATE: /* authenticate using OFB mode */ - err(-1, "can't authenticate with OFB mode"); - break; - case MODE_DECRYPT: /* decrypt using OFB mode */ - ofbdec(); - break; - case MODE_ENCRYPT: /* encrypt using OFB mode */ - ofbenc(); - break; - } - break; - } - exit(0); -} - -/* - * print a warning message and, possibly, terminate - */ -err(n, s) - int n; /* offending block number */ - char *s; /* the message */ -{ - if (n > 0) - (void)fprintf(stderr, "bdes (block %d): ", n); - else - (void)fprintf(stderr, "bdes: "); - (void)fprintf(stderr, "%s\n", s ? s : strerror(errno)); - exit(1); -} - -/* - * map a hex character to an integer - */ -tobinhex(c, radix) - char c; /* char to be converted */ - int radix; /* base (2 to 16) */ -{ - switch(c) { - case '0': return(0x0); - case '1': return(0x1); - case '2': return(radix > 2 ? 0x2 : -1); - case '3': return(radix > 3 ? 0x3 : -1); - case '4': return(radix > 4 ? 0x4 : -1); - case '5': return(radix > 5 ? 0x5 : -1); - case '6': return(radix > 6 ? 0x6 : -1); - case '7': return(radix > 7 ? 0x7 : -1); - case '8': return(radix > 8 ? 0x8 : -1); - case '9': return(radix > 9 ? 0x9 : -1); - case 'A': case 'a': return(radix > 10 ? 0xa : -1); - case 'B': case 'b': return(radix > 11 ? 0xb : -1); - case 'C': case 'c': return(radix > 12 ? 0xc : -1); - case 'D': case 'd': return(radix > 13 ? 0xd : -1); - case 'E': case 'e': return(radix > 14 ? 0xe : -1); - case 'F': case 'f': return(radix > 15 ? 0xf : -1); - } - /* - * invalid character - */ - return(-1); -} - -/* - * convert the key to a bit pattern - */ -cvtkey(obuf, ibuf) - char *obuf; /* bit pattern */ - char *ibuf; /* the key itself */ -{ - register int i, j; /* counter in a for loop */ - int nbuf[64]; /* used for hex/key translation */ - - /* - * just switch on the key base - */ - switch(keybase) { - case KEY_ASCII: /* ascii to integer */ - (void)strncpy(obuf, ibuf, 8); - return; - case KEY_DEFAULT: /* tell from context */ - /* - * leading '0x' or '0X' == hex key - */ - if (ibuf[0] == '0' && (ibuf[1] == 'x' || ibuf[1] == 'X')) { - ibuf = &ibuf[2]; - /* - * now translate it, bombing on any illegal hex digit - */ - for (i = 0; ibuf[i] && i < 16; i++) - if ((nbuf[i] = tobinhex(ibuf[i], 16)) == -1) - err(-1, "bad hex digit in key"); - while (i < 16) - nbuf[i++] = 0; - for (i = 0; i < 8; i++) - obuf[i] = - ((nbuf[2*i]&0xf)<<4) | (nbuf[2*i+1]&0xf); - /* preserve parity bits */ - pflag = 1; - return; - } - /* - * leading '0b' or '0B' == binary key - */ - if (ibuf[0] == '0' && (ibuf[1] == 'b' || ibuf[1] == 'B')) { - ibuf = &ibuf[2]; - /* - * now translate it, bombing on any illegal binary digit - */ - for (i = 0; ibuf[i] && i < 16; i++) - if ((nbuf[i] = tobinhex(ibuf[i], 2)) == -1) - err(-1, "bad binary digit in key"); - while (i < 64) - nbuf[i++] = 0; - for (i = 0; i < 8; i++) - for (j = 0; j < 8; j++) - obuf[i] = (obuf[i]<<1)|nbuf[8*i+j]; - /* preserve parity bits */ - pflag = 1; - return; - } - /* - * no special leader -- ASCII - */ - (void)strncpy(obuf, ibuf, 8); - } -} - -/* - * convert an ASCII string into a decimal number: - * 1. must be between 0 and 64 inclusive - * 2. must be a valid decimal number - * 3. must be a multiple of mult - */ -setbits(s, mult) - char *s; /* the ASCII string */ - int mult; /* what it must be a multiple of */ -{ - register char *p; /* pointer in a for loop */ - register int n = 0; /* the integer collected */ - - /* - * skip white space - */ - while (isspace(*s)) - s++; - /* - * get the integer - */ - for (p = s; *p; p++) { - if (isdigit(*p)) - n = n * 10 + *p - '0'; - else { - err(-1, "bad decimal digit in MAC length"); - } - } - /* - * be sure it's a multiple of mult - */ - return((n % mult != 0) ? -1 : n); -} - -/***************** - * DES FUNCTIONS * - *****************/ -/* - * This sets the DES key and (if you're using the deszip version) - * the direction of the transformation. This uses the Sun - * to map the 64-bit key onto the 56 bits that the key schedule - * generation routines use: the old way, which just uses the user- - * supplied 64 bits as is, and the new way, which resets the parity - * bit to be the same as the low-order bit in each character. The - * new way generates a greater variety of key schedules, since many - * systems set the parity (high) bit of each character to 0, and the - * DES ignores the low order bit of each character. - */ -makekey(buf) - Desbuf buf; /* key block */ -{ - register int i, j; /* counter in a for loop */ - register int par; /* parity counter */ - - /* - * if the parity is not preserved, flip it - */ - if (!pflag) { - for (i = 0; i < 8; i++) { - par = 0; - for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) - par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; - else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; - } - } - - DES_KEY(UBUFFER(buf)); -} - -/* - * This encrypts using the Electronic Code Book mode of DES - */ -ecbenc() -{ - register int n; /* number of bytes actually read */ - register int bn; /* block number */ - Desbuf msgbuf; /* I/O buffer */ - - for (bn = 0; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) { - /* - * do the transformation - */ - DES_XFORM(UBUFFER(msgbuf)); - WRITE(BUFFER(msgbuf), 8); - } - /* - * at EOF or last block -- in either ase, the last byte contains - * the character representation of the number of bytes in it - */ - bn++; - MEMZERO(&CHAR(msgbuf, n), 8 - n); - CHAR(msgbuf, 7) = n; - DES_XFORM(UBUFFER(msgbuf)); - WRITE(BUFFER(msgbuf), 8); - -} - -/* - * This decrypts using the Electronic Code Book mode of DES - */ -ecbdec() -{ - register int n; /* number of bytes actually read */ - register int c; /* used to test for EOF */ - register int bn; /* block number */ - Desbuf msgbuf; /* I/O buffer */ - - for (bn = 1; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) { - /* - * do the transformation - */ - DES_XFORM(UBUFFER(msgbuf)); - /* - * if the last one, handle it specially - */ - if ((c = getchar()) == EOF) { - n = CHAR(msgbuf, 7); - if (n < 0 || n > 7) - err(bn, "decryption failed (block corrupted)"); - } - else - (void)ungetc(c, stdin); - WRITE(BUFFER(msgbuf), n); - } - if (n > 0) - err(bn, "decryption failed (incomplete block)"); -} - -/* - * This encrypts using the Cipher Block Chaining mode of DES - */ -cbcenc() -{ - register int n; /* number of bytes actually read */ - register int bn; /* block number */ - Desbuf msgbuf; /* I/O buffer */ - - /* - * do the transformation - */ - for (bn = 1; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) { - for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); - WRITE(BUFFER(msgbuf), 8); - } - /* - * at EOF or last block -- in either case, the last byte contains - * the character representation of the number of bytes in it - */ - bn++; - MEMZERO(&CHAR(msgbuf, n), 8 - n); - CHAR(msgbuf, 7) = n; - for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - WRITE(BUFFER(msgbuf), 8); - -} - -/* - * This decrypts using the Cipher Block Chaining mode of DES - */ -cbcdec() -{ - register int n; /* number of bytes actually read */ - Desbuf msgbuf; /* I/O buffer */ - Desbuf ibuf; /* temp buffer for initialization vector */ - register int c; /* used to test for EOF */ - register int bn; /* block number */ - - for (bn = 0; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) { - /* - * do the transformation - */ - MEMCPY(BUFFER(ibuf), BUFFER(msgbuf), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (c = 0; c < 8; c++) - UCHAR(msgbuf, c) ^= UCHAR(ivec, c); - MEMCPY(BUFFER(ivec), BUFFER(ibuf), 8); - /* - * if the last one, handle it specially - */ - if ((c = getchar()) == EOF) { - n = CHAR(msgbuf, 7); - if (n < 0 || n > 7) - err(bn, "decryption failed (block corrupted)"); - } - else - (void)ungetc(c, stdin); - WRITE(BUFFER(msgbuf), n); - } - if (n > 0) - err(bn, "decryption failed (incomplete block)"); -} - -/* - * This authenticates using the Cipher Block Chaining mode of DES - */ -cbcauth() -{ - register int n, j; /* number of bytes actually read */ - Desbuf msgbuf; /* I/O buffer */ - Desbuf encbuf; /* encryption buffer */ - - /* - * do the transformation - * note we DISCARD the encrypted block; - * we only care about the last one - */ - while ((n = READ(BUFFER(msgbuf), 8)) == 8) { - for (n = 0; n < 8; n++) - CHAR(encbuf, n) = CHAR(msgbuf, n) ^ CHAR(ivec, n); - DES_XFORM(UBUFFER(encbuf)); - MEMCPY(BUFFER(ivec), BUFFER(encbuf), 8); - } - /* - * now compute the last one, right padding with '\0' if need be - */ - if (n > 0) { - MEMZERO(&CHAR(msgbuf, n), 8 - n); - for (n = 0; n < 8; n++) - CHAR(encbuf, n) = CHAR(msgbuf, n) ^ CHAR(ivec, n); - DES_XFORM(UBUFFER(encbuf)); - } - /* - * drop the bits - * we write chars until fewer than 7 bits, - * and then pad the last one with 0 bits - */ - for (n = 0; macbits > 7; n++, macbits -= 8) - (void)putchar(CHAR(encbuf, n)); - if (macbits > 0) { - CHAR(msgbuf, 0) = 0x00; - for (j = 0; j < macbits; j++) - CHAR(msgbuf, 0) |= (CHAR(encbuf, n)&bits[j]); - (void)putchar(CHAR(msgbuf, 0)); - } -} - -/* - * This encrypts using the Cipher FeedBack mode of DES - */ -cfbenc() -{ - register int n; /* number of bytes actually read */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 8; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < 8 - nbytes; n++) - UCHAR(ivec, n) = UCHAR(ivec, n+nbytes); - for (n = 0; n < nbytes; n++) - UCHAR(ivec, 8-nbytes+n) = ibuf[n] ^ UCHAR(msgbuf, n); - WRITE(&CHAR(ivec, 8-nbytes), nbytes); - } - /* - * at EOF or last block -- in either case, the last byte contains - * the character representation of the number of bytes in it - */ - bn++; - MEMZERO(&ibuf[n], nbytes - n); - ibuf[nbytes - 1] = n; - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < nbytes; n++) - ibuf[n] ^= UCHAR(msgbuf, n); - WRITE(ibuf, nbytes); -} - -/* - * This decrypts using the Cipher Block Chaining mode of DES - */ -cfbdec() -{ - register int n; /* number of bytes actually read */ - register int c; /* used to test for EOF */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - char obuf[8]; /* output buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 8; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (c = 0; c < 8 - nbytes; c++) - CHAR(ivec, c) = CHAR(ivec, c+nbytes); - for (c = 0; c < nbytes; c++) { - CHAR(ivec, 8-nbytes+c) = ibuf[c]; - obuf[c] = ibuf[c] ^ UCHAR(msgbuf, c); - } - /* - * if the last one, handle it specially - */ - if ((c = getchar()) == EOF) { - n = obuf[nbytes-1]; - if (n < 0 || n > nbytes-1) - err(bn, "decryption failed (block corrupted)"); - } - else - (void)ungetc(c, stdin); - WRITE(obuf, n); - } - if (n > 0) - err(bn, "decryption failed (incomplete block)"); -} - -/* - * This encrypts using the alternative Cipher FeedBack mode of DES - */ -cfbaenc() -{ - register int n; /* number of bytes actually read */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - char obuf[8]; /* output buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 7; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < 8 - nbytes; n++) - UCHAR(ivec, n) = UCHAR(ivec, n+nbytes); - for (n = 0; n < nbytes; n++) - UCHAR(ivec, 8-nbytes+n) = (ibuf[n] ^ UCHAR(msgbuf, n)) - |0200; - for (n = 0; n < nbytes; n++) - obuf[n] = CHAR(ivec, 8-nbytes+n)&0177; - WRITE(obuf, nbytes); - } - /* - * at EOF or last block -- in either case, the last byte contains - * the character representation of the number of bytes in it - */ - bn++; - MEMZERO(&ibuf[n], nbytes - n); - ibuf[nbytes - 1] = ('0' + n)|0200; - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < nbytes; n++) - ibuf[n] ^= UCHAR(msgbuf, n); - WRITE(ibuf, nbytes); -} - -/* - * This decrypts using the alternative Cipher Block Chaining mode of DES - */ -cfbadec() -{ - register int n; /* number of bytes actually read */ - register int c; /* used to test for EOF */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - char obuf[8]; /* output buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 7; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (c = 0; c < 8 - nbytes; c++) - CHAR(ivec, c) = CHAR(ivec, c+nbytes); - for (c = 0; c < nbytes; c++) { - CHAR(ivec, 8-nbytes+c) = ibuf[c]|0200; - obuf[c] = (ibuf[c] ^ UCHAR(msgbuf, c))&0177; - } - /* - * if the last one, handle it specially - */ - if ((c = getchar()) == EOF) { - if ((n = (obuf[nbytes-1] - '0')) < 0 - || n > nbytes-1) - err(bn, "decryption failed (block corrupted)"); - } - else - (void)ungetc(c, stdin); - WRITE(obuf, n); - } - if (n > 0) - err(bn, "decryption failed (incomplete block)"); -} - - -/* - * This encrypts using the Output FeedBack mode of DES - */ -ofbenc() -{ - register int n; /* number of bytes actually read */ - register int c; /* used to test for EOF */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - char obuf[8]; /* output buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 8; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < 8 - nbytes; n++) - UCHAR(ivec, n) = UCHAR(ivec, n+nbytes); - for (n = 0; n < nbytes; n++) { - UCHAR(ivec, 8-nbytes+n) = UCHAR(msgbuf, n); - obuf[n] = ibuf[n] ^ UCHAR(msgbuf, n); - } - WRITE(obuf, nbytes); - } - /* - * at EOF or last block -- in either case, the last byte contains - * the character representation of the number of bytes in it - */ - bn++; - MEMZERO(&ibuf[n], nbytes - n); - ibuf[nbytes - 1] = n; - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (c = 0; c < nbytes; c++) - ibuf[c] ^= UCHAR(msgbuf, c); - WRITE(ibuf, nbytes); -} - -/* - * This decrypts using the Output Block Chaining mode of DES - */ -ofbdec() -{ - register int n; /* number of bytes actually read */ - register int c; /* used to test for EOF */ - register int nbytes; /* number of bytes to read */ - register int bn; /* block number */ - char ibuf[8]; /* input buffer */ - char obuf[8]; /* output buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 8; - /* - * do the transformation - */ - for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (c = 0; c < 8 - nbytes; c++) - CHAR(ivec, c) = CHAR(ivec, c+nbytes); - for (c = 0; c < nbytes; c++) { - CHAR(ivec, 8-nbytes+c) = UCHAR(msgbuf, c); - obuf[c] = ibuf[c] ^ UCHAR(msgbuf, c); - } - /* - * if the last one, handle it specially - */ - if ((c = getchar()) == EOF) { - n = obuf[nbytes-1]; - if (n < 0 || n > nbytes-1) - err(bn, "decryption failed (block corrupted)"); - } - else - (void)ungetc(c, stdin); - /* - * dump it - */ - WRITE(obuf, n); - } - if (n > 0) - err(bn, "decryption failed (incomplete block)"); -} - -/* - * This authenticates using the Cipher FeedBack mode of DES - */ -cfbauth() -{ - register int n, j; /* number of bytes actually read */ - register int nbytes; /* number of bytes to read */ - char ibuf[8]; /* input buffer */ - Desbuf msgbuf; /* encryption buffer */ - - /* - * do things in bytes, not bits - */ - nbytes = fbbits / 8; - /* - * do the transformation - */ - while ((n = READ(ibuf, nbytes)) == nbytes) { - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < 8 - nbytes; n++) - UCHAR(ivec, n) = UCHAR(ivec, n+nbytes); - for (n = 0; n < nbytes; n++) - UCHAR(ivec, 8-nbytes+n) = ibuf[n] ^ UCHAR(msgbuf, n); - } - /* - * at EOF or last block -- in either case, the last byte contains - * the character representation of the number of bytes in it - */ - MEMZERO(&ibuf[n], nbytes - n); - ibuf[nbytes - 1] = '0' + n; - MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8); - DES_XFORM(UBUFFER(msgbuf)); - for (n = 0; n < nbytes; n++) - ibuf[n] ^= UCHAR(msgbuf, n); - /* - * drop the bits - * we write chars until fewer than 7 bits, - * and then pad the last one with 0 bits - */ - for (n = 0; macbits > 7; n++, macbits -= 8) - (void)putchar(CHAR(msgbuf, n)); - if (macbits > 0) { - CHAR(msgbuf, 0) = 0x00; - for (j = 0; j < macbits; j++) - CHAR(msgbuf, 0) |= (CHAR(msgbuf, n)&bits[j]); - (void)putchar(CHAR(msgbuf, 0)); - } -} - -#ifndef FASTWAY -/* - * change from 8 bits/Uchar to 1 bit/Uchar - */ -expand(from, to) - Desbuf from; /* 8bit/unsigned char string */ - char *to; /* 1bit/char string */ -{ - register int i, j; /* counters in for loop */ - - for (i = 0; i < 8; i++) - for (j = 0; j < 8; j++) - *to++ = (CHAR(from, i)>>(7-j))&01; -} - -/* - * change from 1 bit/char to 8 bits/Uchar - */ -compress(from, to) - char *from; /* 1bit/char string */ - Desbuf to; /* 8bit/unsigned char string */ -{ - register int i, j; /* counters in for loop */ - - for (i = 0; i < 8; i++) { - CHAR(to, i) = 0; - for (j = 0; j < 8; j++) - CHAR(to, i) = ((*from++)<<(7-j))|CHAR(to, i); - } -} -#endif - -/* - * message about usage - */ -usage() -{ - (void)fprintf(stderr, "%s\n", -"usage: bdes [-abdp] [-F bit] [-f bit] [-k key] [-m bit] [-o bit] [-v vector]"); - exit(1); -} diff --git a/secure/usr.bin/bdes/bdes.ps b/secure/usr.bin/bdes/bdes.ps deleted file mode 100644 index 471c267af7513..0000000000000 --- a/secure/usr.bin/bdes/bdes.ps +++ /dev/null @@ -1,2945 +0,0 @@ -%! -%%BoundingBox: (atend) -%%Pages: (atend) -%%DocumentFonts: (atend) -%%EndComments -% -% FrameMaker PostScript Prolog 2.0, for use with FrameMaker 2.0 -% Copyright (c) 1986,87,89 by Frame Technology, Inc. All rights reserved. -% -% Known Problems: -% Due to bugs in Transcript, the 'PS-Adobe-' is omitted from line 1 -/FMversion (2.0) def -% Set up Color vs. Black-and-White - /FMPrintInColor systemdict /colorimage known def -% Uncomment this line to force b&w on color printer -% /FMPrintInColor false def -/FrameDict 190 dict def -systemdict /errordict known not {/errordict 10 dict def - errordict /rangecheck {stop} put} if -% The readline in 23.0 doesn't recognize cr's as nl's on AppleTalk -FrameDict /tmprangecheck errordict /rangecheck get put -errordict /rangecheck {FrameDict /bug true put} put -FrameDict /bug false put -mark -% Some PS machines read past the CR, so keep the following 3 lines together! -currentfile 5 string readline -00 -0000000000 -cleartomark -errordict /rangecheck FrameDict /tmprangecheck get put -FrameDict /bug get { - /readline { - /gstring exch def - /gfile exch def - /gindex 0 def - { - gfile read pop - dup 10 eq {exit} if - dup 13 eq {exit} if - gstring exch gindex exch put - /gindex gindex 1 add def - } loop - pop - gstring 0 gindex getinterval true - } def - } if -/FMVERSION { - FMversion ne { - /Times-Roman findfont 18 scalefont setfont - 100 100 moveto - (FrameMaker version does not match postscript_prolog!) - dup = - show showpage - } if - } def -/FMLOCAL { - FrameDict begin - 0 def - end - } def - /gstring FMLOCAL - /gfile FMLOCAL - /gindex FMLOCAL - /orgxfer FMLOCAL - /orgproc FMLOCAL - /organgle FMLOCAL - /orgfreq FMLOCAL - /yscale FMLOCAL - /xscale FMLOCAL - /manualfeed FMLOCAL - /paperheight FMLOCAL - /paperwidth FMLOCAL -/FMDOCUMENT { - array /FMfonts exch def - /#copies exch def - FrameDict begin - 0 ne dup {setmanualfeed} if - /manualfeed exch def - /paperheight exch def - /paperwidth exch def - setpapername - manualfeed {true} {papersize} ifelse - {manualpapersize} {false} ifelse - {desperatepapersize} if - /yscale exch def - /xscale exch def - currenttransfer cvlit /orgxfer exch def - currentscreen cvlit /orgproc exch def - /organgle exch def /orgfreq exch def - end - } def - /pagesave FMLOCAL - /orgmatrix FMLOCAL - /landscape FMLOCAL -/FMBEGINPAGE { - FrameDict begin - /pagesave save def - 3.86 setmiterlimit - /landscape exch 0 ne def - landscape { - 90 rotate 0 exch neg translate pop - } - {pop pop} - ifelse - xscale yscale scale - /orgmatrix matrix def - gsave - } def -/FMENDPAGE { - grestore - pagesave restore - end - showpage - } def -/FMDEFINEFONT { - FrameDict begin - findfont - ReEncode - 2 index exch - definefont exch - scalefont - FMfonts 3 1 roll - put - end - } bind def -/FMNORMALIZEGRAPHICS { - newpath - 0.0 0.0 moveto - 1 setlinewidth - 0 setlinecap - 0 0 0 sethsbcolor - 0 setgray - } bind def - /fx FMLOCAL - /fy FMLOCAL - /fh FMLOCAL - /fw FMLOCAL - /llx FMLOCAL - /lly FMLOCAL - /urx FMLOCAL - /ury FMLOCAL -/FMBEGINEPSF { - end - /FMEPSF save def - /showpage {} def - FMNORMALIZEGRAPHICS - [/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall - fx fy translate - rotate - fw urx llx sub div fh ury lly sub div scale - llx neg lly neg translate - } bind def -/FMENDEPSF { - FMEPSF restore - FrameDict begin - } bind def -FrameDict begin -/setmanualfeed { -%%BeginFeature *ManualFeed True - statusdict /manualfeed true put -%%EndFeature - } def -/max {2 copy lt {exch} if pop} bind def -/min {2 copy gt {exch} if pop} bind def -/inch {72 mul} def -/pagedimen { - paperheight sub abs 16 lt exch - paperwidth sub abs 16 lt and - {/papername exch def} {pop} ifelse - } def - /papersizedict FMLOCAL -/setpapername { - /papersizedict 14 dict def - papersizedict begin - /papername /unknown def - /Letter 8.5 inch 11.0 inch pagedimen - /LetterSmall 7.68 inch 10.16 inch pagedimen - /Tabloid 11.0 inch 17.0 inch pagedimen - /Ledger 17.0 inch 11.0 inch pagedimen - /Legal 8.5 inch 14.0 inch pagedimen - /Statement 5.5 inch 8.5 inch pagedimen - /Executive 7.5 inch 10.0 inch pagedimen - /A3 11.69 inch 16.5 inch pagedimen - /A4 8.26 inch 11.69 inch pagedimen - /A4Small 7.47 inch 10.85 inch pagedimen - /B4 10.125 inch 14.33 inch pagedimen - /B5 7.16 inch 10.125 inch pagedimen - end - } def -/papersize { - papersizedict begin - /Letter {lettertray} def - /LetterSmall {lettertray lettersmall} def - /Tabloid {11x17tray} def - /Ledger {ledgertray} def - /Legal {legaltray} def - /Statement {statementtray} def - /Executive {executivetray} def - /A3 {a3tray} def - /A4 {a4tray} def - /A4Small {a4tray a4small} def - /B4 {b4tray} def - /B5 {b5tray} def - /unknown {unknown} def - papersizedict dup papername known {papername} {/unknown} ifelse get - end - /FMdicttop countdictstack 1 add def - statusdict begin stopped end - countdictstack -1 FMdicttop {pop end} for - } def -/manualpapersize { - papersizedict begin - /Letter {letter} def - /LetterSmall {lettersmall} def - /Tabloid {11x17} def - /Ledger {ledger} def - /Legal {legal} def - /Statement {statement} def - /Executive {executive} def - /A3 {a3} def - /A4 {a4} def - /A4Small {a4small} def - /B4 {b4} def - /B5 {b5} def - /unknown {unknown} def - papersizedict dup papername known {papername} {/unknown} ifelse get - end - stopped - } def -/desperatepapersize { - statusdict /setpageparams known - { - paperwidth paperheight 0 1 - statusdict begin - {setpageparams} stopped pop - end - } if - } def -/savematrix { - orgmatrix currentmatrix pop - } bind def -/restorematrix { - orgmatrix setmatrix - } bind def -/dmatrix matrix def -/dpi 72 0 dmatrix defaultmatrix dtransform - dup mul exch dup mul add sqrt def -/freq dpi 18.75 div 8 div round dup 0 eq {pop 1} if 8 mul dpi exch div def -/sangle 1 0 dmatrix defaultmatrix dtransform exch atan def -/DiacriticEncoding [ -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef /space /exclam /quotedbl -/numbersign /dollar /percent /ampersand /quotesingle /parenleft -/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one -/two /three /four /five /six /seven /eight /nine /colon /semicolon -/less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K -/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash -/bracketright /asciicircum /underscore /grave /a /b /c /d /e /f /g /h -/i /j /k /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar -/braceright /asciitilde /.notdef /Adieresis /Aring /Ccedilla /Eacute -/Ntilde /Odieresis /Udieresis /aacute /agrave /acircumflex /adieresis -/atilde /aring /ccedilla /eacute /egrave /ecircumflex /edieresis -/iacute /igrave /icircumflex /idieresis /ntilde /oacute /ograve -/ocircumflex /odieresis /otilde /uacute /ugrave /ucircumflex -/udieresis /dagger /.notdef /cent /sterling /section /bullet -/paragraph /germandbls /registered /copyright /trademark /acute -/dieresis /.notdef /AE /Oslash /.notdef /.notdef /.notdef /.notdef -/yen /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -/ordfeminine /ordmasculine /.notdef /ae /oslash /questiondown -/exclamdown /logicalnot /.notdef /florin /.notdef /.notdef -/guillemotleft /guillemotright /ellipsis /.notdef /Agrave /Atilde -/Otilde /OE /oe /endash /emdash /quotedblleft /quotedblright -/quoteleft /quoteright /.notdef /.notdef /ydieresis /Ydieresis -/fraction /currency /guilsinglleft /guilsinglright /fi /fl /daggerdbl -/periodcentered /quotesinglbase /quotedblbase /perthousand -/Acircumflex /Ecircumflex /Aacute /Edieresis /Egrave /Iacute -/Icircumflex /Idieresis /Igrave /Oacute /Ocircumflex /.notdef /Ograve -/Uacute /Ucircumflex /Ugrave /dotlessi /circumflex /tilde /macron -/breve /dotaccent /ring /cedilla /hungarumlaut /ogonek /caron -] def -/ReEncode { - dup - length - dict begin - { - 1 index /FID ne - {def} - {pop pop} ifelse - } forall - Encoding StandardEncoding eq - { - /Encoding DiacriticEncoding def - }if - currentdict - end - } bind def -/graymode true def - /bwidth FMLOCAL - /bpside FMLOCAL - /bstring FMLOCAL - /onbits FMLOCAL - /offbits FMLOCAL - /xindex FMLOCAL - /yindex FMLOCAL - /x FMLOCAL - /y FMLOCAL -/setpattern { - /bwidth exch def - /bpside exch def - /bstring exch def - /onbits 0 def /offbits 0 def - freq sangle landscape {90 add} if - {/y exch def - /x exch def - /xindex x 1 add 2 div bpside mul cvi def - /yindex y 1 add 2 div bpside mul cvi def - bstring yindex bwidth mul xindex 8 idiv add get - 1 7 xindex 8 mod sub bitshift and 0 ne - {/onbits onbits 1 add def 1} - {/offbits offbits 1 add def 0} - ifelse - } - setscreen - {} settransfer - offbits offbits onbits add div FMsetgray - /graymode false def - } bind def -/grayness { - FMsetgray - graymode not { - /graymode true def - orgxfer cvx settransfer - orgfreq organgle orgproc cvx setscreen - } if - } bind def - /HUE FMLOCAL - /SAT FMLOCAL - /BRIGHT FMLOCAL - /Colors FMLOCAL -FMPrintInColor - - { - /HUE 0 def - /SAT 0 def - /BRIGHT 0 def - % array of arrays Hue and Sat values for the separations [HUE BRIGHT] - /Colors - [[0 0 ] % black - [0 0 ] % white - [0.00 1.0] % red - [0.37 1.0] % green - [0.60 1.0] % blue - [0.50 1.0] % cyan - [0.83 1.0] % magenta - [0.16 1.0] % comment / yellow - ] def - - /BEGINBITMAPCOLOR { - BITMAPCOLOR} def - /BEGINBITMAPCOLORc { - BITMAPCOLORc} def - /K { - Colors exch get dup - 0 get /HUE exch store - 1 get /BRIGHT exch store - HUE 0 eq BRIGHT 0 eq and - {1.0 SAT sub setgray} - {HUE SAT BRIGHT sethsbcolor} - ifelse - } def - /FMsetgray { - /SAT exch 1.0 exch sub store - HUE 0 eq BRIGHT 0 eq and - {1.0 SAT sub setgray} - {HUE SAT BRIGHT sethsbcolor} - ifelse - } bind def - } - - { - /BEGINBITMAPCOLOR { - BITMAPGRAY} def - /BEGINBITMAPCOLORc { - BITMAPGRAYc} def - /FMsetgray {setgray} bind def - /K { - pop - } def - } -ifelse -/normalize { - transform round exch round exch itransform - } bind def -/dnormalize { - dtransform round exch round exch idtransform - } bind def -/lnormalize { - 0 dtransform exch cvi 2 idiv 2 mul 1 add exch idtransform pop - } bind def -/H { - lnormalize setlinewidth - } bind def -/Z { - setlinecap - } bind def -/X { - fillprocs exch get exec - } bind def -/V { - gsave eofill grestore - } bind def -/N { - stroke - } bind def -/M {newpath moveto} bind def -/E {lineto} bind def -/D {curveto} bind def -/O {closepath} bind def - /n FMLOCAL -/L { - /n exch def - newpath - normalize - moveto - 2 1 n {pop normalize lineto} for - } bind def -/Y { - L - closepath - } bind def - /x1 FMLOCAL - /x2 FMLOCAL - /y1 FMLOCAL - /y2 FMLOCAL - /rad FMLOCAL -/R { - /y2 exch def - /x2 exch def - /y1 exch def - /x1 exch def - x1 y1 - x2 y1 - x2 y2 - x1 y2 - 4 Y - } bind def -/RR { - /rad exch def - normalize - /y2 exch def - /x2 exch def - normalize - /y1 exch def - /x1 exch def - newpath - x1 y1 rad add moveto - x1 y2 x2 y2 rad arcto - x2 y2 x2 y1 rad arcto - x2 y1 x1 y1 rad arcto - x1 y1 x1 y2 rad arcto - closepath - 16 {pop} repeat - } bind def -/C { - grestore - gsave - R - clip - } bind def -/U { - grestore - gsave - } bind def -/F { - FMfonts exch get - setfont - } bind def -/T { - moveto show - } bind def -/RF { - rotate - 0 ne {-1 1 scale} if - } bind def -/TF { - gsave - moveto - RF - show - grestore - } bind def -/P { - moveto - 0 32 3 2 roll widthshow - } bind def -/PF { - gsave - moveto - RF - 0 32 3 2 roll widthshow - grestore - } bind def -/S { - moveto - 0 exch ashow - } bind def -/SF { - gsave - moveto - RF - 0 exch ashow - grestore - } bind def -/B { - moveto - 0 32 4 2 roll 0 exch awidthshow - } bind def -/BF { - gsave - moveto - RF - 0 32 4 2 roll 0 exch awidthshow - grestore - } bind def - /x FMLOCAL - /y FMLOCAL - /dx FMLOCAL - /dy FMLOCAL - /dl FMLOCAL - /t FMLOCAL - /t2 FMLOCAL - /Cos FMLOCAL - /Sin FMLOCAL - /r FMLOCAL -/W { - dnormalize - /dy exch def - /dx exch def - normalize - /y exch def - /x exch def - /dl dx dx mul dy dy mul add sqrt def - dl 0.0 gt { - /t currentlinewidth def - savematrix - /Cos dx dl div def - /Sin dy dl div def - /r [Cos Sin Sin neg Cos 0.0 0.0] def - /t2 t 2.5 mul 3.5 max def - newpath - x y translate - r concat - 0.0 0.0 moveto - dl t 2.7 mul sub 0.0 rlineto - stroke - restorematrix - x dx add y dy add translate - r concat - t 0.67 mul setlinewidth - t 1.61 mul neg 0.0 translate - 0.0 0.0 moveto - t2 1.7 mul neg t2 2.0 div moveto - 0.0 0.0 lineto - t2 1.7 mul neg t2 2.0 div neg lineto - stroke - t setlinewidth - restorematrix - } if - } bind def -/G { - gsave - newpath - normalize translate 0.0 0.0 moveto - dnormalize scale - 0.0 0.0 1.0 5 3 roll arc - closepath fill - grestore - } bind def -/A { - gsave - savematrix - newpath - 2 index 2 div add exch 3 index 2 div sub exch - normalize 2 index 2 div sub exch 3 index 2 div add exch - translate - scale - 0.0 0.0 1.0 5 3 roll arc - restorematrix - stroke - grestore - } bind def - /x FMLOCAL - /y FMLOCAL - /w FMLOCAL - /h FMLOCAL - /xx FMLOCAL - /yy FMLOCAL - /ww FMLOCAL - /hh FMLOCAL - /FMsaveobject FMLOCAL - /FMoptop FMLOCAL - /FMdicttop FMLOCAL -/BEGINPRINTCODE { - /FMdicttop countdictstack 1 add def - /FMoptop count 4 sub def - /FMsaveobject save def - userdict begin - /showpage {} def - FMNORMALIZEGRAPHICS - 3 index neg 3 index neg translate - } bind def -/ENDPRINTCODE { - count -1 FMoptop {pop pop} for - countdictstack -1 FMdicttop {pop end} for - FMsaveobject restore - } bind def -/gn { - 0 - { 46 mul - cf read pop - 32 sub - dup 46 lt {exit} if - 46 sub add - } loop - add - } bind def - /str FMLOCAL -/cfs { - /str sl string def - 0 1 sl 1 sub {str exch val put} for - str def - } bind def -/ic [ - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223 - 0 - {0 hx} {1 hx} {2 hx} {3 hx} {4 hx} {5 hx} {6 hx} {7 hx} {8 hx} {9 hx} - {10 hx} {11 hx} {12 hx} {13 hx} {14 hx} {15 hx} {16 hx} {17 hx} {18 hx} - {19 hx} {gn hx} {0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} - {13} {14} {15} {16} {17} {18} {19} {gn} {0 wh} {1 wh} {2 wh} {3 wh} - {4 wh} {5 wh} {6 wh} {7 wh} {8 wh} {9 wh} {10 wh} {11 wh} {12 wh} - {13 wh} {14 wh} {gn wh} {0 bl} {1 bl} {2 bl} {3 bl} {4 bl} {5 bl} {6 bl} - {7 bl} {8 bl} {9 bl} {10 bl} {11 bl} {12 bl} {13 bl} {14 bl} {gn bl} - {0 fl} {1 fl} {2 fl} {3 fl} {4 fl} {5 fl} {6 fl} {7 fl} {8 fl} {9 fl} - {10 fl} {11 fl} {12 fl} {13 fl} {14 fl} {gn fl} - ] def - /sl FMLOCAL - /val FMLOCAL - /ws FMLOCAL - /im FMLOCAL - /bs FMLOCAL - /cs FMLOCAL - /len FMLOCAL - /pos FMLOCAL -/ms { - /sl exch def - /val 255 def - /ws cfs - /im cfs - /val 0 def - /bs cfs - /cs cfs - } bind def -400 ms -/ip { - is - 0 - cf cs readline pop - { ic exch get exec - add - } forall - pop - - } bind def -/wh { - /len exch def - /pos exch def - ws 0 len getinterval im pos len getinterval copy pop - pos len - } bind def -/bl { - /len exch def - /pos exch def - bs 0 len getinterval im pos len getinterval copy pop - pos len - } bind def -/s1 1 string def -/fl { - /len exch def - /pos exch def - /val cf s1 readhexstring pop 0 get def - pos 1 pos len add 1 sub {im exch val put} for - pos len - } bind def -/hx { - 3 copy getinterval - cf exch readhexstring pop pop - } bind def - /h FMLOCAL - /w FMLOCAL - /d FMLOCAL - /lb FMLOCAL - /bitmapsave FMLOCAL - /is FMLOCAL - /cf FMLOCAL -/wbytes { - dup - 8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse - } bind def -/BEGINBITMAPBWc { - 1 {} COMMONBITMAPc - } bind def -/BEGINBITMAPGRAYc { - 8 {} COMMONBITMAPc - } bind def -/BEGINBITMAP2BITc { - 2 {} COMMONBITMAPc - } bind def -/COMMONBITMAPc { - /r exch def - /d exch def - gsave - translate rotate scale /h exch def /w exch def - /lb w d wbytes def - sl lb lt {lb ms} if - /bitmapsave save def - r - /is im 0 lb getinterval def - ws 0 lb getinterval is copy pop - /cf currentfile def - w h d [w 0 0 h neg 0 h] - {ip} image - bitmapsave restore - grestore - } bind def -/BEGINBITMAPBW { - 1 {} COMMONBITMAP - } bind def -/BEGINBITMAPGRAY { - 8 {} COMMONBITMAP - } bind def -/BEGINBITMAP2BIT { - 2 {} COMMONBITMAP - } bind def -/COMMONBITMAP { - /r exch def - /d exch def - gsave - translate rotate scale /h exch def /w exch def - /bitmapsave save def - r - /is w d wbytes string def - /cf currentfile def - w h d [w 0 0 h neg 0 h] - {cf is readhexstring pop} image - bitmapsave restore - grestore - } bind def - /proc1 FMLOCAL - /proc2 FMLOCAL - /newproc FMLOCAL -/Fmcc { - /proc2 exch cvlit def - /proc1 exch cvlit def - /newproc proc1 length proc2 length add array def - newproc 0 proc1 putinterval - newproc proc1 length proc2 putinterval - newproc cvx -} bind def -/ngrayt 256 array def -/nredt 256 array def -/nbluet 256 array def -/ngreent 256 array def - /gryt FMLOCAL - /blut FMLOCAL - /grnt FMLOCAL - /redt FMLOCAL - /indx FMLOCAL - /cynu FMLOCAL - /magu FMLOCAL - /yelu FMLOCAL - /k FMLOCAL - /u FMLOCAL -/colorsetup { - currentcolortransfer - /gryt exch def - /blut exch def - /grnt exch def - /redt exch def - 0 1 255 { - /indx exch def - /cynu 1 red indx get 255 div sub def - /magu 1 green indx get 255 div sub def - /yelu 1 blue indx get 255 div sub def - /k cynu magu min yelu min def - /u k currentundercolorremoval exec def - nredt indx 1 0 cynu u sub max sub redt exec put - ngreent indx 1 0 magu u sub max sub grnt exec put - nbluet indx 1 0 yelu u sub max sub blut exec put - ngrayt indx 1 k currentblackgeneration exec sub gryt exec put - } for - {255 mul cvi nredt exch get} - {255 mul cvi ngreent exch get} - {255 mul cvi nbluet exch get} - {255 mul cvi ngrayt exch get} - setcolortransfer - {pop 0} setundercolorremoval - {} setblackgeneration - } bind def - /tran FMLOCAL -/fakecolorsetup { - /tran 256 string def - 0 1 255 {/indx exch def - tran indx - red indx get 77 mul - green indx get 151 mul - blue indx get 28 mul - add add 256 idiv put} for - currenttransfer - {255 mul cvi tran exch get 255.0 div} - exch Fmcc settransfer -} bind def -/BITMAPCOLOR { - /d 8 def - gsave - translate rotate scale /h exch def /w exch def - /bitmapsave save def - colorsetup - /is w d wbytes string def - /cf currentfile def - w h d [w 0 0 h neg 0 h] - {cf is readhexstring pop} {is} {is} true 3 colorimage - bitmapsave restore - grestore - } bind def -/BITMAPCOLORc { - /d 8 def - gsave - translate rotate scale /h exch def /w exch def - /lb w d wbytes def - sl lb lt {lb ms} if - /bitmapsave save def - colorsetup - /is im 0 lb getinterval def - ws 0 lb getinterval is copy pop - /cf currentfile def - w h d [w 0 0 h neg 0 h] - {ip} {is} {is} true 3 colorimage - bitmapsave restore - grestore - } bind def -/BITMAPGRAY { - 8 {fakecolorsetup} COMMONBITMAP - } bind def -/BITMAPGRAYc { - 8 {fakecolorsetup} COMMONBITMAPc - } bind def -/ENDBITMAP { - } bind def -end -%%EndProlog -%%BeginSetup -(2.0) FMVERSION -1 1 612 792 0 1 16 FMDOCUMENT -/fillprocs 32 array def -fillprocs 0 { 0.000000 grayness } put -fillprocs 1 { 0.100000 grayness } put -fillprocs 2 { 0.300000 grayness } put -fillprocs 3 { 0.500000 grayness } put -fillprocs 4 { 0.700000 grayness } put -fillprocs 5 { 0.900000 grayness } put -fillprocs 6 { 0.970000 grayness } put -fillprocs 7 { 1.000000 grayness } put -fillprocs 8 {<0f87c3e1f0783c1e> 8 1 setpattern } put -fillprocs 9 {<0f1e3c78f0e1c387> 8 1 setpattern } put -fillprocs 10 { 8 1 setpattern } put -fillprocs 11 { 8 1 setpattern } put -fillprocs 12 {<8142241818244281> 8 1 setpattern } put -fillprocs 13 {<8040201008040201> 8 1 setpattern } put -fillprocs 14 {<03060c183060c081> 8 1 setpattern } put -fillprocs 15 {} put -fillprocs 16 { 1.000000 grayness } put -fillprocs 17 { 0.900000 grayness } put -fillprocs 18 { 0.700000 grayness } put -fillprocs 19 { 0.500000 grayness } put -fillprocs 20 { 0.300000 grayness } put -fillprocs 21 { 0.100000 grayness } put -fillprocs 22 { 0.030000 grayness } put -fillprocs 23 { 0.000000 grayness } put -fillprocs 24 { 8 1 setpattern } put -fillprocs 25 { 8 1 setpattern } put -fillprocs 26 {<3333333333333333> 8 1 setpattern } put -fillprocs 27 {<0000ffff0000ffff> 8 1 setpattern } put -fillprocs 28 {<7ebddbe7e7dbbd7e> 8 1 setpattern } put -fillprocs 29 {<7fbfdfeff7fbfdfe> 8 1 setpattern } put -fillprocs 30 { 8 1 setpattern } put -fillprocs 31 {} put -%%EndSetup -0 12 /Helvetica-Bold FMDEFINEFONT -1 12 /Helvetica-BoldOblique FMDEFINEFONT -%%Page: "-1" 1 -%%BeginPaperSize: Letter -%%EndPaperSize -612 792 0 FMBEGINPAGE -144 144 468 396 R -7 X -0 K -V -0 F -0 X -1.2 (IMPLEMENT) 178.34 388 S -1.2 (A) 258.88 388 S -1.2 (TION NOTES ON ) 267.85 388 S -1 F -1.2 (bdes) 382.61 388 S -0 F -1.2 (\0501\051) 415.4 388 S -1.2 (Matt Bishop) 265.09 338 S -1.2 (T) 197.74 288 S -1.2 (echnical Report PCS-TR91-158) 205.38 288 S -FMENDPAGE -%%EndPage: "-1" 2 -%%Page: "0" 2 -612 792 0 FMBEGINPAGE -72 72 540 720 R -7 X -0 K -V -FMENDPAGE -%%EndPage: "0" 3 -0 12 /Times-Roman FMDEFINEFONT -1 18 /Times-Bold FMDEFINEFONT -2 18 /Times-BoldItalic FMDEFINEFONT -3 12 /Times-Italic FMDEFINEFONT -4 12 /Times-Bold FMDEFINEFONT -5 10 /Times-Roman FMDEFINEFONT -6 12 /Courier FMDEFINEFONT -7 12 /Courier-Oblique FMDEFINEFONT -8 12 /ZapfDingbats FMDEFINEFONT -9 12 /Symbol FMDEFINEFONT -10 12 /Courier-Bold FMDEFINEFONT -%%Page: "1" 3 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 1 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -1 F -0 X -(Implementation Notes on ) 179.84 708 T -2 F -(bdes) 378.21 708 T -1 F -(\0501\051) 411.19 708 T -0 F -( ) 432.17 708 T -3 F -(Matt Bishop) 276.51 676 T -0 F -(Department of Mathematics and Computer Science) 182.92 656 T -(Dartmouth College) 259.86 642 T -(Hanover) 257.45 628 T -(, NH 03755) 298.26 628 T -3 F -(ABSTRACT) 277.68 602 T -0 F -0.27 (This note describes the implementation of ) 108 582 P -3 F -0.27 (bdes) 314.13 582 P -0 F -0.27 (, the \336le encryption program being) 336.12 582 P -0.36 (distributed in the 4.4 release of the Berkeley Software Distribution. It implements) 108 568 P -(all modes of the Data Encryption Standard program.) 108 554 T -4 F -(1. Intr) 72 528 T -(oduction) 104.43 528 T -0 F --0.09 (The Data Encryption Standard is a standard endorsed by the federal government. It is con-) 108 504 P --0.56 (siderably stronger than the algorithm used by the ) 72 484 P -5 F --0.47 (UNIX) 305.36 484 P -0 F --0.56 (\252 ) 330.34 484 P -3 F --0.56 (crypt) 344.53 484 P -0 F --0.56 (\0501\051 program, and therefore is a more) 369.18 484 P -0.11 (suitable candidate for protecting information, especially information contained in ) 72 464 P -5 F -0.09 (ASCII) 466.05 464 P -0 F -0.11 ( \336les. The) 492.14 464 P --0.65 (program ) 72 444 P -3 F --0.65 (bdes) 114.99 444 P -0 F --0.65 (\0501\051 implements the DES and all of its modes, including the two authentication modes.) 136.97 444 P --0.59 (Because others may wish to write software compatible with this program, this note presents) 108 420 P --0.04 (the layout of the encrypted \336les produced by ) 72 400 P -3 F --0.04 (bdes) 288.86 400 P -0 F --0.04 ( as well as internal details relevant to the imple-) 310.85 400 P --0.15 (mentation. Whereever possible and appropriate, the description of the ) 72 380 P -3 F --0.15 (des) 408.04 380 P -0 F --0.15 (\0501\051 program given in [4]) 424.03 380 P --0.2 (has been followed; thus, ) 72 360 P -3 F --0.2 (bdes) 190.77 360 P -0 F --0.2 ( is completely compatible with that program. However) 212.75 360 P --0.2 (, ) 473.33 360 P -3 F --0.2 (bdes) 479.12 360 P -0 F --0.2 ( also of-) 501.11 360 P -(fers several extensions to ) 72 340 T -3 F -(des) 195.9 340 T -0 F -( that are not compatible, and these will be explicitly pointed out.) 211.89 340 T --0.14 (In this note, strings typed as shown will be in ) 108 316 P -6 F --0.34 (Courier Roman font) 326.78 316 P -0 F --0.14 (, and strings to be) 455.62 316 P --0.42 (chosen by the user will be in ) 72 296 P -7 F --1 (Courier Oblique font) 209.32 296 P -0 F --0.42 (. The space character \050) 351.24 296 P -5 F --0.35 (ASCII) 457.79 296 P -0 F --0.42 ( <) 483.88 296 P -5 F --0.35 (SP) 493.23 296 P -0 F --0.42 (>, octal) 504.34 296 P --0.43 (40, decimal 32, hex 20\051 will be represented as \322) 72 276 P -8 F --0.47 (z) 296.98 276 P -0 F --0.43 (\323 and the newline character \050) 301.96 276 P -5 F --0.35 (ASCII) 438.03 276 P -0 F --0.43 ( <) 464.13 276 P -5 F --0.35 (NL) 473.46 276 P -0 F --0.43 (>, octal 12,) 486.79 276 P --0.05 (decimal 10, hex a\051 as \322) 72 256 P -9 F --0.05 (\277) 181.65 256 P -0 F --0.05 (\323. Because it is often more convenient to represent arbitrary characters as) 189.54 256 P -1.13 (a sequence of hexadecimal digits, that representation will often be used; these digits will be in) 72 236 P -10 F -(Courier Bold font) 72 216 T -0 F -( with spaces often inserted for readability) 194.33 216 T -(.) 392.07 216 T -4 F -(2. Overview and Use) 72 184 T -3 F --0.39 (Bdes) 108 160 P -0 F --0.39 ( implements the Data Encryption Standard algorithm in software, and enables the user) 131.32 160 P --0.61 (to encrypt data using any of the four modes of operation of the DES \050Electronic Code Book, Cipher) 72 140 P -72 72 540 720 C -72 72 540 117 C -72 72 549 108 R -7 X -0 K -V -5 F -0 X -(This work is based on work funded by grant NAG2-680 from the National -Aeronautics and Space Administration to ) 72 101.33 T -(Dartmouth College.) 72 89.33 T -(UNIX is a Registered T) 72 77.33 T -(rademark of A) 166.58 77.33 T -(T&T Bell Laboratories.) 223.75 77.33 T -72 72 540 720 C -0 0 612 792 C -72 126 225 126 2 L -7 X -0 K -V -0.5 H -2 Z -0 X -N -FMENDPAGE -%%EndPage: "1" 4 -%%Page: "2" 4 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 2 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X -0.31 (Block Chaining, ) 72 712 P -3 F -0.31 (k) 154.25 712 P -0 F -0.31 (-bit Cipher Feed Back, and ) 159.58 712 P -3 F -0.31 (k) 293.71 712 P -0 F -0.31 (-bit Output Feed Back\051 as well as the Alternate ) 299.04 712 P -3 F -0.31 (k) 530.68 712 P -0 F -0.31 (-) 536.01 712 P --0.04 (bit Cipher Feed Back mode. Further) 72 692 P --0.04 (, ) 244.52 692 P -3 F --0.04 (bdes) 250.48 692 P -0 F --0.04 ( supports message authentication code generation based) 272.46 692 P -(on both the Cipher Block Chaining mode and the ) 72 672 T -3 F -(k) 310.86 672 T -0 F -(-bit Cipher Feed Back mode.) 316.19 672 T -0.07 (By default, ) 108 648 P -3 F -0.07 (bdes) 164.43 648 P -0 F -0.07 ( encrypts an input \336le using Cipher Block Chaining mode, and is invoked) 186.41 648 P --0.4 (as a \336lter) 72 628 P --0.4 (. The key may be speci\336ed either on the command line or may be typed to the prompt. So,) 114.51 628 P -(if the input \336le ) 72 608 T -7 F -(inputf) 145.96 608 T -(ile) 189.14 608 T -0 F -( contains the message) 210.73 608 T -6 F -(a) 253.9 584 T -8 F -(z) 261.1 584 T -6 F -(test) 266.07 584 T -8 F -(z) 294.86 584 T -6 F -(message) 299.83 584 T -9 F -(\277) 350.21 584 T -0 F -(then the following command encrypts it using the key ) 72 560 T -6 F -(abcdefgh) 333.5 560 T -0 F -(:) 391.07 560 T -6 F -(bdes -k abcdefgh < ) 158.48 536 T -7 F -(inputf) 295.21 536 T -(ile) 338.38 536 T -6 F -( > ) 359.97 536 T -7 F -(outputf) 381.56 536 T -(ile) 431.93 536 T -0 F -(The option ) 72 512 T -4 F -(-k) 127.3 512 T -0 F -( indicates the next ar) 137.96 512 T -(gument is the key) 237.01 512 T -(. Now ) 321.17 512 T -7 F -(outputf) 353.48 512 T -(ile) 403.86 512 T -0 F -( contains) 425.45 512 T -10 F -(16 0e eb af 68 a0 d0 19 f1 a2 9b 31 0d 8a 01 c3) 136.89 488 T -0 F -0.06 (Other modes are speci\336ed using command-line options, as is control of the way the key is) 108 464 P -(interpreted. The next sections contain several examples, and the Appendix has the manual page.) 72 444 T -4 F -(3. Keys and Parity) 72 412 T -0 F -0.58 (The key consists of 64 bits, and may be presented in any of hex, binary) 108 388 P -0.58 (, or as a string of) 456.48 388 P -5 F -0.12 (ASCII) 72 368 P -0 F -0.14 ( characters. If the key is given in hex or binary) 98.1 368 P -0.14 (, it is used as is with no changes. However) 322.21 368 P -0.14 (, if) 526.53 368 P --0.27 (the key is given in ) 72 348 P -5 F --0.23 (ASCII) 161.59 348 P -0 F --0.27 (, a delicate problem arises: by convention, the parity bit is usually set to 0.) 187.69 348 P --0.47 (This high-order bit is generally ignored by applications; but the DES -does not do so. Instead, it dis-) 72 328 P --0.14 (cards the low-order bit, ef) 72 308 P --0.14 (fectively reducing the size of the space of possible keys from 2) 195.44 308 P -5 F --0.12 (56) 495.97 312.8 P -0 F --0.14 ( to 2) 505.97 308 P -5 F --0.12 (48) 527.01 312.8 P -0 F --0.14 (.) 537 308 P --0.46 ( T) 108 284 P --0.46 (o preserve the size of the key space, the value of the parity bit must be related to the value) 117.03 284 P --0.09 (in the low-order bit, so the program sets the high-order bit to make each character in the key be of) 72 264 P --0.7 (odd parity) 72 244 P --0.7 (. \050Note that the initial value of the parity bit is ) 119.49 244 P -3 F --0.7 (not) 334.99 244 P -0 F --0.7 ( used in this computation.\051 For example,) 350.31 244 P -(if the key is ) 72 224 T -6 F -(abcdefgh) 131.29 224 T -0 F -(, the actual key bits used are determined as follows:) 188.86 224 T -5 F -(ASCII) 99 200 T -0 F -( key) 125.1 200 T -6 F -(a) 243 200 T -(b) 279 200 T -(c) 315 200 T -(d) 351 200 T -(e) 387 200 T -(f) 423 200 T -(g) 459 200 T -(h) 495 200 T -5 F -(ASCII) 99 180 T -0 F -( key bits \050hex\051) 125.1 180 T -10 F -(61) 243 180 T -(62) 279 180 T -(63) 315 180 T -(64) 351 180 T -(65) 387 180 T -(66) 423 180 T -(67) 459 180 T -(68) 495 180 T -0 F -(parity) 99 160 T -(odd) 243 160 T -(odd) 279 160 T -(even) 315 160 T -(odd) 351 160 T -(even) 387 160 T -(even) 423 160 T -(odd) 459 160 T -(odd) 495 160 T -(key bits used \050hex\051) 99 140 T -10 F -(61) 243 140 T -(62) 279 140 T -(e3) 315 140 T -(64) 351 140 T -(e5) 387 140 T -(e6) 423 140 T -(67) 459 140 T -(68) 495 140 T -0 F -0.18 (This convention \050as opposed to requiring even parity) 108 120 P -0.18 (, or simply copying the low-order bit) 362 120 P --0.41 (to the high-order bit\051 was chosen to provide compatibility with the encryption program ) 72 100 P -3 F --0.41 (des) 486.77 100 P -0 F --0.41 ( distrib-) 502.76 100 P --0.52 (uted by Sun Microsystems, Inc. [4]. Whether the key is entered on the command line or on the key-) 72 80 P -FMENDPAGE -%%EndPage: "2" 5 -%%Page: "3" 5 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 3 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X -1.89 (board, by default it is processed into the same key schedule generated by Sun\325) 72 712 P -1.89 (s ) 471.02 712 P -3 F -1.89 (des) 480.58 712 P -0 F -1.89 (, so \336les) 496.56 712 P -(encrypted on a Sun can be decrypted using ) 72 692 T -3 F -(bdes) 280.51 692 T -0 F -( \050and vice versa\051.) 302.49 692 T --0.3 (If the user does not wish to use the Sun convention, the option \320) 108 668 P -4 F --0.3 (p) 411.9 668 P -0 F --0.3 ( will disable the parity bit) 418.57 668 P --0.62 (changing; with it, the parity bit is that of the character typed. This -is useful when the key is a known) 72 648 P -5 F -(ASCII) 72 628 T -0 F -( string and the \336le was encrypted on a system which does not alter parity bits.) 98.1 628 T --0.24 (A key may be represented as a bit vector) 108 604 P --0.24 (, rather than an ) 300.74 604 P -5 F --0.2 (ASCII) 374.7 604 P -0 F --0.24 ( string, in one of two ways. It) 400.8 604 P -0.19 (may be represented as a string of up to 16 hexadecimal digits; if fewer than 16 are given, the key) 72 584 P -0.16 (is right \336lled with 0 bits. Or) 72 564 P -0.16 (, it may be represented as a string of up to 64 binary digits, and again) 206.11 564 P -0.15 (if fewer than 64 are given, the key is right-\336lled with 0 bits. Bit -vector keys must be given on the) 72 544 P -0.51 (command line, and must begin with the characters ) 72 524 P -6 F -1.24 (0x) 320.28 524 P -0 F -0.51 ( or ) 334.67 524 P -6 F -1.24 (0X) 351.69 524 P -0 F -0.51 ( \050for hexadecimal\051 or ) 366.08 524 P -6 F -1.24 (0b) 472.71 524 P -0 F -0.51 ( or ) 487.1 524 P -6 F -1.24 (0B) 504.12 524 P -0 F -0.51 ( \050for) 518.51 524 P -(binary\051. For example, all of the following strings generate the same key schedule:) 72 504 T -5 F -(ASCII) 72 480 T -0 F -( key) 98.1 480 T -6 F -(abcdefgh) 180 480 T -0 F -(hexadecimal key) 72 460 T -6 F -(0x6162e364e5e66768) 180 460 T -0 F -(binary key) 72 440 T -6 F -(0b0110000101100010111000110110100011100101111000-) 180 440 T -(1100110011101101000) 180 420 T -0 F --0.14 ( Note that giving the key on the command line as ) 108 396 P -6 F --0.34 (0x6162636465666768) 345.27 396 P -0 F --0.14 ( will ) 474.8 396 P -3 F --0.14 (not) 499.17 396 P -0 F --0.14 ( reset) 514.5 396 P -0.25 (the parity bits, because it is interpreted as a sequence of hex digits, not ) 72 376 P -5 F -0.21 (ASCII) 416.58 376 P -0 F -0.25 ( characters. The dif-) 442.68 376 P -0.69 (ference in interpretation is that here the user can specify all bits of the key exactly) 72 356 P -0.69 (, whereas \050on) 474.34 356 P -0.25 (most terminals\051 it is not possible to control how the parity bit of ) 72 336 P -5 F -0.21 (ASCII) 384.76 336 P -0 F -0.25 ( characters is set. On some) 410.85 336 P -0.36 (systems, it is possible to use a \322Meta\323 key to set the parity bit for an ) 72 316 P -5 F -0.3 (ASCII) 407.23 316 P -0 F -0.36 ( character; should this) 433.33 316 P --0.3 (be the case and the user desire ) 72 296 P -3 F --0.3 (bdes) 218.09 296 P -0 F --0.3 ( not to reset the parity bit, the option ) 240.07 296 P -4 F --0.3 (\320p) 415.25 296 P -0 F --0.3 ( will force the parity bit) 427.92 296 P -(to be used as typed.) 72 276 T -4 F -(4. Encryption Output Repr) 72 244 T -(esentation) 211.05 244 T -0 F -0.01 (All modes of the DES output ciphertext in blocks; the size of the block is 64 bits \0508 bytes\051) 108 220 P --0.25 (for ECB and CBC modes, and ) 72 200 P -3 F --0.25 (k) 218.74 200 P -0 F --0.25 ( bits for the ) 224.07 200 P -3 F --0.25 (k) 281.02 200 P -0 F --0.25 (-bit CFB and OFB modes, and there are as many out-) 286.35 200 P --0.5 (put blocks as input blocks. However) 72 180 P --0.5 (, as the length of the input is usually not a multiple of the block) 243.55 180 P --0.35 (size, some padding is necessary; but as padding must be done by appending characters, these char-) 72 160 P -0.29 (acters must be distinguished from the input characters somehow) 72 140 P -0.29 (. The mechanism used is that the) 381.35 140 P -0.31 (last character of the \050decrypted\051 last block is the -\050integer\051 number of characters from the input in) 72 120 P -(the last block.) 72 100 T -FMENDPAGE -%%EndPage: "3" 6 -%%Page: "4" 6 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 4 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X --0.59 (For example, suppose ) 108 712 P -7 F --1.41 (inputf) 214.16 712 P --1.41 (ile) 257.34 712 P -0 F --0.59 ( contains \322) 278.93 712 P -6 F --1.41 (This) 329.04 712 P -8 F --0.65 (z) 357.83 712 P -6 F --1.41 (is) 362.8 712 P -8 F --0.65 (z) 377.2 712 P -6 F --1.41 (a) 382.17 712 P -8 F --0.65 (z) 389.37 712 P -6 F --1.41 (test) 394.35 712 P -9 F --0.59 (\277) 423.13 712 P -0 F --0.59 (\323, and it is encrypted in) 431.02 712 P -(CBC mode using the key \322) 72 692 T -6 F -(abcdef#@) 200.93 692 T -0 F -(\323 and the initialization vector ) 258.5 692 T -6 F -(0x0) 401.4 692 T -0 F -(; the command is) 422.99 692 T -6 F -(bdes -k abcdef#@ < ) 158.48 668 T -7 F -(inputf) 295.21 668 T -(ile) 338.38 668 T -6 F -( > ) 359.97 668 T -7 F -(outputf) 381.56 668 T -(ile) 431.93 668 T -0 F -(as CBC is the default encryption mode and ) 72 644 T -6 F -(0x0) 281.2 644 T -0 F -( the default initialization vector:) 302.79 644 T -(text) 72 620 T -6 F -(T) 117 620 T -(h) 144 620 T -(i) 171 620 T -(s) 198 620 T -8 F -(z) 225 620 T -6 F -(i) 252 620 T -(s) 279 620 T -8 F -(z) 306 620 T -6 F -(a) 333 620 T -8 F -(z) 360 620 T -6 F -(t) 387 620 T -(e) 414 620 T -(s) 441 620 T -(t) 468 620 T -9 F -(\277) 495 620 T -0 F -(hex) 72 600 T -10 F -(54) 117 600 T -(68) 144 600 T -(69) 171 600 T -(73) 198 600 T -(20) 225 600 T -(69) 252 600 T -(73) 279 600 T -(20) 306 600 T -(61) 333 600 T -(20) 360 600 T -(74) 387 600 T -(65) 414 600 T -(73) 441 600 T -(74) 468 600 T -(0a) 495 600 T -0 F -(input) 72 580 T -10 F -(54) 117 580 T -(68) 144 580 T -(69) 171 580 T -(73) 198 580 T -(20) 225 580 T -(69) 252 580 T -(73) 279 580 T -(20) 306 580 T -(61) 333 580 T -(20) 360 580 T -(74) 387 580 T -(65) 414 580 T -(73) 441 580 T -(74) 468 580 T -(0a) 495 580 T -(07) 522 580 T -0 F -(output) 72 560 T -10 F -(a5) 117 560 T -(5f) 144 560 T -(81) 171 560 T -(53) 198 560 T -(51) 225 560 T -(98) 252 560 T -(47) 279 560 T -(02) 306 560 T -(db) 333 560 T -(5a) 360 560 T -(c5) 387 560 T -(fe) 414 560 T -(50) 441 560 T -(3d) 468 560 T -(40) 495 560 T -(ce) 522 560 T -0 F -0.04 (Notice that the text is 15 characters long, so there are 7 bytes following the last full block.) 108 540 P -3 F -0.22 (Bdes) 72 520 P -0 F -0.22 ( pads this to a full block by appending one byte containing the ) 95.32 520 P -5 F -0.19 (ASCII) 399.67 520 P -0 F -0.22 ( character with numeric) 425.77 520 P -(value 7 \050the ) 72 500 T -5 F -(ASCII) 131.62 500 T -0 F -( character <) 157.71 500 T -5 F -(BEL) 214.42 500 T -0 F -(>\051. The result is then encrypted.) 233.3 500 T -0.44 (As another example, suppose ) 108 476 P -7 F -1.07 (inputf) 253.34 476 P -1.07 (ile) 296.52 476 P -0 F -0.44 ( contains \322) 318.11 476 P -6 F -1.07 (test) 370.29 476 P -0 F -0.44 (\323, and it is encrypted in ECB) 399.08 476 P -(mode using the key \322) 72 456 T -6 F -(abcdef#@) 173.93 456 T -0 F -(\323; the command is) 231.5 456 T -6 F -(bdes -b \320k abcdef#@ < ) 147.69 432 T -7 F -(inputf) 306 432 T -(ile) 349.18 432 T -6 F -( > ) 370.76 432 T -7 F -(outputf) 392.35 432 T -(ile) 442.73 432 T -0 F -(because the option ) 72 408 T -4 F -(\320b) 164.26 408 T -0 F -( signi\336es ECB mode:) 176.93 408 T -(text) 72 384 T -6 F -(t) 144 384 T -(e) 171 384 T -(s) 198 384 T -(t) 225 384 T -0 F -(hex) 72 364 T -10 F -(74) 144 364 T -(65) 171 364 T -(73) 198 364 T -(74) 225 364 T -0 F -(input) 72 344 T -10 F -(74) 144 344 T -(65) 171 344 T -(73) 198 344 T -(74) 225 344 T -(00) 252 344 T -(00) 279 344 T -(00) 306 344 T -(04) 333 344 T -0 F -(output) 72 324 T -10 F -(0d) 144 324 T -(8a) 171 324 T -(6e) 198 324 T -(57) 225 324 T -(9c) 252 324 T -(8f) 279 324 T -(27) 306 324 T -(5d) 333 324 T -0 F --0.31 (Finally) 108 304 P --0.31 (, if the length of the message is indeed a multiple of the block size, an extra block of) 141.21 304 P -0.83 (all 0 bits is added. Suppose ) 72 284 P -7 F -1.99 (inputf) 210.57 284 P -1.99 (ile) 253.74 284 P -0 F -0.83 ( contains \322) 275.33 284 P -6 F -1.99 (test) 328.28 284 P -9 F -0.83 (\277) 357.07 284 P -0 F -0.83 (\323, and it is encrypted in 40-bit CFB) 364.96 284 P -1.51 (mode using the key \322) 72 264 P -6 F -3.62 (abcdef#@) 179.96 264 P -0 F -1.51 (\323 and the initialization vector ) 237.53 264 P -6 F -3.62 (0x0123456789abcdef) 387.97 264 P -0 F -1.51 (; the) 517.5 264 P -(command is) 72 244 T -6 F --0.99 (bdes -f40 -v0x0123456789abcdef -kabcdef#@ < ) 72 220 P -7 F --0.99 (inputf) 383.67 220 P --0.99 (ile) 426.85 220 P -6 F --0.99 ( > ) 448.43 220 P -7 F --0.99 (outputf) 468.04 220 P --0.99 (ile) 518.41 220 P -0 F -0.16 (because the option ) 72 196 P -4 F -0.16 (\320f40 ) 164.75 196 P -0 F -0.16 (signi\336es 40-bit CFB mode, and ) 189.89 196 P -4 F -0.16 (-v0x01234566789abcdef) 343.96 196 P -0 F -0.16 ( sets the initial-) 465.89 196 P -(ization vector \050note that spaces between the option and its ar) 72 176 T -(gument are optional\051:) 361.57 176 T -(text) 72 152 T -6 F -(t) 144 152 T -(e) 171 152 T -(s) 198 152 T -(t) 225 152 T -9 F -(\277) 252 152 T -0 F -(hex) 72 132 T -10 F -(74) 144 132 T -(65) 171 132 T -(73) 198 132 T -(74) 225 132 T -(0a) 252 132 T -0 F -(input) 72 112 T -10 F -(74) 144 112 T -(65) 171 112 T -(73) 198 112 T -(74) 225 112 T -(0a) 252 112 T -(00) 279 112 T -(00) 306 112 T -(00) 333 112 T -(00) 360 112 T -(00) 387 112 T -0 F -(output) 72 92 T -10 F -(e2) 144 92 T -(c2) 171 92 T -(69) 198 92 T -(a4) 225 92 T -(5b) 252 92 T -(3c) 279 92 T -(3d) 306 92 T -(b3) 333 92 T -(f5) 360 92 T -(3c) 387 92 T -FMENDPAGE -%%EndPage: "4" 7 -1 12 /Times-BoldItalic FMDEFINEFONT -2 14 /Symbol FMDEFINEFONT -%%Page: "5" 7 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 5 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X -(Note here the block size is 40 bits \0505 bytes\051, not 64 bits \0508 bytes\051.) 108 712 T --0.4 (This technique allows complete compatibility with Sun\325) 108 688 P --0.4 (s ) 374.11 688 P -3 F --0.4 (des) 381.37 688 P -0 F --0.4 ( program. In Sun\325) 397.36 688 P --0.4 (s implemen-) 480.77 688 P -0.02 (tation, padding is done with random bytes rather than bytes containing all zero bits. Cryptograph-) 72 668 P -0.85 (ically) 72 648 P -0.85 (, this makes no dif) 97.87 648 P -0.85 (ference, as the DES is a suf) 189.32 648 P -0.85 (\336ciently good random cipher to obscure the) 325.74 648 P -(input \050see for example [2], Chapter 6\051, and known plaintext attacks are very dif) 72 628 T -(\336cult [1].) 451.82 628 T -4 F -(5. Differ) 72 596 T -(ences Between the Standard CFB and OFB Modes and ) 114.41 596 T -1 F -(bdes) 397.26 596 T -0 F --0.11 (The UNIX operating system treats all \336les as streams of 8-bit bytes. In order to implement) 108 572 P --0.08 (the CFB and OFB modes properly) 72 552 P --0.08 (, it would be necessary to read ) 235.74 552 P -3 F --0.08 (k) 383.74 552 P -0 F --0.08 ( bits from the \336le, where ) 389.07 552 P -3 F --0.08 (k) 509.51 552 P -0 F --0.08 ( is an) 514.84 552 P -0.98 (integer between 1 and 64 inclusive. However) 72 532 P -0.98 (, this would require considerable buf) 294.22 532 P -0.98 (fering and be) 474.77 532 P -0.23 (quite inef) 72 512 P -0.23 (\336cient and prohibitively slow) 117.65 512 P -0.23 (. For these reasons, the current implementation of ) 258.48 512 P -3 F -0.23 (bdes) 501.48 512 P -0 F -0.23 ( re-) 523.46 512 P -0.47 (quires that ) 72 492 P -3 F -0.47 (k) 126.23 492 P -0 F -0.47 ( be a multiple of 8, so that an integral number of bytes will always be read from the) 131.56 492 P -(\336le. Other than this change, this mode is implemented as described in [3].) 72 472 T --0.58 (A similar observation holds for the alternate CFB mode described in [3]. Here, only the low) 108 448 P -0.23 (7 bits of each byte are signi\336cant, and hence the parameter ) 72 428 P -3 F -0.23 (k) 358.95 428 P -0 F -0.23 ( is an integer from 1 to 56 inclusive;) 364.28 428 P -(bdes requires k to be a multiple of 7. The high-order bit is retained for encryption and decryption,) 72 408 T -(but output \050whether from encryption or decryption\051 always has the high-order bit set to zero.) 72 388 T -4 F -(6. Message Authentication Code Modes) 72 356 T -0 F -0.57 (The Data Encryption Standard provides two modes of authentication, each providing be-) 108 332 P -1.27 (tween 1 and 64 bits of authentication data. In both cases an ) 72 312 P -3 F -1.27 (n) 373.32 312 P -0 F -1.27 (-bit message authentication code) 379.32 312 P -0.62 (\050MAC\051 is generated, where 1) 72 292 P -2 F -0.73 ( ) 214.71 292 P -9 F -0.62 (\243) 218.94 292 P -0 F -0.62 ( ) 225.52 292 P -3 F -0.62 (n) 229.15 292 P -0 F -0.62 ( ) 235.14 292 P -9 F -0.62 (\243) 238.76 292 P -0 F -0.62 ( 64. The \336rst is based on the CBC encryption mode, and the) 245.35 292 P -(second on CFB mode. Both work the same.) 72 272 T -0.13 (First, the \336le is padded to a multiple of the block size by appending enough zero bits. It is) 108 248 P --0.16 (then encrypted using the standard CBC \050or CFB\051 algorithm, but -all encrypted text is discarded ex-) 72 228 P --0.44 (cept for the last block. The ) 72 208 P -3 F --0.44 (n) 200.9 208 P -0 F --0.44 ( leading bits of the last block are used as the MAC. Note that the block) 206.9 208 P -(size constrains the number of bits available as the MAC.) 72 188 T -0.71 (The implementation allows the user to specify that the MAC is to be computed in either) 108 164 P --0.01 (CBC or CFB mode, and the user can specify any number of bits from 1 to 64 inclusive. However) 72 144 P --0.01 (,) 537 144 P --0.11 (because the UNIX operating system can only output bits in multiples of 8, if the number of bits of) 72 124 P --0.08 (MAC is not a multiple of 8, the MAC will be right-padded with the minimum number of zero bits) 72 104 P --0.31 (necessary to make the MAC length be a multiple of 8. However) 72 84 P --0.31 (, note that as the standard \050[3], Ap-) 374.6 84 P -FMENDPAGE -%%EndPage: "5" 8 -%%Page: "6" 8 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 6 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X --0.14 (pendix F\051 requires an incomplete \336nal block be right-padded with -zeroes, the technique of forcing) 72 712 P -(the last octet to contain the number of bytes in the message is ) 72 692 T -3 F -(not) 369.47 692 T -0 F -( used here.) 384.8 692 T --0.39 (For example, suppose ) 108 668 P -7 F --0.94 (inputf) 214.76 668 P --0.94 (ile) 257.93 668 P -0 F --0.39 ( contains \322) 279.52 668 P -6 F --0.94 (This) 330.04 668 P -8 F --0.43 (z) 358.82 668 P -6 F --0.94 (is) 363.8 668 P -8 F --0.43 (z) 378.19 668 P -6 F --0.94 (a) 383.17 668 P -8 F --0.43 (z) 390.36 668 P -6 F --0.94 (test) 395.34 668 P -9 F --0.39 (\277) 424.13 668 P -0 F --0.39 (\323, and a 64-bit MAC is) 432.02 668 P --0.73 (to be generated using CBC mode, the key \322) 72 648 P -6 F --1.74 (abcdef#@) 274.39 648 P -0 F --0.73 (\323 and the initialization vector ) 331.96 648 P -6 F --1.74 (0x0) 471.23 648 P -0 F --0.73 (; the com-) 492.82 648 P -(mand is) 72 628 T -6 F -(bdes -m 64 -k abcdef#@ < ) 136.89 604 T -7 F -(inputf) 316.79 604 T -(ile) 359.97 604 T -6 F -( > ) 381.56 604 T -7 F -(outputf) 403.15 604 T -(ile) 453.52 604 T -0 F -(as CBC is the default encryption mode and ) 72 580 T -6 F -(0x0) 281.2 580 T -0 F -( the default initialization vector:) 302.79 580 T -(text) 72 556 T -6 F -(T) 117 556 T -(h) 144 556 T -(i) 171 556 T -(s) 198 556 T -8 F -(z) 225 556 T -6 F -(i) 252 556 T -(s) 279 556 T -8 F -(z) 306 556 T -6 F -(a) 333 556 T -8 F -(z) 360 556 T -6 F -(t) 387 556 T -(e) 414 556 T -(s) 441 556 T -(t) 468 556 T -9 F -(\277) 495 556 T -0 F -(hex) 72 536 T -10 F -(54) 117 536 T -(68) 144 536 T -(69) 171 536 T -(73) 198 536 T -(20) 225 536 T -(69) 252 536 T -(73) 279 536 T -(20) 306 536 T -(61) 333 536 T -(20) 360 536 T -(74) 387 536 T -(65) 414 536 T -(73) 441 536 T -(74) 468 536 T -(0a) 495 536 T -0 F -(input) 72 516 T -10 F -(54) 117 516 T -(68) 144 516 T -(69) 171 516 T -(73) 198 516 T -(20) 225 516 T -(69) 252 516 T -(73) 279 516 T -(20) 306 516 T -(61) 333 516 T -(20) 360 516 T -(74) 387 516 T -(65) 414 516 T -(73) 441 516 T -(74) 468 516 T -(0a) 495 516 T -(00) 522 516 T -0 F -(output) 72 496 T -10 F -(43) 117 496 T -(18) 144 496 T -(de) 171 496 T -(74) 198 496 T -(24) 225 496 T -(a9) 252 496 T -(65) 279 496 T -(d1) 306 496 T -0 F -0.04 (Notice that the text is 15 characters long, so there are 7 bytes following the last full block.) 108 476 P -3 F -(Bdes) 72 456 T -0 F -( pads this to a full block by appending a zero-\336lled byte. The result is then encrypted and the) 95.32 456 T -(last block of output is used as the MAC.) 72 436 T -0.06 (As another example, suppose we used the same text, and wanted a 36-bit MAC to be gen-) 108 412 P -6.91 (erated using 40-bit CFB mode, the key \322) 72 392 P -6 F -16.58 (abcdef#@) 314.9 392 P -0 F -6.91 (\323 and the initialization vector) 372.47 392 P -6 F -(0x0123456789abcdef) 72 372 T -0 F -(; the command is) 201.53 372 T -6 F -(bdes -m 36 -f 40 -v 0x0123456789abcdef < ) 79.32 348 T -7 F -(inputf) 374.36 348 T -(ile) 417.54 348 T -6 F -( > ) 439.13 348 T -7 F -(outputf) 460.71 348 T -(ile) 511.09 348 T -0 F --0.19 (where ) 72 324 P -4 F --0.19 (\320m 36) 104.11 324 P -0 F --0.19 ( is the option to generate a 36-bit MAC, ) 134.91 324 P -4 F --0.19 (\320f 40) 327.79 324 P -0 F --0.19 ( indicates 40-bit CFB is to be used, and) 352.58 324 P -4 F --0.31 (\320v 0x123456789abcdef) 72 304 P -0 F --0.31 ( sets the initialization vector) 186.62 304 P --0.31 (. Note that, as the key is not given on the com-) 319.95 304 P -(mand line, the user will be prompted for it. It gives:) 72 284 T -(text) 72 260 T -6 F -(T) 117 260 T -(h) 144 260 T -(i) 171 260 T -(s) 198 260 T -8 F -(z) 225 260 T -6 F -(i) 252 260 T -(s) 279 260 T -8 F -(z) 306 260 T -6 F -(a) 333 260 T -8 F -(z) 360 260 T -6 F -(t) 387 260 T -(e) 414 260 T -(s) 441 260 T -(t) 468 260 T -9 F -(\277) 495 260 T -0 F -(hex) 72 240 T -10 F -(54) 117 240 T -(68) 144 240 T -(69) 171 240 T -(73) 198 240 T -(20) 225 240 T -(69) 252 240 T -(73) 279 240 T -(20) 306 240 T -(61) 333 240 T -(20) 360 240 T -(74) 387 240 T -(65) 414 240 T -(73) 441 240 T -(74) 468 240 T -(0a) 495 240 T -0 F -(input) 72 220 T -10 F -(54) 117 220 T -(68) 144 220 T -(69) 171 220 T -(73) 198 220 T -(20) 225 220 T -(69) 252 220 T -(73) 279 220 T -(20) 306 220 T -(61) 333 220 T -(20) 360 220 T -(74) 387 220 T -(65) 414 220 T -(73) 441 220 T -(74) 468 220 T -(0a) 495 220 T -0 F -(output) 72 200 T -10 F -(2b) 117 200 T -(18) 144 200 T -(68) 171 200 T -(2d) 198 200 T -(60) 225 200 T -0 F -0.19 (Note that the MAC is padded on the right by four zero bits to produce \336ve characters that) 108 180 P -(can be output.) 72 160 T -4 F -(7. Differ) 72 128 T -(ences Between ) 114.41 128 T -1 F -(bdes) 191.01 128 T -4 F -( and Sun\325) 212.99 128 T -(s DES Implementation) 261.88 128 T -0 F -0.02 (The program ) 108 104 P -3 F -0.02 (bdes) 173.33 104 P -0 F -0.02 ( is designed to be completely compatible with Sun Microsystems, Inc.\325) 195.31 104 P -0.02 (s) 535.33 104 P -0.57 (implementation of the Data Encryption Standard, called ) 72 84 P -3 F -0.57 (des) 347.14 84 P -0 F -0.57 ( and described in [4]. Thus, \336les en-) 363.13 84 P -FMENDPAGE -%%EndPage: "6" 9 -%%Page: "7" 9 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 7 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -0 X -0.44 (crypted using ) 72 712 P -3 F -0.44 (des) 140.84 712 P -0 F -0.44 ( can be decrypted using ) 156.83 712 P -3 F -0.44 (bdes) 275.29 712 P -0 F -0.44 (, and vice versa, provided modes common to both) 297.27 712 P --0.34 (are used. However) 72 692 P --0.34 (, ) 160.41 692 P -3 F --0.34 (bdes) 166.06 692 P -0 F --0.34 ( does not allow \336les to be named on the command line, nor does it support) 188.05 692 P --0.68 (hardware devices \050and so the ) 72 672 P -4 F --0.68 (-s) 210.83 672 P -0 F --0.68 ( and ) 219.49 672 P -4 F --0.68 (-f) 241.45 672 P -0 F --0.68 ( options of Sun\325) 249.44 672 P --0.68 (s ) 323.71 672 P -3 F --0.68 (des) 330.7 672 P -0 F --0.68 ( are not available\051. Further) 346.69 672 P --0.68 (, as encryption) 471.07 672 P --0.05 (is the default, the Sun ) 72 652 P -3 F --0.05 (des) 179.01 652 P -0 F --0.05 ( ) 195 652 P -4 F --0.05 (-e) 197.95 652 P -0 F --0.05 ( option is not recognized. As the manual page to ) 207.27 652 P -3 F --0.05 (bdes) 441.6 652 P -0 F --0.05 ( is in the appen-) 463.59 652 P -(dix, these dif) 72 632 T -(ferences will not be elaborated upon further) 134.08 632 T -(.) 343.24 632 T -0.44 (Sun\325) 108 608 P -0.44 (s ) 130 608 P -3 F -0.44 (des) 138.1 608 P -0 F -0.44 ( supports the use of special-purpose hardware to encrypt and decrypt. Although) 154.09 608 P -3 F -1.33 (bdes) 72 588 P -0 F -1.33 ( does not directly support the use of such hardware, it uses the library routine ) 93.98 588 P -3 F -1.33 (encrypt) 487.05 588 P -0 F -1.33 (\0503\051,) 523.02 588 P --0.09 (which may) 72 568 P --0.09 (. Hardware support was not included directly to support as lar) 124.1 568 P --0.09 (ge a number of platforms) 419.11 568 P -(as possible with installers needing to know as little about the hardware as possible.) 72 548 T --0.08 (Sun\325) 108 524 P --0.08 (s ) 130 524 P -3 F --0.08 (des) 137.58 524 P -0 F --0.08 ( supports only the CBC and ECB encryption modes; ) 153.57 524 P -3 F --0.08 (bdes) 407.07 524 P -0 F --0.08 ( supports all modes de-) 429.05 524 P -0.26 (scribed in [3] \050although CFB and OFB are not completely supported\051 as well as both CBC-based) 72 504 P -(and CFB-based MACs.) 72 484 T -0.15 (Although input with length not a multiple of the block size is handled in the same way by) 108 460 P --0.47 (both ) 72 440 P -3 F --0.47 (des) 95.85 440 P -0 F --0.47 ( and ) 111.84 440 P -3 F --0.47 (bdes) 134.21 440 P -0 F --0.47 (, dif) 156.19 440 P --0.47 (ferent values of the padding bytes are used in all but the last byte of the input.) 174.82 440 P -(Where ) 72 420 T -3 F -(bdes) 106.96 420 T -0 F -( puts zero bytes, ) 128.94 420 T -3 F -(des) 209.89 420 T -0 F -( puts bytes containing random values. The reason for Sun\325) 225.87 420 T -(s doing) 505.02 420 T -0.47 (so is to prevent a known plaintext attack on the \336le should an -attacker determine that the input\325) 72 400 P -0.47 (s) 535.33 400 P --0.29 (length were a multiple of the block size. W) 72 380 P --0.29 (ith ) 276.05 380 P -3 F --0.29 (bdes) 291.43 380 P -0 F --0.29 (, the plaintext contents of the last block of input) 313.41 380 P -0.31 (for such a \336le is known \050a block with all bits zero\051. W) 72 360 P -0.31 (ith ) 333.99 360 P -3 F -0.31 (des) 349.96 360 P -0 F -0.31 (, the plaintext contents of that block) 365.95 360 P -0.73 (are not known. Cryptanalytically) 72 340 P -0.73 (, given the information about the strength of the DES currently) 231.29 340 P -0.2 (known, it is widely believed that known plaintext attacks are infeasible -\050see for example [1]\051 and) 72 320 P -1.86 (so initializing and invoking the pseudorandom number generator seems unnecessary) 72 300 P -1.86 (. But this) 492.63 300 P -(means that ciphertexts produced from a plaintext by ) 72 280 T -3 F -(bdes) 324.48 280 T -0 F -( and ) 346.47 280 T -3 F -(des) 369.78 280 T -0 F -( will dif) 385.77 280 T -(fer in the last block.) 423.54 280 T -4 F -(Refer) 72 248 T -(ences) 100.41 248 T -0 F -([1]) 72 224 T -0.37 (D. Denning, \322The Data Encryption Standard: Fifteen Y) 108 224 P -0.37 (ears of Public Scrutiny) 374.87 224 P -0.37 (,\323 ) 484.8 224 P -3 F -0.37 (Pr) 496.49 224 P -0.37 (oceed-) 508.04 224 P --0.47 (ings of the Sixth Annual Computer Security Applications Confer) 108 204 P --0.47 (ence) 411.65 204 P -0 F --0.47 ( pp. x\320xv \050Dec. 1990\051.) 433.62 204 P -([2]) 72 180 T -(A. Konheim, ) 108 180 T -3 F -(Cryptography: A Primer) 173.29 180 T -0 F -(, John W) 291.4 180 T -(iley and Sons, Inc., New Y) 333.9 180 T -(ork, NY \0501981\051.) 461.94 180 T -([3]) 72 156 T -3 F -0.63 (DES Modes of Operation) 108 156 P -0 F -0.63 (, Federal Information Processing Standards Publication 81, Na-) 231.47 156 P --0.07 (tional Bureau of Standards, U.S. Department of Commerce, W) 108 136 P --0.07 (ashington, DC \050Dec. 1980\051.) 407.62 136 P -([4]) 72 112 T -3 F -(UNIX User) 108 112 T -(\325) 162.74 112 T -(s Manual) 165.18 112 T -0 F -(, Sun Microsystems Inc., Mountain V) 210.16 112 T -(iew) 390 112 T -(, CA \050Mar) 406.54 112 T -(. 1988\051.) 455.51 112 T -4 F -(Appendix. The UNIX System Manual Page for ) 72 80 T -1 F -(bdes) 313.2 80 T -FMENDPAGE -%%EndPage: "7" 10 -1 11 /Times-Bold FMDEFINEFONT -%%Page: "8" 10 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 8 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -1 F -0 X -(NAME) 72 712.67 T -0 F -(bdes - encrypt/decrypt using the Data Encryption Standard) 108 689 T -1 F -(SYNOPSIS) 72 663.67 T -4 F -(bdes) 108 640 T -0 F -( [) 131.33 640 T -3 F -( ) 138.32 640 T -4 F -(-abdp) 141.32 640 T -0 F -( ] [ ) 171.31 640 T -4 F -(-F) 188.3 640 T -0 F -( ) 199.62 640 T -3 F -(b) 202.62 640 T -0 F -( ] [ ) 208.61 640 T -4 F -(-f) 225.6 640 T -0 F -( ) 233.58 640 T -3 F -(b) 236.58 640 T -0 F -( ] [ ) 242.58 640 T -4 F -(-k) 259.56 640 T -0 F -( ) 270.22 640 T -3 F -(key) 273.22 640 T -0 F -( ] [ ) 289.2 640 T -4 F -(-m) 306.18 640 T -0 F -( ) 320.16 640 T -3 F -(b) 323.16 640 T -0 F -( ] [ ) 329.16 640 T -4 F -(-o) 346.14 640 T -0 F -( ) 356.13 640 T -3 F -(b) 359.13 640 T -0 F -( ] [ ) 365.13 640 T -4 F -(-v) 382.11 640 T -0 F -( ) 392.1 640 T -3 F -(vector) 395.1 640 T -0 F -( ]) 425.07 640 T -1 F -(DESCRIPTION) 72 614.67 T -3 F --0.69 (Bdes) 108 591 P -0 F --0.69 ( reads from the standard input and writes on the standard output. It implements all DES) 131.32 591 P --0.09 (modes of operation described in FIPS PUB 81 including alternative cipher feedback mode) 108 577 P -0.74 (and both authentication modes. All modes but the electronic code book mode require an) 108 563 P --0.14 (initialization vector; if none is supplied, the zero vector is used. T) 108 549 P --0.14 (o protect the key and ini-) 420.44 549 P -0.29 (tialization vector from being read by) 108 535 P -3 F -0.29 ( ps) 284.98 535 P -0 F -0.29 (\0501\051, ) 298.94 535 P -3 F -0.29 (bdes ) 319.21 535 P -0 F -0.29 (hides its ar) 344.48 535 P -0.29 (guments on entry) 396.81 535 P -0.29 (. If no ) 479.89 535 P -3 F -0.29 (key ) 512.74 535 P -0 F -0.29 (is) 532 535 P --0.61 (given, one is requested from the controlling terminal if that can be opened, or from the stan-) 108 521 P -(dard input if not.) 108 507 T --0.17 (The key and initialization vector are taken as sequences of ) 108 489 P -5 F --0.14 (ASCII) 389.38 489 P -0 F --0.17 ( characters which are then) 415.48 489 P --0.35 (mapped into their bit representations. If either begins with -\3240x\325 or \3240X\325, that one is taken as) 108 475 P -1.02 (a sequence of hexadecimal digits indicating the bit pattern; if either begins with \3240b\325 or) 108 461 P --0.73 (\3240B\325, that one is taken as a sequence of binary digits -indicating the bit pattern. In either case,) 108 447 P --0.37 (only the leading 64 bits of the key or initialization vector are used, and if fewer than 64 bits) 108 433 P -0.35 (are provided, enough 0 bits are appended to pad the key to 64 bits. Note that if the key is) 108 419 P -0.03 (not entered on the command line, it is interpreted in the same way) 108 405 P -0.03 (, because with 4.4 BSD,) 424.31 405 P --0.36 (the password reading function ) 108 391 P -3 F --0.36 (getpass) 254.45 391 P -0 F --0.36 (\0503\051 allows enough characters for either hex or binary) 290.43 391 P -(keys to be entered.) 108 377 T -0.04 (According to the DES standard, the low-order bit of each character in the key string is de-) 108 359 P --0.18 (leted. Since most ) 108 345 P -5 F --0.15 (ASCII) 192.75 345 P -0 F --0.18 ( representations set the high-order bit to 0, simply deleting the low-) 218.84 345 P --0.29 (order bit ef) 108 331 P --0.29 (fectively reduces the size of the key space from 2) 160.49 331 P -5 F --0.24 (56) 394.67 335.8 P -0 F --0.29 ( to 2) 404.67 331 P -5 F --0.24 (48) 425.41 335.8 P -0 F --0.29 ( keys. T) 435.4 331 P --0.29 (o prevent this,) 472.29 331 P --0.46 (the high-order bit must be a function depending in part upon the low-order bit; so, the high-) 108 317 P -0.11 (order bit is set to whatever value gives odd parity) 108 303 P -0.11 (. This preserves the key space size. Note) 345.05 303 P -(this resetting of the parity bit is ) 108 289 T -3 F -(not) 260.92 289 T -0 F -( done if the key is given in binary or hex.) 276.24 289 T --0.38 (By default, the standard input is encrypted using cipher block chaining mode and is written) 108 271 P -0.18 (to the standard output. Using the same key for encryption and decryption preserves plain-) 108 257 P -(text, so) 108 243 T -( bdes ) 225.81 225 T -3 F -(key) 253.79 225 T -0 F -( < plaintext | bdes \320i ) 269.77 225 T -3 F -(key) 370.21 225 T -0 F -( ) 386.19 225 T -(is a very expensive equivalent of ) 108 201 T -3 F -(cat) 268.54 201 T -0 F -(\0501\051.) 283.2 201 T -(Options are:) 108 183 T -( ) 108 165 T -4 F -(\320a) 111 165 T -0 F --0.75 (The key and initialization vector strings are to be taken as ) 144 165 P -5 F --0.62 (ASCII) 415.89 165 P -0 F --0.75 ( suppressing the spe-) 441.98 165 P -0.3 (cial interpretation given to leading \3240x\325, \3240X\325, \3240b\325, -and \3240B\325 characters. Note this) 144 151 P -(\337ag applies to ) 144 137 T -3 F -(both) 214.29 137 T -0 F -( the key and initialization vector) 235.62 137 T -(.) 389.85 137 T -4 F -(\320b) 108 119 T -0 F -(Use electronic code book mode.) 144 119 T -4 F -(\320d) 108 101 T -0 F -(Decrypt the input.) 144 101 T -FMENDPAGE -%%EndPage: "8" 11 -%%Page: "9" 11 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 9 of 11) 479.71 34.7 T -72 72 540 720 R -7 X -V -4 F -0 X -(\320f) 108 712 T -0 F -( ) 117.99 712 T -3 F -(b) 120.99 712 T -0 F --0.29 (Use ) 144 712 P -3 F --0.29 (b) 165.36 712 P -0 F --0.29 (-bit cipher feedback mode. Currently ) 171.35 712 P -3 F --0.29 (b) 350.42 712 P -0 F --0.29 ( must be a multiple of 8 between 8 and) 356.42 712 P -(64 inclusive \050this does not conform to the standard CFB mode speci\336cation\051.) 144 698 T -4 F -(\320F) 108 680 T -0 F -( ) 121.32 680 T -3 F -(b) 124.32 680 T -0 F --0.29 (Use ) 144 680 P -3 F --0.29 (b) 165.36 680 P -0 F --0.29 (-bit alternative cipher feedback mode. Currently ) 171.36 680 P -3 F --0.29 (b) 403.77 680 P -0 F --0.29 ( must be a multiple of 7 be-) 409.77 680 P --0.12 (tween 7 and 56 inclusive \050this does not conform to the alternative CFB mode spec-) 144 666 P -(i\336cation\051.) 144 652 T -4 F -(\320k) 108 634 T -0 F -( ) 120.67 634 T -3 F -(key) 123.66 634 T -0 F -0.37 (Use the string ) 144 616 P -3 F -0.37 (key) 214.74 616 P -0 F -0.37 ( as the cryptographic key) 230.72 616 P -0.37 (. If this ar) 352.01 616 P -0.37 (gument is not given, the user) 399.54 616 P -(will be prompted for the key) 144 602 T -(.) 280.12 602 T -4 F -(\320m) 108 584 T -0 F -( ) 123.99 584 T -3 F -(b) 126.99 584 T -0 F -0.71 (Compute a message authentication code \050MAC\051 of ) 144 584 P -3 F -0.71 (b) 395.78 584 P -0 F -0.71 ( bits on the input. ) 401.77 584 P -3 F -0.71 (b) 491.94 584 P -0 F -0.71 ( must be) 497.94 584 P -0.11 (between 1 and 64 inclusive; if ) 144 570 P -3 F -0.11 (b) 291.87 570 P -0 F -0.11 ( is not a multiple of 8, enough 0 bits will be added) 297.86 570 P --0.44 (to pad the MAC length to the nearest multiple of 8. Only the MAC is output. MACs) 144 556 P -(are only available in cipher block chaining mode or in cipher feedback mode.) 144 542 T -4 F -(\320o) 108 524 T -0 F -( ) 119.99 524 T -3 F -(b) 122.99 524 T -0 F --0.34 (Use ) 144 524 P -3 F --0.34 (b) 165.31 524 P -0 F --0.34 (-bit output feedback mode. Currently ) 171.31 524 P -3 F --0.34 (b) 350.83 524 P -0 F --0.34 ( must be a multiple of 8 between 8 and) 356.83 524 P -(64 inclusive \050this does not conform to the OFB mode speci\336cation\051.) 144 510 T -4 F -(\320p) 108 492 T -0 F --0.14 (Disable the resetting of the parity bit. This \337ag forces the parity bit of the key to be) 144 492 P -0.03 (used as typed, rather than making each character be of odd parity) 144 478 P -0.03 (. It is used only if) 455.91 478 P -(the key is given in ) 144 464 T -5 F -(ASCII) 234.95 464 T -0 F -(.) 261.04 464 T -4 F -(\320v) 108 446 T -0 F -( ) 119.99 446 T -3 F -(vector) 122.99 446 T -0 F --0.5 (Set the initialization vector to ) 144 428 P -3 F --0.5 (v) 286.44 428 P -0 F --0.5 (; the vector is interpreted in the same way as the key) 291.76 428 P --0.5 (.) 537 428 P -(The vector is ignored in electronic codebook mode.) 144 414 T --0.55 (The DES is considered a very strong cryptosystem, and other than table lookup attacks, key) 108 396 P -0.24 (search attacks, and Hellman\325) 108 382 P -0.24 (s time-memory tradeof) 246.61 382 P -0.24 (f \050all of which are very expensive and) 356.8 382 P -0.66 (time-consuming\051, no cryptanalytic methods for breaking the DES are known in the open) 108 368 P -0.33 (literature. No doubt the choice of keys and key security are the most vulnerable aspect of) 108 354 P -3 F -(bdes) 108 340 T -0 F -(.) 129.98 340 T -4 F -(IMPLEMENT) 72 314 T -(A) 146.41 314 T -(TION NOTES) 154.18 314 T -0 F -0.57 (For implementors wishing to write software compatible with this program, the following) 108 290 P --0.23 (notes are provided. This software is completely compatible with the implementation of the) 108 276 P -(data encryption standard distributed by Sun Microsystems, Inc.) 108 262 T -0.11 (In the ECB and CBC modes, plaintext is encrypted in units of 64 bits \0508 bytes, also called) 108 244 P -0.52 (a block\051. T) 108 230 P -0.52 (o ensure that the plaintext \336le is encrypted correctly) 160.49 230 P -0.52 (, ) 413.01 230 P -3 F -0.52 (bdes ) 419.53 230 P -0 F -0.52 (will \050internally\051 ap-) 445.03 230 P -0.29 (pend from 1 to 8 bytes, the last byte containing an integer stating how many bytes of that) 108 216 P --0.71 (\336nal block are from the plaintext \336le, and encrypt the resulting block. Hence, when decrypt-) 108 202 P -0.27 (ing, the last block may contain from 0 to 7 characters present in the plaintext \336le, and the) 108 188 P --0.59 (last byte tells how many) 108 174 P --0.59 (. Note that if during decryption the last byte of the \336le does not con-) 221.46 174 P -0.41 (tain an integer between 0 and 7, either the \336le has been corrupted or an incorrect key has) 108 160 P -0.48 (been given. A similar mechanism is used for the OFB and CFB modes, except that those) 108 146 P -0.26 (simply require the length of the input to be a multiple of the mode size, and the \336nal byte) 108 132 P --0.73 (contains an integer between 0 and one less than the number of bytes being used as the mode.) 108 118 P -(\050This was another reason that the mode size must be a multiple of 8 for those modes.\051) 108 104 T -FMENDPAGE -%%EndPage: "9" 12 -%%Page: "10" 12 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 10 of 11) 473.71 34.7 T -72 72 540 720 R -7 X -V -0 X -0.94 (Unlike Sun\325) 108 712 P -0.94 (s implementation, unused bytes of that last block are not \336lled with random) 166.58 712 P -0.57 (data, but instead contain what was in those byte positions in the preceding block. This is) 108 698 P -(quicker and more portable, and does not weaken the encryption signi\336cantly) 108 684 T -(.) 473.95 684 T -0.36 (If the key is entered in ) 108 666 P -5 F -0.3 (ASCII) 220.76 666 P -0 F -0.36 (, the parity bits of the key characters are set so that each key) 246.85 666 P -1.03 (character is of odd parity) 108 652 P -1.03 (. Unlike Sun\325) 231.23 652 P -1.03 (s implementation, it is possible to enter binary or) 296.92 652 P --0.57 (hexadecimal keys on the command line, and if this is done, the parity bits are ) 108 638 P -3 F --0.57 (not ) 472.85 638 P -0 F --0.57 (reset. This) 490.61 638 P -(allows testing using arbitrary bit patterns as keys.) 108 624 T -0.64 (The Sun implementation always uses an initialization vector of 0 \050that is, all zeroes\051. By) 108 606 P -(default, ) 108 592 T -3 F -(bdes ) 147.3 592 T -0 F -(does too, but this may be changed from the command line.) 172.29 592 T -4 F -(FILES) 72 566 T -0 F -(/dev/tty) 108 542 T -(controlling terminal for typed key) 180 542 T -4 F -(SEE ALSO) 72 516 T -3 F -(crypt) 108 492 T -0 F -(\0501\051, ) 132.65 492 T -3 F -(crypt) 152.63 492 T -0 F -(\0503\051) 177.27 492 T -3 F --0.4 (Data Encryption Standar) 108 474 P --0.4 (d) 228.02 474 P -0 F --0.4 (, Federal Information Processing Standard #46, National Bureau) 234.02 474 P -(of Standards, U.S. Department of Commerce, W) 108 460 T -(ashington DC \050Jan. 1977\051.) 340.2 460 T -3 F -0.16 (DES) 108 442 P -0 F -0.16 ( ) 129.98 442 P -3 F -0.16 (Modes of Operation, ) 133.15 442 P -0 F -0.16 (Federal Information Processing Standard #81, National Bureau) 236.24 442 P -(of Standards, U.S. Department of Commerce, W) 108 428 T -(ashington DC \050Dec. 1980\051.) 340.2 428 T -2.75 (Dorothy Denning, ) 108 410 P -3 F -2.75 (Cryptography and Data Security) 203.77 410 P -0 F -2.75 (, Addison-W) 368.8 410 P -2.75 (esley Publishing Co.,) 432.55 410 P -(Reading, MA \2511982.) 108 396 T --0.19 ( Matt Bishop, \322Implementation Notes on ) 108 378 P -3 F --0.19 (bdes) 305.76 378 P -0 F --0.19 (\0501\051\323, T) 327.75 378 P --0.19 (echnical Report PCS-TR-91-158, De-) 359.35 378 P -0.34 (partment of Mathematics and Computer Science, Dartmouth College, Hanover) 108 364 P -0.34 (, NH \050Apr) 488.01 364 P -0.34 (.) 537 364 P -(1991\051.) 108 350 T -4 F -(CAUTION) 72 324 T -0 F --0.55 (Certain speci\336c keys should be avoided because they introduce potential weaknesses; these) 108 300 P --0.44 (keys, called the ) 108 286 P -3 F --0.44 (weak) 183.95 286 P -0 F --0.44 ( and ) 208.6 286 P -3 F --0.44 (semiweak) 231.03 286 P -0 F --0.44 ( keys, are \050in hex notation, where ) 277.66 286 P -6 F --1.06 (p) 437.45 286 P -0 F --0.44 ( is either ) 444.64 286 P -6 F --1.06 (0) 487.63 286 P -0 F --0.44 ( or ) 494.82 286 P -6 F --1.06 (1) 509.93 286 P -0 F --0.44 (, and) 517.12 286 P -6 F -(P) 108 272 T -0 F -( is either ) 115.2 272 T -6 F -(e) 159.5 272 T -0 F -( or ) 166.7 272 T -6 F -(f) 182.68 272 T -0 F -(\051:) 189.88 272 T -6 F -(0x0p0p0p0p0p0p0p0p) 144 254 T -(0x0p1P0p1P0p0P0p0P) 360 254 T -(0x0pep0pep0pfp0pfp) 144 236 T -(0x0pfP0pfP0pfP0pfP) 360 236 T -(0x1P0p1P0p0P0p0P0p) 144 218 T -(0x1P1P1P1P0P0P0P0P) 360 218 T -(0x1Pep1Pep0Pfp0Pfp) 144 200 T -(0x1PfP1PfP0PfP0PfP) 360 200 T -(0xep0pep0pfp0pfp0p) 144 182 T -(0xep1Pep1pfp0Pfp0P) 360 182 T -(0xepepepepepepepep) 144 164 T -(0xepfPepfPfpfPfpfP) 360 164 T -(0xfP0pfP0pfP0pfP0p) 144 146 T -(0xfP1PfP1PfP0PfP0P) 360 146 T -(0xfPepfPepfPepfPep) 144 128 T -(0xfPfPfPfPfPfPfPfP) 360 128 T -0 F -0.13 (The weakness of these keys is inherent in the DES algorithm \050see for example Moore and) 108 110 P --0.57 (Simmons, \322Cycle structure of the DES with weak and semi-weak keys,\323) 108 96 P -3 F --0.57 ( Advances in Cryp-) 449.43 96 P -(tology \320 Crypto \32486 Pr) 108 82 T -(oceedings) 216.83 82 T -0 F -(, Springer) 264.79 82 T -(-V) 311.85 82 T -(erlag New Y) 323.17 82 T -(ork, \2511987, pp. 9-32\051.) 383.25 82 T -FMENDPAGE -%%EndPage: "10" 13 -%%Page: "11" 13 -612 792 0 FMBEGINPAGE -72 745.99 540 756 R -7 X -0 K -V -72 32.69 540 42.7 R -V -0 F -0 X -(Page 11 of 11) 473.71 34.7 T -72 72 540 720 R -7 X -V -4 F -0 X -(BUGS) 72 712 T -0 F --0.18 (There is a controversy raging over whether the DES will still be secure in a few years. The) 108 688 P -0.31 (advent of special-purpose hardware could reduce the cost of any of the methods of attack) 108 674 P -(named above so that they are no longer computationally infeasible.) 108 660 T -0.32 (Programs which display programs\325 ar) 108 642 P -0.32 (guments may compromise the key and initialization) 289.59 642 P -0.76 (vector if they are speci\336ed on the command line. T) 108 628 P -0.76 (o avoid this ) 358.46 628 P -3 F -0.76 (bdes) 419.7 628 P -0 F -0.76 ( overwrites its ar) 441.68 628 P -0.76 (gu-) 524.01 628 P -(ments. However) 108 614 T -(, the obvious race cannot currently be avoided.) 186.12 614 T -0.25 (As the key or key schedule is kept in memory throughout the run of this program, the en-) 108 596 P -(cryption can be compromised if memory is readable.) 108 582 T --0.4 (There is no warranty of merchantability nor any warranty of \336tness for a particular purpose) 108 564 P -0.05 (nor any other warranty) 108 550 P -0.05 (, either express or implied, as to the accuracy of the enclosed mate-) 216.95 550 P -(rials or as to their suitability for any particular purpose.) 108 536 T --0.06 (Accordingly) 108 518 P --0.06 (, the user assumes full responsibility for their use. Further) 167.18 518 P --0.06 (, the author assumes) 442.93 518 P --0.25 (no obligation to furnish any assistance of any kind whatsoever) 108 504 P --0.25 (, or to furnish any additional) 404.69 504 P -(information or documentation.) 108 490 T -4 F -(AUTHOR) 72 464 T -0 F --0.54 (Matt Bishop, Department of Mathematics and Computer Science, Bradley Hall, Dartmouth) 108 440 P -(College, Hanover) 108 426 T -(, NH 03755) 192.12 426 T -(Electronic mail addresses:) 108 408 T -(Internet: Matt.Bishop@dartmouth.edu) 108 390 T -(UUCP: decvax!dartvax!Matt.Bishop) 108 372 T -FMENDPAGE -%%EndPage: "11" 14 -%%Trailer -%%BoundingBox: 0 0 612 792 -%%Pages: 13 1 -%%DocumentFonts: Helvetica-Bold -%%+ Helvetica-BoldOblique -%%+ Times-Roman -%%+ Times-Bold -%%+ Times-BoldItalic -%%+ Times-Italic -%%+ Courier -%%+ Courier-Oblique -%%+ ZapfDingbats -%%+ Symbol -%%+ Courier-Bold diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile deleted file mode 100644 index 9ebe912dd1be8..0000000000000 --- a/secure/usr.bin/telnet/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (c) 1990 The Regents of the University of California. -# All rights reserved. -# -# 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. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. 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. -# -# @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id$ -# - -DISTRIBUTION= krb - -PROG= telnet - -SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ - terminal.c tn3270.c utilities.c - -CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DENCRYPTION -CFLAGS+=-DSKEY -I${.CURDIR}/../../lib -LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet -DPADD+= ${TELNETOBJDIR}/libtelnet.a ${LIBTERMCAP} - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES)) -CFLAGS+=-DAUTHENTICATION -DKRB4 -LDADD+= -ldes -lkrb -DPADD+= ${LIBDES} ${LIBKRB} -.endif - -# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active -#LDADD+= -ldescrypt - -.include diff --git a/secure/usr.bin/telnet/README b/secure/usr.bin/telnet/README deleted file mode 100644 index 086c88f295001..0000000000000 --- a/secure/usr.bin/telnet/README +++ /dev/null @@ -1,566 +0,0 @@ - - -This is a distribution of both client and server telnet. These programs -have been compiled on: - telnet telnetd - BSD 4.3 Reno X X - UNICOS 5.1 X X - UNICOS 6.0 X X - UNICOS 6.1 X X - UNICOS 7.0 X X - SunOs 3.5 X X (no linemode in server) - SunOs 4.1 X X (no linemode in server) - DYNIX V3.0.17.9 X X (no linemode in server) - Ultrix 3.1 X X (no linemode in server) - Ultrix 4.0 X X (no linemode in server) - -In addition, previous versions have been compiled on the following -machines, but were not available for testing this version. - telnet telnetd - SunOs 4.0.3c X X (no linemode in server) - BSD 4.3 X X (no linemode in server) - DYNIX V3.0.12 X X (no linemode in server) - -Februrary 22, 1991: - - Features: - - This version of telnet/telnetd has support for both - the AUTHENTICATION and ENCRYPTION options. The - AUTHENTICATION option is fairly well defined, and - an option number has been assigned to it. The - ENCRYPTION option is still in a state of flux; an - option number has NOT been assigned to it yet. - The code is provided in this release for experimental - and testing purposes. - - The telnet "send" command can now be used to send - do/dont/will/wont commands, with any telnet option - name. The rules for when do/dont/will/wont are sent - are still followed, so just because the user requests - that one of these be sent doesn't mean that it will - be sent... - - The telnet "getstatus" command no longer requires - that option printing be enabled to see the response - to the "DO STATUS" command. - - A -n flag has been added to telnetd to disable - keepalives. - - A new telnet command, "auth" has been added (if - AUTHENTICATE is defined). It has four sub-commands, - "status", "debug", "disable", "enable" and "help". - - A new telnet command, "encrypt" has been added (if - ENCRYPT is defined). It has many sub-commands: - "enable", "type", "start", "stop", "input", - "-input", "output", "-output", "status", "auto", - "verbose", "debug", and "help". - - An "rlogin" interface has been added. If the program - is named "rlogin", or the "-r" flag is given, then - an rlogin type of interface will be used. - ~. Terminates the session - ~ Suspend the session - ~^] Escape to telnet command mode - ~~ Pass through the ~. - BUG: If you type the rlogin escape character - in the middle of a line while in rlogin - mode, you cannot erase it or any characters - before it. Hopefully this can be fixed - in a future release... - - General changes: - - A "libtelnet.a" has now been created. This libraray - contains code that is common to both telnet and - telnetd. This is also where library routines that - are needed, but are not in the standard C library, - are placed. - - The makefiles have been re-done. All of the site - specific configuration information has now been put - into a single "Config.generic" file, in the top level - directory. Changing this one file will take care of - all three subdirectories. Also, to add a new/local - definition, a "Config.local" file may be created - at the top level; if that file exists, the subdirectories - will use that file instead of "Config.generic". - - Many 1-2 line functions in commands.c have been - removed, and just inserted in-line, or replaced - with a macro. - - Bug Fixes: - - The non-termio code in both telnet and telnetd was - setting/clearing CTLECH in the sg_flags word. This - was incorrect, and has been changed to set/clear the - LCTLECH bit in the local mode word. - - The SRCRT #define has been removed. If IP_OPTIONS - and IPPROTO_IP are defined on the system, then the - source route code is automatically enabled. - - The NO_GETTYTAB #define has been removed; there - is a compatability routine that can be built into - libtelnet to achive the same results. - - The server, telnetd, has been switched to use getopt() - for parsing the argument list. - - The code for getting the input/output speeds via - cfgetispeed()/cfgetospeed() was still not quite - right in telnet. Posix says if the ispeed is 0, - then it is really equal to the ospeed. - - The suboption processing code in telnet now has - explicit checks to make sure that we received - the entire suboption (telnetd was already doing this). - - The telnet code for processing the terminal type - could cause a core dump if an existing connection - was closed, and a new connection opened without - exiting telnet. - - Telnetd was doing a TCSADRAIN when setting the new - terminal settings; This is not good, because it means - that the tcsetattr() will hang waiting for output to - drain, and telnetd is the only one that will drain - the output... The fix is to use TCSANOW which does - not wait. - - Telnetd was improperly setting/clearing the ISTRIP - flag in the c_lflag field, it should be using the - c_iflag field. - - When the child process of telnetd was opening the - slave side of the pty, it was re-setting the EXTPROC - bit too early, and some of the other initialization - code was wiping it out. This would cause telnetd - to go out of linemode and into single character mode. - - One instance of leaving linemode in telnetd forgot - to send a WILL ECHO to the client, the net result - would be that the user would see double character - echo. - - If the MODE was being changed several times very - quickly, telnetd could get out of sync with the - state changes and the returning acks; and wind up - being left in the wrong state. - -September 14, 1990: - - Switch the client to use getopt() for parsing the - argument list. The 4.3Reno getopt.c is included for - systems that don't have getopt(). - - Use the posix _POSIX_VDISABLE value for what value - to use when disabling special characters. If this - is undefined, it defaults to 0x3ff. - - For non-termio systems, TIOCSETP was being used to - change the state of the terminal. This causes the - input queue to be flushed, which we don't want. This - is now changed to TIOCSETN. - - Take out the "#ifdef notdef" around the code in the - server that generates a "sync" when the pty oputput - is flushed. The potential problem is that some older - telnet clients may go into an infinate loop when they - receive a "sync", if so, the server can be compiled - with "NO_URGENT" defined. - - Fix the client where it was setting/clearing the OPOST - bit in the c_lflag field, not the c_oflag field. - - Fix the client where it was setting/clearing the ISTRIP - bit in the c_lflag field, not the c_iflag field. (On - 4.3Reno, this is the ECHOPRT bit in the c_lflag field.) - The client also had its interpretation of WILL BINARY - and DO BINARY reversed. - - Fix a bug in client that would cause a core dump when - attempting to remove the last environment variable. - - In the client, there were a few places were switch() - was being passed a character, and if it was a negative - value, it could get sign extended, and not match - the 8 bit case statements. The fix is to and the - switch value with 0xff. - - Add a couple more printoption() calls in the client, I - don't think there are any more places were a telnet - command can be received and not printed out when - "options" is on. - - A new flag has been added to the client, "-a". Currently, - this just causes the USER name to be sent across, in - the future this may be used to signify that automatic - authentication is requested. - - The USER variable is now only sent by the client if - the "-a" or "-l user" options are explicity used, or - if the user explicitly asks for the "USER" environment - variable to be exported. In the server, if it receives - the "USER" environment variable, it won't print out the - banner message, so that only "Password:" will be printed. - This makes the symantics more like rlogin, and should be - more familiar to the user. (People are not used to - getting a banner message, and then getting just a - "Password:" prompt.) - - Re-vamp the code for starting up the child login - process. The code was getting ugly, and it was - hard to tell what was really going on. What we - do now is after the fork(), in the child: - 1) make sure we have no controlling tty - 2) open and initialize the tty - 3) do a setsid()/setpgrp() - 4) makes the tty our controlling tty. - On some systems, #2 makes the tty our controlling - tty, and #4 is a no-op. The parent process does - a gets rid of any controlling tty after the child - is fork()ed. - - Use the strdup() library routine in telnet, instead - of the local savestr() routine. If you don't have - strdup(), you need to define NO_STRDUP. - - Add support for ^T (SIGINFO/VSTATUS), found in the - 4.3Reno distribution. This maps to the AYT character. - You need a 4-line bugfix in the kernel to get this - to work properly: - - > *** tty_pty.c.ORG Tue Sep 11 09:41:53 1990 - > --- tty_pty.c Tue Sep 11 17:48:03 1990 - > *************** - > *** 609,613 **** - > if ((tp->t_lflag&NOFLSH) == 0) - > ttyflush(tp, FREAD|FWRITE); - > ! pgsignal(tp->t_pgrp, *(unsigned int *)data); - > return(0); - > } - > --- 609,616 ---- - > if ((tp->t_lflag&NOFLSH) == 0) - > ttyflush(tp, FREAD|FWRITE); - > ! pgsignal(tp->t_pgrp, *(unsigned int *)data, 1); - > ! if ((*(unsigned int *)data == SIGINFO) && - > ! ((tp->t_lflag&NOKERNINFO) == 0)) - > ! ttyinfo(tp); - > return(0); - > } - - The client is now smarter when setting the telnet escape - character; it only sets it to one of VEOL and VEOL2 if - one of them is undefined, and the other one is not already - defined to the telnet escape character. - - Handle TERMIOS systems that have seperate input and output - line speed settings imbedded in the flags. - - Many other minor bug fixes. - -June 20, 1990: - Re-organize makefiles and source tree. The telnet/Source - directory is now gone, and all the source that was in - telnet/Source is now just in the telnet directory. - - Seperate makefile for each system are now gone. There - are two makefiles, Makefile and Makefile.generic. - The "Makefile" has the definitions for the various - system, and "Makefile.generic" does all the work. - There is a variable called "WHAT" that is used to - specify what to make. For example, in the telnet - directory, you might say: - make 4.4bsd WHAT=clean - to clean out the directory. - - Add support for the ENVIRON and XDISPLOC options. - In order for the server to work, login has to have - the "-p" option to preserve environment variables. - - Add the SOFT_TAB and LIT_ECHO modes in the LINEMODE support. - - Add the "-l user" option to command line and open command - (This is passed through the ENVIRON option). - - Add the "-e" command line option, for setting the escape - character. - - Add the "-D", diagnostic, option to the server. This allows - the server to print out debug information, which is very - useful when trying to debug a telnet that doesn't have any - debugging ability. - - Turn off the literal next character when not in LINEMODE. - - Don't recognize ^Y locally, just pass it through. - - Make minor modifications for Sun4.0 and Sun4.1 - - Add support for both FORW1 and FORW2 characters. The - telnet escpape character is set to whichever of the - two is not being used. If both are in use, the escape - character is not set, so when in linemode the user will - have to follow the escape character with a or - - -The following TELNET options are supported: - - LINEMODE: - The LINEMODE option is supported as per RFC1116. The - FORWARDMASK option is not currently supported. - - BINARY: The client has the ability to turn on/off the BINARY - option in each direction. Turning on BINARY from - server to client causes the LITOUT bit to get set in - the terminal driver on both ends, turning on BINARY - from the client to the server causes the PASS8 bit - to get set in the terminal driver on both ends. - - TERMINAL-TYPE: - This is supported as per RFC1091. On the server side, - when a terminal type is received, termcap/terminfo - is consulted to determine if it is a known terminal - type. It keeps requesting terminal types until it - gets one that it recongnizes, or hits the end of the - list. The server side looks up the entry in the - termcap/terminfo data base, and generates a list of - names which it then passes one at a time to each - request for a terminal type, duplicating the last - entry in the list before cycling back to the beginning. - - NAWS: The Negotiate about Window Size, as per RFC 1073. - - TERMINAL-SPEED: - Implemented as per RFC 1079 - - TOGGLE-FLOW-CONTROL: - Implemented as per RFC 1080 - - TIMING-MARK: - As per RFC 860 - - SGA: As per RFC 858 - - ECHO: As per RFC 857 - - STATUS: - The server will send its current status upon - request. It does not ask for the clients status. - The client will request the servers current status - from the "send getstatus" command. - - ENVIRON: - This option is currently being defined by the IETF - Telnet Working Group, and an RFC has not yet been - issued, but should be in the near future... - - X-DISPLAY-LOCATION: - This functionality can be done through the ENVIRON - option, it is added here for completeness. - - AUTHENTICATION: - This option is currently being defined by the IETF - Telnet Working Group, and an RFC has not yet been - issued. The basic framework is pretty much decided, - but the definitions for the specific authentication - schemes is still in a state of flux. - - ENCRYPT: - This option is currently being defined by the IETF - Telnet Working Group, and an RFC has not yet been - issued. The draft RFC is still in a state of flux, - so this code may change in the future. diff --git a/secure/usr.bin/telnet/authenc.c b/secure/usr.bin/telnet/authenc.c deleted file mode 100644 index 545df780051d9..0000000000000 --- a/secure/usr.bin/telnet/authenc.c +++ /dev/null @@ -1,111 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - -#if defined(AUTHENTICATION) || defined(ENCRYPTION) -#include -#include -#include -#include - -#include "general.h" -#include "ring.h" -#include "externs.h" -#include "defines.h" -#include "types.h" - - int -net_write(str, len) - unsigned char *str; - int len; -{ - if (NETROOM() > len) { - ring_supply_data(&netoring, str, len); - if (str[0] == IAC && str[1] == SE) - printsub('>', &str[2], len-2); - return(len); - } - return(0); -} - - void -net_encrypt() -{ -#ifdef ENCRYPTION - if (encrypt_output) - ring_encrypt(&netoring, encrypt_output); - else - ring_clearto(&netoring); -#endif /* ENCRYPTION */ -} - - int -telnet_spin() -{ - return(-1); -} - - char * -telnet_getenv(val) - char *val; -{ - return((char *)env_getvalue((unsigned char *)val)); -} - - char * -telnet_gets(prompt, result, length, echo) - char *prompt; - char *result; - int length; - int echo; -{ - extern char *getpass(); - extern int globalmode; - int om = globalmode; - char *res; - - TerminalNewMode(-1); - if (echo) { - printf("%s", prompt); - res = fgets(result, length, stdin); - } else if (res = getpass(prompt)) { - strncpy(result, res, length); - res = result; - } - TerminalNewMode(om); - return(res); -} -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ diff --git a/secure/usr.bin/telnet/commands.c b/secure/usr.bin/telnet/commands.c deleted file mode 100644 index 1edf3c65abb2a..0000000000000 --- a/secure/usr.bin/telnet/commands.c +++ /dev/null @@ -1,2987 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#if defined(unix) -#include -#if defined(CRAY) || defined(sysV88) -#include -#endif -#include -#else -#include -#endif /* defined(unix) */ -#include -#include -#ifdef CRAY -#include -#endif /* CRAY */ - -#include -#include -#include -#include -#include -#include - -#include - -#include "general.h" - -#include "ring.h" - -#include "externs.h" -#include "defines.h" -#include "types.h" - -#if !defined(CRAY) && !defined(sysV88) -#include -# if (defined(vax) || defined(tahoe) || defined(hp300)) && !defined(ultrix) -# include -# endif /* vax */ -#endif /* !defined(CRAY) && !defined(sysV88) */ -#include - - -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif MAXHOSTNAMELEN - -#if defined(IPPROTO_IP) && defined(IP_TOS) -int tos = -1; -#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - -char *hostname; -static char _hostname[MAXHOSTNAMELEN]; - -extern char *getenv(); - -extern int isprefix(); -extern char **genget(); -extern int Ambiguous(); - -static call(); - -typedef struct { - char *name; /* command name */ - char *help; /* help string (NULL for no help) */ - int (*handler)(); /* routine which executes command */ - int needconnect; /* Do we need to be connected to execute? */ -} Command; - -static char line[256]; -static char saveline[256]; -static int margc; -static char *margv[20]; - -#if defined(SKEY) -#include -#define PATH_SKEY "/usr/bin/key" - int -skey_calc(argc, argv) - int argc; - char **argv; -{ - int status; - - if(argc != 3) { - printf("%s sequence challenge\n", argv[0]); - return; - } - - switch(fork()) { - case 0: - execv(PATH_SKEY, argv); - exit (1); - case -1: - perror("fork"); - break; - default: - (void) wait(&status); - if (WIFEXITED(status)) - return (WEXITSTATUS(status)); - return (0); - } -} -#endif - - static void -makeargv() -{ - register char *cp, *cp2, c; - register char **argp = margv; - - margc = 0; - cp = line; - if (*cp == '!') { /* Special case shell escape */ - strcpy(saveline, line); /* save for shell command */ - *argp++ = "!"; /* No room in string to get this */ - margc++; - cp++; - } - while (c = *cp) { - register int inquote = 0; - while (isspace(c)) - c = *++cp; - if (c == '\0') - break; - *argp++ = cp; - margc += 1; - for (cp2 = cp; c != '\0'; c = *++cp) { - if (inquote) { - if (c == inquote) { - inquote = 0; - continue; - } - } else { - if (c == '\\') { - if ((c = *++cp) == '\0') - break; - } else if (c == '"') { - inquote = '"'; - continue; - } else if (c == '\'') { - inquote = '\''; - continue; - } else if (isspace(c)) - break; - } - *cp2++ = c; - } - *cp2 = '\0'; - if (c == '\0') - break; - cp++; - } - *argp++ = 0; -} - -/* - * Make a character string into a number. - * - * Todo: 1. Could take random integers (12, 0x12, 012, 0b1). - */ - - static -special(s) - register char *s; -{ - register char c; - char b; - - switch (*s) { - case '^': - b = *++s; - if (b == '?') { - c = b | 0x40; /* DEL */ - } else { - c = b & 0x1f; - } - break; - default: - c = *s; - break; - } - return c; -} - -/* - * Construct a control character sequence - * for a special character. - */ - static char * -control(c) - register cc_t c; -{ - static char buf[5]; - /* - * The only way I could get the Sun 3.5 compiler - * to shut up about - * if ((unsigned int)c >= 0x80) - * was to assign "c" to an unsigned int variable... - * Arggg.... - */ - register unsigned int uic = (unsigned int)c; - - if (uic == 0x7f) - return ("^?"); - if (c == (cc_t)_POSIX_VDISABLE) { - return "off"; - } - if (uic >= 0x80) { - buf[0] = '\\'; - buf[1] = ((c>>6)&07) + '0'; - buf[2] = ((c>>3)&07) + '0'; - buf[3] = (c&07) + '0'; - buf[4] = 0; - } else if (uic >= 0x20) { - buf[0] = c; - buf[1] = 0; - } else { - buf[0] = '^'; - buf[1] = '@'+c; - buf[2] = 0; - } - return (buf); -} - - - -/* - * The following are data structures and routines for - * the "send" command. - * - */ - -struct sendlist { - char *name; /* How user refers to it (case independent) */ - char *help; /* Help information (0 ==> no help) */ - int needconnect; /* Need to be connected */ - int narg; /* Number of arguments */ - int (*handler)(); /* Routine to perform (for special ops) */ - int nbyte; /* Number of bytes to send this command */ - int what; /* Character to be sent (<0 ==> special) */ -}; - - -static int - send_esc P((void)), - send_help P((void)), - send_docmd P((char *)), - send_dontcmd P((char *)), - send_willcmd P((char *)), - send_wontcmd P((char *)); - -static struct sendlist Sendlist[] = { - { "ao", "Send Telnet Abort output", 1, 0, 0, 2, AO }, - { "ayt", "Send Telnet 'Are You There'", 1, 0, 0, 2, AYT }, - { "brk", "Send Telnet Break", 1, 0, 0, 2, BREAK }, - { "break", 0, 1, 0, 0, 2, BREAK }, - { "ec", "Send Telnet Erase Character", 1, 0, 0, 2, EC }, - { "el", "Send Telnet Erase Line", 1, 0, 0, 2, EL }, - { "escape", "Send current escape character", 1, 0, send_esc, 1, 0 }, - { "ga", "Send Telnet 'Go Ahead' sequence", 1, 0, 0, 2, GA }, - { "ip", "Send Telnet Interrupt Process", 1, 0, 0, 2, IP }, - { "intp", 0, 1, 0, 0, 2, IP }, - { "interrupt", 0, 1, 0, 0, 2, IP }, - { "intr", 0, 1, 0, 0, 2, IP }, - { "nop", "Send Telnet 'No operation'", 1, 0, 0, 2, NOP }, - { "eor", "Send Telnet 'End of Record'", 1, 0, 0, 2, EOR }, - { "abort", "Send Telnet 'Abort Process'", 1, 0, 0, 2, ABORT }, - { "susp", "Send Telnet 'Suspend Process'", 1, 0, 0, 2, SUSP }, - { "eof", "Send Telnet End of File Character", 1, 0, 0, 2, xEOF }, - { "synch", "Perform Telnet 'Synch operation'", 1, 0, dosynch, 2, 0 }, - { "getstatus", "Send request for STATUS", 1, 0, get_status, 6, 0 }, - { "?", "Display send options", 0, 0, send_help, 0, 0 }, - { "help", 0, 0, 0, send_help, 0, 0 }, - { "do", 0, 0, 1, send_docmd, 3, 0 }, - { "dont", 0, 0, 1, send_dontcmd, 3, 0 }, - { "will", 0, 0, 1, send_willcmd, 3, 0 }, - { "wont", 0, 0, 1, send_wontcmd, 3, 0 }, - { 0 } -}; - -#define GETSEND(name) ((struct sendlist *) genget(name, (char **) Sendlist, \ - sizeof(struct sendlist))) - - static int -sendcmd(argc, argv) - int argc; - char **argv; -{ - int count; /* how many bytes we are going to need to send */ - int i; - int question = 0; /* was at least one argument a question */ - struct sendlist *s; /* pointer to current command */ - int success = 0; - int needconnect = 0; - - if (argc < 2) { - printf("need at least one argument for 'send' command\n"); - printf("'send ?' for help\n"); - return 0; - } - /* - * First, validate all the send arguments. - * In addition, we see how much space we are going to need, and - * whether or not we will be doing a "SYNCH" operation (which - * flushes the network queue). - */ - count = 0; - for (i = 1; i < argc; i++) { - s = GETSEND(argv[i]); - if (s == 0) { - printf("Unknown send argument '%s'\n'send ?' for help.\n", - argv[i]); - return 0; - } else if (Ambiguous(s)) { - printf("Ambiguous send argument '%s'\n'send ?' for help.\n", - argv[i]); - return 0; - } - if (i + s->narg >= argc) { - fprintf(stderr, - "Need %d argument%s to 'send %s' command. 'send %s ?' for help.\n", - s->narg, s->narg == 1 ? "" : "s", s->name, s->name); - return 0; - } - count += s->nbyte; - if (s->handler == send_help) { - send_help(); - return 0; - } - - i += s->narg; - needconnect += s->needconnect; - } - if (!connected && needconnect) { - printf("?Need to be connected first.\n"); - printf("'send ?' for help\n"); - return 0; - } - /* Now, do we have enough room? */ - if (NETROOM() < count) { - printf("There is not enough room in the buffer TO the network\n"); - printf("to process your request. Nothing will be done.\n"); - printf("('send synch' will throw away most data in the network\n"); - printf("buffer, if this might help.)\n"); - return 0; - } - /* OK, they are all OK, now go through again and actually send */ - count = 0; - for (i = 1; i < argc; i++) { - if ((s = GETSEND(argv[i])) == 0) { - fprintf(stderr, "Telnet 'send' error - argument disappeared!\n"); - (void) quit(); - /*NOTREACHED*/ - } - if (s->handler) { - count++; - success += (*s->handler)((s->narg > 0) ? argv[i+1] : 0, - (s->narg > 1) ? argv[i+2] : 0); - i += s->narg; - } else { - NET2ADD(IAC, s->what); - printoption("SENT", IAC, s->what); - } - } - return (count == success); -} - - static int -send_esc() -{ - NETADD(escape); - return 1; -} - - static int -send_docmd(name) - char *name; -{ - return(send_tncmd(send_do, "do", name)); -} - - static int -send_dontcmd(name) - char *name; -{ - return(send_tncmd(send_dont, "dont", name)); -} - static int -send_willcmd(name) - char *name; -{ - return(send_tncmd(send_will, "will", name)); -} - static int -send_wontcmd(name) - char *name; -{ - return(send_tncmd(send_wont, "wont", name)); -} - - int -send_tncmd(func, cmd, name) - void (*func)(); - char *cmd, *name; -{ - char **cpp; - extern char *telopts[]; - register int val = 0; - - if (isprefix(name, "help") || isprefix(name, "?")) { - register int col, len; - - printf("Usage: send %s \n", cmd); - printf("\"value\" must be from 0 to 255\n"); - printf("Valid options are:\n\t"); - - col = 8; - for (cpp = telopts; *cpp; cpp++) { - len = strlen(*cpp) + 3; - if (col + len > 65) { - printf("\n\t"); - col = 8; - } - printf(" \"%s\"", *cpp); - col += len; - } - printf("\n"); - return 0; - } - cpp = (char **)genget(name, telopts, sizeof(char *)); - if (Ambiguous(cpp)) { - fprintf(stderr,"'%s': ambiguous argument ('send %s ?' for help).\n", - name, cmd); - return 0; - } - if (cpp) { - val = cpp - telopts; - } else { - register char *cp = name; - - while (*cp >= '0' && *cp <= '9') { - val *= 10; - val += *cp - '0'; - cp++; - } - if (*cp != 0) { - fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n", - name, cmd); - return 0; - } else if (val < 0 || val > 255) { - fprintf(stderr, "'%s': bad value ('send %s ?' for help).\n", - name, cmd); - return 0; - } - } - if (!connected) { - printf("?Need to be connected first.\n"); - return 0; - } - (*func)(val, 1); - return 1; -} - - static int -send_help() -{ - struct sendlist *s; /* pointer to current command */ - for (s = Sendlist; s->name; s++) { - if (s->help) - printf("%-15s %s\n", s->name, s->help); - } - return(0); -} - -/* - * The following are the routines and data structures referred - * to by the arguments to the "toggle" command. - */ - - static int -lclchars() -{ - donelclchars = 1; - return 1; -} - - static int -togdebug() -{ -#ifndef NOT43 - if (net > 0 && - (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) { - perror("setsockopt (SO_DEBUG)"); - } -#else /* NOT43 */ - if (debug) { - if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) - perror("setsockopt (SO_DEBUG)"); - } else - printf("Cannot turn off socket debugging\n"); -#endif /* NOT43 */ - return 1; -} - - - static int -togcrlf() -{ - if (crlf) { - printf("Will send carriage returns as telnet .\n"); - } else { - printf("Will send carriage returns as telnet .\n"); - } - return 1; -} - -int binmode; - - static int -togbinary(val) - int val; -{ - donebinarytoggle = 1; - - if (val >= 0) { - binmode = val; - } else { - if (my_want_state_is_will(TELOPT_BINARY) && - my_want_state_is_do(TELOPT_BINARY)) { - binmode = 1; - } else if (my_want_state_is_wont(TELOPT_BINARY) && - my_want_state_is_dont(TELOPT_BINARY)) { - binmode = 0; - } - val = binmode ? 0 : 1; - } - - if (val == 1) { - if (my_want_state_is_will(TELOPT_BINARY) && - my_want_state_is_do(TELOPT_BINARY)) { - printf("Already operating in binary mode with remote host.\n"); - } else { - printf("Negotiating binary mode with remote host.\n"); - tel_enter_binary(3); - } - } else { - if (my_want_state_is_wont(TELOPT_BINARY) && - my_want_state_is_dont(TELOPT_BINARY)) { - printf("Already in network ascii mode with remote host.\n"); - } else { - printf("Negotiating network ascii mode with remote host.\n"); - tel_leave_binary(3); - } - } - return 1; -} - - static int -togrbinary(val) - int val; -{ - donebinarytoggle = 1; - - if (val == -1) - val = my_want_state_is_do(TELOPT_BINARY) ? 0 : 1; - - if (val == 1) { - if (my_want_state_is_do(TELOPT_BINARY)) { - printf("Already receiving in binary mode.\n"); - } else { - printf("Negotiating binary mode on input.\n"); - tel_enter_binary(1); - } - } else { - if (my_want_state_is_dont(TELOPT_BINARY)) { - printf("Already receiving in network ascii mode.\n"); - } else { - printf("Negotiating network ascii mode on input.\n"); - tel_leave_binary(1); - } - } - return 1; -} - - static int -togxbinary(val) - int val; -{ - donebinarytoggle = 1; - - if (val == -1) - val = my_want_state_is_will(TELOPT_BINARY) ? 0 : 1; - - if (val == 1) { - if (my_want_state_is_will(TELOPT_BINARY)) { - printf("Already transmitting in binary mode.\n"); - } else { - printf("Negotiating binary mode on output.\n"); - tel_enter_binary(2); - } - } else { - if (my_want_state_is_wont(TELOPT_BINARY)) { - printf("Already transmitting in network ascii mode.\n"); - } else { - printf("Negotiating network ascii mode on output.\n"); - tel_leave_binary(2); - } - } - return 1; -} - - -static int togglehelp P((void)); -#if defined(AUTHENTICATION) -extern int auth_togdebug P((int)); -#endif -#ifdef ENCRYPTION -extern int EncryptAutoEnc P((int)); -extern int EncryptAutoDec P((int)); -extern int EncryptDebug P((int)); -extern int EncryptVerbose P((int)); -#endif /* ENCRYPTION */ - -struct togglelist { - char *name; /* name of toggle */ - char *help; /* help message */ - int (*handler)(); /* routine to do actual setting */ - int *variable; - char *actionexplanation; -}; - -static struct togglelist Togglelist[] = { - { "autoflush", - "flushing of output when sending interrupt characters", - 0, - &autoflush, - "flush output when sending interrupt characters" }, - { "autosynch", - "automatic sending of interrupt characters in urgent mode", - 0, - &autosynch, - "send interrupt characters in urgent mode" }, -#if defined(AUTHENTICATION) - { "autologin", - "automatic sending of login and/or authentication info", - 0, - &autologin, - "send login name and/or authentication information" }, - { "authdebug", - "Toggle authentication debugging", - auth_togdebug, - 0, - "print authentication debugging information" }, -#endif -#ifdef ENCRYPTION - { "autoencrypt", - "automatic encryption of data stream", - EncryptAutoEnc, - 0, - "automatically encrypt output" }, - { "autodecrypt", - "automatic decryption of data stream", - EncryptAutoDec, - 0, - "automatically decrypt input" }, - { "verbose_encrypt", - "Toggle verbose encryption output", - EncryptVerbose, - 0, - "print verbose encryption output" }, - { "encdebug", - "Toggle encryption debugging", - EncryptDebug, - 0, - "print encryption debugging information" }, -#endif /* ENCRYPTION */ - { "skiprc", - "don't read ~/.telnetrc file", - 0, - &skiprc, - "skip reading of ~/.telnetrc file" }, - { "binary", - "sending and receiving of binary data", - togbinary, - 0, - 0 }, - { "inbinary", - "receiving of binary data", - togrbinary, - 0, - 0 }, - { "outbinary", - "sending of binary data", - togxbinary, - 0, - 0 }, - { "crlf", - "sending carriage returns as telnet ", - togcrlf, - &crlf, - 0 }, - { "crmod", - "mapping of received carriage returns", - 0, - &crmod, - "map carriage return on output" }, - { "localchars", - "local recognition of certain control characters", - lclchars, - &localchars, - "recognize certain control characters" }, - { " ", "", 0 }, /* empty line */ -#if defined(unix) && defined(TN3270) - { "apitrace", - "(debugging) toggle tracing of API transactions", - 0, - &apitrace, - "trace API transactions" }, - { "cursesdata", - "(debugging) toggle printing of hexadecimal curses data", - 0, - &cursesdata, - "print hexadecimal representation of curses data" }, -#endif /* defined(unix) && defined(TN3270) */ - { "debug", - "debugging", - togdebug, - &debug, - "turn on socket level debugging" }, - { "netdata", - "printing of hexadecimal network data (debugging)", - 0, - &netdata, - "print hexadecimal representation of network traffic" }, - { "prettydump", - "output of \"netdata\" to user readable format (debugging)", - 0, - &prettydump, - "print user readable output for \"netdata\"" }, - { "options", - "viewing of options processing (debugging)", - 0, - &showoptions, - "show option processing" }, -#if defined(unix) - { "termdata", - "(debugging) toggle printing of hexadecimal terminal data", - 0, - &termdata, - "print hexadecimal representation of terminal traffic" }, -#endif /* defined(unix) */ - { "?", - 0, - togglehelp }, - { "help", - 0, - togglehelp }, - { 0 } -}; - - static int -togglehelp() -{ - struct togglelist *c; - - for (c = Togglelist; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s toggle %s\n", c->name, c->help); - else - printf("\n"); - } - } - printf("\n"); - printf("%-15s %s\n", "?", "display help information"); - return 0; -} - - static void -settogglehelp(set) - int set; -{ - struct togglelist *c; - - for (c = Togglelist; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s %s %s\n", c->name, set ? "enable" : "disable", - c->help); - else - printf("\n"); - } - } -} - -#define GETTOGGLE(name) (struct togglelist *) \ - genget(name, (char **) Togglelist, sizeof(struct togglelist)) - - static int -toggle(argc, argv) - int argc; - char *argv[]; -{ - int retval = 1; - char *name; - struct togglelist *c; - - if (argc < 2) { - fprintf(stderr, - "Need an argument to 'toggle' command. 'toggle ?' for help.\n"); - return 0; - } - argc--; - argv++; - while (argc--) { - name = *argv++; - c = GETTOGGLE(name); - if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('toggle ?' for help).\n", - name); - return 0; - } else if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('toggle ?' for help).\n", - name); - return 0; - } else { - if (c->variable) { - *c->variable = !*c->variable; /* invert it */ - if (c->actionexplanation) { - printf("%s %s.\n", *c->variable? "Will" : "Won't", - c->actionexplanation); - } - } - if (c->handler) { - retval &= (*c->handler)(-1); - } - } - } - return retval; -} - -/* - * The following perform the "set" command. - */ - -#ifdef USE_TERMIO -struct termio new_tc = { 0 }; -#endif - -struct setlist { - char *name; /* name */ - char *help; /* help information */ - void (*handler)(); - cc_t *charp; /* where it is located at */ -}; - -static struct setlist Setlist[] = { -#ifdef KLUDGELINEMODE - { "echo", "character to toggle local echoing on/off", 0, &echoc }, -#endif - { "escape", "character to escape back to telnet command mode", 0, &escape }, - { "rlogin", "rlogin escape character", 0, &rlogin }, - { "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile}, - { " ", "" }, - { " ", "The following need 'localchars' to be toggled true", 0, 0 }, - { "flushoutput", "character to cause an Abort Output", 0, termFlushCharp }, - { "interrupt", "character to cause an Interrupt Process", 0, termIntCharp }, - { "quit", "character to cause an Abort process", 0, termQuitCharp }, - { "eof", "character to cause an EOF ", 0, termEofCharp }, - { " ", "" }, - { " ", "The following are for local editing in linemode", 0, 0 }, - { "erase", "character to use to erase a character", 0, termEraseCharp }, - { "kill", "character to use to erase a line", 0, termKillCharp }, - { "lnext", "character to use for literal next", 0, termLiteralNextCharp }, - { "susp", "character to cause a Suspend Process", 0, termSuspCharp }, - { "reprint", "character to use for line reprint", 0, termRprntCharp }, - { "worderase", "character to use to erase a word", 0, termWerasCharp }, - { "start", "character to use for XON", 0, termStartCharp }, - { "stop", "character to use for XOFF", 0, termStopCharp }, - { "forw1", "alternate end of line character", 0, termForw1Charp }, - { "forw2", "alternate end of line character", 0, termForw2Charp }, - { "ayt", "alternate AYT character", 0, termAytCharp }, - { 0 } -}; - -#if defined(CRAY) && !defined(__STDC__) -/* Work around compiler bug in pcc 4.1.5 */ - void -_setlist_init() -{ -#ifndef KLUDGELINEMODE -#define N 5 -#else -#define N 6 -#endif - Setlist[N+0].charp = &termFlushChar; - Setlist[N+1].charp = &termIntChar; - Setlist[N+2].charp = &termQuitChar; - Setlist[N+3].charp = &termEofChar; - Setlist[N+6].charp = &termEraseChar; - Setlist[N+7].charp = &termKillChar; - Setlist[N+8].charp = &termLiteralNextChar; - Setlist[N+9].charp = &termSuspChar; - Setlist[N+10].charp = &termRprntChar; - Setlist[N+11].charp = &termWerasChar; - Setlist[N+12].charp = &termStartChar; - Setlist[N+13].charp = &termStopChar; - Setlist[N+14].charp = &termForw1Char; - Setlist[N+15].charp = &termForw2Char; - Setlist[N+16].charp = &termAytChar; -#undef N -} -#endif /* defined(CRAY) && !defined(__STDC__) */ - - static struct setlist * -getset(name) - char *name; -{ - return (struct setlist *) - genget(name, (char **) Setlist, sizeof(struct setlist)); -} - - void -set_escape_char(s) - char *s; -{ - if (rlogin != _POSIX_VDISABLE) { - rlogin = (s && *s) ? special(s) : _POSIX_VDISABLE; - printf("Telnet rlogin escape character is '%s'.\n", - control(rlogin)); - } else { - escape = (s && *s) ? special(s) : _POSIX_VDISABLE; - printf("Telnet escape character is '%s'.\n", control(escape)); - } -} - - static int -setcmd(argc, argv) - int argc; - char *argv[]; -{ - int value; - struct setlist *ct; - struct togglelist *c; - - if (argc < 2 || argc > 3) { - printf("Format is 'set Name Value'\n'set ?' for help.\n"); - return 0; - } - if ((argc == 2) && (isprefix(argv[1], "?") || isprefix(argv[1], "help"))) { - for (ct = Setlist; ct->name; ct++) - printf("%-15s %s\n", ct->name, ct->help); - printf("\n"); - settogglehelp(1); - printf("%-15s %s\n", "?", "display help information"); - return 0; - } - - ct = getset(argv[1]); - if (ct == 0) { - c = GETTOGGLE(argv[1]); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('set ?' for help).\n", - argv[1]); - return 0; - } else if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n", - argv[1]); - return 0; - } - if (c->variable) { - if ((argc == 2) || (strcmp("on", argv[2]) == 0)) - *c->variable = 1; - else if (strcmp("off", argv[2]) == 0) - *c->variable = 0; - else { - printf("Format is 'set togglename [on|off]'\n'set ?' for help.\n"); - return 0; - } - if (c->actionexplanation) { - printf("%s %s.\n", *c->variable? "Will" : "Won't", - c->actionexplanation); - } - } - if (c->handler) - (*c->handler)(1); - } else if (argc != 3) { - printf("Format is 'set Name Value'\n'set ?' for help.\n"); - return 0; - } else if (Ambiguous(ct)) { - fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n", - argv[1]); - return 0; - } else if (ct->handler) { - (*ct->handler)(argv[2]); - printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp); - } else { - if (strcmp("off", argv[2])) { - value = special(argv[2]); - } else { - value = _POSIX_VDISABLE; - } - *(ct->charp) = (cc_t)value; - printf("%s character is '%s'.\n", ct->name, control(*(ct->charp))); - } - slc_check(); - return 1; -} - - static int -unsetcmd(argc, argv) - int argc; - char *argv[]; -{ - struct setlist *ct; - struct togglelist *c; - register char *name; - - if (argc < 2) { - fprintf(stderr, - "Need an argument to 'unset' command. 'unset ?' for help.\n"); - return 0; - } - if (isprefix(argv[1], "?") || isprefix(argv[1], "help")) { - for (ct = Setlist; ct->name; ct++) - printf("%-15s %s\n", ct->name, ct->help); - printf("\n"); - settogglehelp(0); - printf("%-15s %s\n", "?", "display help information"); - return 0; - } - - argc--; - argv++; - while (argc--) { - name = *argv++; - ct = getset(name); - if (ct == 0) { - c = GETTOGGLE(name); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('unset ?' for help).\n", - name); - return 0; - } else if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n", - name); - return 0; - } - if (c->variable) { - *c->variable = 0; - if (c->actionexplanation) { - printf("%s %s.\n", *c->variable? "Will" : "Won't", - c->actionexplanation); - } - } - if (c->handler) - (*c->handler)(0); - } else if (Ambiguous(ct)) { - fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n", - name); - return 0; - } else if (ct->handler) { - (*ct->handler)(0); - printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp); - } else { - *(ct->charp) = _POSIX_VDISABLE; - printf("%s character is '%s'.\n", ct->name, control(*(ct->charp))); - } - } - return 1; -} - -/* - * The following are the data structures and routines for the - * 'mode' command. - */ -#ifdef KLUDGELINEMODE -extern int kludgelinemode; - - static int -dokludgemode() -{ - kludgelinemode = 1; - send_wont(TELOPT_LINEMODE, 1); - send_dont(TELOPT_SGA, 1); - send_dont(TELOPT_ECHO, 1); -} -#endif - - static int -dolinemode() -{ -#ifdef KLUDGELINEMODE - if (kludgelinemode) - send_dont(TELOPT_SGA, 1); -#endif - send_will(TELOPT_LINEMODE, 1); - send_dont(TELOPT_ECHO, 1); - return 1; -} - - static int -docharmode() -{ -#ifdef KLUDGELINEMODE - if (kludgelinemode) - send_do(TELOPT_SGA, 1); - else -#endif - send_wont(TELOPT_LINEMODE, 1); - send_do(TELOPT_ECHO, 1); - return 1; -} - - static int -dolmmode(bit, on) - int bit, on; -{ - unsigned char c; - extern int linemode; - - if (my_want_state_is_wont(TELOPT_LINEMODE)) { - printf("?Need to have LINEMODE option enabled first.\n"); - printf("'mode ?' for help.\n"); - return 0; - } - - if (on) - c = (linemode | bit); - else - c = (linemode & ~bit); - lm_mode(&c, 1, 1); - return 1; -} - - int -setmode(bit) -{ - return dolmmode(bit, 1); -} - - int -clearmode(bit) -{ - return dolmmode(bit, 0); -} - -struct modelist { - char *name; /* command name */ - char *help; /* help string */ - int (*handler)(); /* routine which executes command */ - int needconnect; /* Do we need to be connected to execute? */ - int arg1; -}; - -extern int modehelp(); - -static struct modelist ModeList[] = { - { "character", "Disable LINEMODE option", docharmode, 1 }, -#ifdef KLUDGELINEMODE - { "", "(or disable obsolete line-by-line mode)", 0 }, -#endif - { "line", "Enable LINEMODE option", dolinemode, 1 }, -#ifdef KLUDGELINEMODE - { "", "(or enable obsolete line-by-line mode)", 0 }, -#endif - { "", "", 0 }, - { "", "These require the LINEMODE option to be enabled", 0 }, - { "isig", "Enable signal trapping", setmode, 1, MODE_TRAPSIG }, - { "+isig", 0, setmode, 1, MODE_TRAPSIG }, - { "-isig", "Disable signal trapping", clearmode, 1, MODE_TRAPSIG }, - { "edit", "Enable character editing", setmode, 1, MODE_EDIT }, - { "+edit", 0, setmode, 1, MODE_EDIT }, - { "-edit", "Disable character editing", clearmode, 1, MODE_EDIT }, - { "softtabs", "Enable tab expansion", setmode, 1, MODE_SOFT_TAB }, - { "+softtabs", 0, setmode, 1, MODE_SOFT_TAB }, - { "-softtabs", "Disable character editing", clearmode, 1, MODE_SOFT_TAB }, - { "litecho", "Enable literal character echo", setmode, 1, MODE_LIT_ECHO }, - { "+litecho", 0, setmode, 1, MODE_LIT_ECHO }, - { "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO }, - { "help", 0, modehelp, 0 }, -#ifdef KLUDGELINEMODE - { "kludgeline", 0, dokludgemode, 1 }, -#endif - { "", "", 0 }, - { "?", "Print help information", modehelp, 0 }, - { 0 }, -}; - - - int -modehelp() -{ - struct modelist *mt; - - printf("format is: 'mode Mode', where 'Mode' is one of:\n\n"); - for (mt = ModeList; mt->name; mt++) { - if (mt->help) { - if (*mt->help) - printf("%-15s %s\n", mt->name, mt->help); - else - printf("\n"); - } - } - return 0; -} - -#define GETMODECMD(name) (struct modelist *) \ - genget(name, (char **) ModeList, sizeof(struct modelist)) - - static int -modecmd(argc, argv) - int argc; - char *argv[]; -{ - struct modelist *mt; - - if (argc != 2) { - printf("'mode' command requires an argument\n"); - printf("'mode ?' for help.\n"); - } else if ((mt = GETMODECMD(argv[1])) == 0) { - fprintf(stderr, "Unknown mode '%s' ('mode ?' for help).\n", argv[1]); - } else if (Ambiguous(mt)) { - fprintf(stderr, "Ambiguous mode '%s' ('mode ?' for help).\n", argv[1]); - } else if (mt->needconnect && !connected) { - printf("?Need to be connected first.\n"); - printf("'mode ?' for help.\n"); - } else if (mt->handler) { - return (*mt->handler)(mt->arg1); - } - return 0; -} - -/* - * The following data structures and routines implement the - * "display" command. - */ - - static int -display(argc, argv) - int argc; - char *argv[]; -{ - struct togglelist *tl; - struct setlist *sl; - -#define dotog(tl) if (tl->variable && tl->actionexplanation) { \ - if (*tl->variable) { \ - printf("will"); \ - } else { \ - printf("won't"); \ - } \ - printf(" %s.\n", tl->actionexplanation); \ - } - -#define doset(sl) if (sl->name && *sl->name != ' ') { \ - if (sl->handler == 0) \ - printf("%-15s [%s]\n", sl->name, control(*sl->charp)); \ - else \ - printf("%-15s \"%s\"\n", sl->name, (char *)sl->charp); \ - } - - if (argc == 1) { - for (tl = Togglelist; tl->name; tl++) { - dotog(tl); - } - printf("\n"); - for (sl = Setlist; sl->name; sl++) { - doset(sl); - } - } else { - int i; - - for (i = 1; i < argc; i++) { - sl = getset(argv[i]); - tl = GETTOGGLE(argv[i]); - if (Ambiguous(sl) || Ambiguous(tl)) { - printf("?Ambiguous argument '%s'.\n", argv[i]); - return 0; - } else if (!sl && !tl) { - printf("?Unknown argument '%s'.\n", argv[i]); - return 0; - } else { - if (tl) { - dotog(tl); - } - if (sl) { - doset(sl); - } - } - } - } -/*@*/optionstatus(); -#ifdef ENCRYPTION - EncryptStatus(); -#endif /* ENCRYPTION */ - return 1; -#undef doset -#undef dotog -} - -/* - * The following are the data structures, and many of the routines, - * relating to command processing. - */ - -/* - * Set the escape character. - */ - static int -setescape(argc, argv) - int argc; - char *argv[]; -{ - register char *arg; - char buf[50]; - - printf( - "Deprecated usage - please use 'set escape%s%s' in the future.\n", - (argc > 2)? " ":"", (argc > 2)? argv[1]: ""); - if (argc > 2) - arg = argv[1]; - else { - printf("new escape character: "); - (void) fgets(buf, sizeof(buf), stdin); - arg = buf; - } - if (arg[0] != '\0') - escape = arg[0]; - if (!In3270) { - printf("Escape character is '%s'.\n", control(escape)); - } - (void) fflush(stdout); - return 1; -} - - /*VARARGS*/ - static int -togcrmod() -{ - crmod = !crmod; - printf("Deprecated usage - please use 'toggle crmod' in the future.\n"); - printf("%s map carriage return on output.\n", crmod ? "Will" : "Won't"); - (void) fflush(stdout); - return 1; -} - - /*VARARGS*/ - int -suspend() -{ -#ifdef SIGTSTP - setcommandmode(); - { - long oldrows, oldcols, newrows, newcols, err; - - err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0; - (void) kill(0, SIGTSTP); - /* - * If we didn't get the window size before the SUSPEND, but we - * can get them now (?), then send the NAWS to make sure that - * we are set up for the right window size. - */ - if (TerminalWindowSize(&newrows, &newcols) && connected && - (err || ((oldrows != newrows) || (oldcols != newcols)))) { - sendnaws(); - } - } - /* reget parameters in case they were changed */ - TerminalSaveState(); - setconnmode(0); -#else - printf("Suspend is not supported. Try the '!' command instead\n"); -#endif - return 1; -} - -#if !defined(TN3270) - /*ARGSUSED*/ - int -shell(argc, argv) - int argc; - char *argv[]; -{ - long oldrows, oldcols, newrows, newcols, err; - - setcommandmode(); - - err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0; - switch(vfork()) { - case -1: - perror("Fork failed\n"); - break; - - case 0: - { - /* - * Fire up the shell in the child. - */ - register char *shellp, *shellname; - extern char *strrchr(); - - shellp = getenv("SHELL"); - if (shellp == NULL) - shellp = "/bin/sh"; - if ((shellname = strrchr(shellp, '/')) == 0) - shellname = shellp; - else - shellname++; - if (argc > 1) - execl(shellp, shellname, "-c", &saveline[1], 0); - else - execl(shellp, shellname, 0); - perror("Execl"); - _exit(1); - } - default: - (void)wait((int *)0); /* Wait for the shell to complete */ - - if (TerminalWindowSize(&newrows, &newcols) && connected && - (err || ((oldrows != newrows) || (oldcols != newcols)))) { - sendnaws(); - } - break; - } - return 1; -} -#else /* !defined(TN3270) */ -extern int shell(); -#endif /* !defined(TN3270) */ - - /*VARARGS*/ - static -bye(argc, argv) - int argc; /* Number of arguments */ - char *argv[]; /* arguments */ -{ - extern int resettermname; - - if (connected) { - (void) shutdown(net, 2); - printf("Connection closed.\n"); - (void) NetClose(net); - connected = 0; - resettermname = 1; -#if defined(AUTHENTICATION) || defined(ENCRYPTION) - auth_encrypt_connect(connected); -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ - /* reset options */ - tninit(); -#if defined(TN3270) - SetIn3270(); /* Get out of 3270 mode */ -#endif /* defined(TN3270) */ - } - if ((argc != 2) || (strcmp(argv[1], "fromquit") != 0)) { - longjmp(toplevel, 1); - /* NOTREACHED */ - } - return 1; /* Keep lint, etc., happy */ -} - -/*VARARGS*/ -quit() -{ - (void) call(bye, "bye", "fromquit", 0); - Exit(0); - /*NOTREACHED*/ -} - -/*VARARGS*/ - int -logout() -{ - send_do(TELOPT_LOGOUT, 1); - (void) netflush(); - return 1; -} - - -/* - * The SLC command. - */ - -struct slclist { - char *name; - char *help; - void (*handler)(); - int arg; -}; - -static void slc_help(); - -struct slclist SlcList[] = { - { "export", "Use local special character definitions", - slc_mode_export, 0 }, - { "import", "Use remote special character definitions", - slc_mode_import, 1 }, - { "check", "Verify remote special character definitions", - slc_mode_import, 0 }, - { "help", 0, slc_help, 0 }, - { "?", "Print help information", slc_help, 0 }, - { 0 }, -}; - - static void -slc_help() -{ - struct slclist *c; - - for (c = SlcList; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s %s\n", c->name, c->help); - else - printf("\n"); - } - } -} - - static struct slclist * -getslc(name) - char *name; -{ - return (struct slclist *) - genget(name, (char **) SlcList, sizeof(struct slclist)); -} - - static -slccmd(argc, argv) - int argc; - char *argv[]; -{ - struct slclist *c; - - if (argc != 2) { - fprintf(stderr, - "Need an argument to 'slc' command. 'slc ?' for help.\n"); - return 0; - } - c = getslc(argv[1]); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('slc ?' for help).\n", - argv[1]); - return 0; - } - if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('slc ?' for help).\n", - argv[1]); - return 0; - } - (*c->handler)(c->arg); - slcstate(); - return 1; -} - -/* - * The ENVIRON command. - */ - -struct envlist { - char *name; - char *help; - void (*handler)(); - int narg; -}; - -extern struct env_lst * - env_define P((unsigned char *, unsigned char *)); -extern void - env_undefine P((unsigned char *)), - env_export P((unsigned char *)), - env_unexport P((unsigned char *)), - env_send P((unsigned char *)), -#if defined(OLD_ENVIRON) && defined(ENV_HACK) - env_varval P((unsigned char *)), -#endif - env_list P((void)); -static void - env_help P((void)); - -struct envlist EnvList[] = { - { "define", "Define an environment variable", - (void (*)())env_define, 2 }, - { "undefine", "Undefine an environment variable", - env_undefine, 1 }, - { "export", "Mark an environment variable for automatic export", - env_export, 1 }, - { "unexport", "Don't mark an environment variable for automatic export", - env_unexport, 1 }, - { "send", "Send an environment variable", env_send, 1 }, - { "list", "List the current environment variables", - env_list, 0 }, -#if defined(OLD_ENVIRON) && defined(ENV_HACK) - { "varval", "Reverse VAR and VALUE (auto, right, wrong, status)", - env_varval, 1 }, -#endif - { "help", 0, env_help, 0 }, - { "?", "Print help information", env_help, 0 }, - { 0 }, -}; - - static void -env_help() -{ - struct envlist *c; - - for (c = EnvList; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s %s\n", c->name, c->help); - else - printf("\n"); - } - } -} - - static struct envlist * -getenvcmd(name) - char *name; -{ - return (struct envlist *) - genget(name, (char **) EnvList, sizeof(struct envlist)); -} - -env_cmd(argc, argv) - int argc; - char *argv[]; -{ - struct envlist *c; - - if (argc < 2) { - fprintf(stderr, - "Need an argument to 'environ' command. 'environ ?' for help.\n"); - return 0; - } - c = getenvcmd(argv[1]); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('environ ?' for help).\n", - argv[1]); - return 0; - } - if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('environ ?' for help).\n", - argv[1]); - return 0; - } - if (c->narg + 2 != argc) { - fprintf(stderr, - "Need %s%d argument%s to 'environ %s' command. 'environ ?' for help.\n", - c->narg < argc + 2 ? "only " : "", - c->narg, c->narg == 1 ? "" : "s", c->name); - return 0; - } - (*c->handler)(argv[2], argv[3]); - return 1; -} - -struct env_lst { - struct env_lst *next; /* pointer to next structure */ - struct env_lst *prev; /* pointer to previous structure */ - unsigned char *var; /* pointer to variable name */ - unsigned char *value; /* pointer to variable value */ - int export; /* 1 -> export with default list of variables */ - int welldefined; /* A well defined variable */ -}; - -struct env_lst envlisthead; - - struct env_lst * -env_find(var) - unsigned char *var; -{ - register struct env_lst *ep; - - for (ep = envlisthead.next; ep; ep = ep->next) { - if (strcmp((char *)ep->var, (char *)var) == 0) - return(ep); - } - return(NULL); -} - - void -env_init() -{ - extern char **environ; - register char **epp, *cp; - register struct env_lst *ep; - extern char *strchr(); - - for (epp = environ; *epp; epp++) { - if (cp = strchr(*epp, '=')) { - *cp = '\0'; - ep = env_define((unsigned char *)*epp, - (unsigned char *)cp+1); - ep->export = 0; - *cp = '='; - } - } - /* - * Special case for DISPLAY variable. If it is ":0.0" or - * "unix:0.0", we have to get rid of "unix" and insert our - * hostname. - */ - if ((ep = env_find("DISPLAY")) - && ((*ep->value == ':') - || (strncmp((char *)ep->value, "unix:", 5) == 0))) { - char hbuf[256+1]; - char *cp2 = strchr((char *)ep->value, ':'); - - gethostname(hbuf, 256); - hbuf[256] = '\0'; - cp = (char *)malloc(strlen(hbuf) + strlen(cp2) + 1); - sprintf((char *)cp, "%s%s", hbuf, cp2); - free(ep->value); - ep->value = (unsigned char *)cp; - } - /* - * If USER is not defined, but LOGNAME is, then add - * USER with the value from LOGNAME. By default, we - * don't export the USER variable. - */ - if ((env_find("USER") == NULL) && (ep = env_find("LOGNAME"))) { - env_define((unsigned char *)"USER", ep->value); - env_unexport((unsigned char *)"USER"); - } - env_export((unsigned char *)"DISPLAY"); - env_export((unsigned char *)"PRINTER"); -} - - struct env_lst * -env_define(var, value) - unsigned char *var, *value; -{ - register struct env_lst *ep; - - if (ep = env_find(var)) { - if (ep->var) - free(ep->var); - if (ep->value) - free(ep->value); - } else { - ep = (struct env_lst *)malloc(sizeof(struct env_lst)); - ep->next = envlisthead.next; - envlisthead.next = ep; - ep->prev = &envlisthead; - if (ep->next) - ep->next->prev = ep; - } - ep->welldefined = opt_welldefined(var); - ep->export = 1; - ep->var = (unsigned char *)strdup((char *)var); - ep->value = (unsigned char *)strdup((char *)value); - return(ep); -} - - void -env_undefine(var) - unsigned char *var; -{ - register struct env_lst *ep; - - if (ep = env_find(var)) { - ep->prev->next = ep->next; - if (ep->next) - ep->next->prev = ep->prev; - if (ep->var) - free(ep->var); - if (ep->value) - free(ep->value); - free(ep); - } -} - - void -env_export(var) - unsigned char *var; -{ - register struct env_lst *ep; - - if (ep = env_find(var)) - ep->export = 1; -} - - void -env_unexport(var) - unsigned char *var; -{ - register struct env_lst *ep; - - if (ep = env_find(var)) - ep->export = 0; -} - - void -env_send(var) - unsigned char *var; -{ - register struct env_lst *ep; - - if (my_state_is_wont(TELOPT_NEW_ENVIRON) -#ifdef OLD_ENVIRON - && my_state_is_wont(TELOPT_OLD_ENVIRON) -#endif - ) { - fprintf(stderr, - "Cannot send '%s': Telnet ENVIRON option not enabled\n", - var); - return; - } - ep = env_find(var); - if (ep == 0) { - fprintf(stderr, "Cannot send '%s': variable not defined\n", - var); - return; - } - env_opt_start_info(); - env_opt_add(ep->var); - env_opt_end(0); -} - - void -env_list() -{ - register struct env_lst *ep; - - for (ep = envlisthead.next; ep; ep = ep->next) { - printf("%c %-20s %s\n", ep->export ? '*' : ' ', - ep->var, ep->value); - } -} - - unsigned char * -env_default(init, welldefined) - int init; -{ - static struct env_lst *nep = NULL; - - if (init) { - nep = &envlisthead; - return; - } - if (nep) { - while (nep = nep->next) { - if (nep->export && (nep->welldefined == welldefined)) - return(nep->var); - } - } - return(NULL); -} - - unsigned char * -env_getvalue(var) - unsigned char *var; -{ - register struct env_lst *ep; - - if (ep = env_find(var)) - return(ep->value); - return(NULL); -} - -#if defined(OLD_ENVIRON) && defined(ENV_HACK) - void -env_varval(what) - unsigned char *what; -{ - extern int old_env_var, old_env_value, env_auto; - int len = strlen((char *)what); - - if (len == 0) - goto unknown; - - if (strncasecmp((char *)what, "status", len) == 0) { - if (env_auto) - printf("%s%s", "VAR and VALUE are/will be ", - "determined automatically\n"); - if (old_env_var == OLD_ENV_VAR) - printf("VAR and VALUE set to correct definitions\n"); - else - printf("VAR and VALUE definitions are reversed\n"); - } else if (strncasecmp((char *)what, "auto", len) == 0) { - env_auto = 1; - old_env_var = OLD_ENV_VALUE; - old_env_value = OLD_ENV_VAR; - } else if (strncasecmp((char *)what, "right", len) == 0) { - env_auto = 0; - old_env_var = OLD_ENV_VAR; - old_env_value = OLD_ENV_VALUE; - } else if (strncasecmp((char *)what, "wrong", len) == 0) { - env_auto = 0; - old_env_var = OLD_ENV_VALUE; - old_env_value = OLD_ENV_VAR; - } else { -unknown: - printf("Unknown \"varval\" command. (\"auto\", \"right\", \"wrong\", \"status\")\n"); - } -} -#endif - -#if defined(AUTHENTICATION) -/* - * The AUTHENTICATE command. - */ - -struct authlist { - char *name; - char *help; - int (*handler)(); - int narg; -}; - -extern int - auth_enable P((char *)), - auth_disable P((char *)), - auth_status P((void)); -static int - auth_help P((void)); - -struct authlist AuthList[] = { - { "status", "Display current status of authentication information", - auth_status, 0 }, - { "disable", "Disable an authentication type ('auth disable ?' for more)", - auth_disable, 1 }, - { "enable", "Enable an authentication type ('auth enable ?' for more)", - auth_enable, 1 }, - { "help", 0, auth_help, 0 }, - { "?", "Print help information", auth_help, 0 }, - { 0 }, -}; - - static int -auth_help() -{ - struct authlist *c; - - for (c = AuthList; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s %s\n", c->name, c->help); - else - printf("\n"); - } - } - return 0; -} - -auth_cmd(argc, argv) - int argc; - char *argv[]; -{ - struct authlist *c; - - if (argc < 2) { - fprintf(stderr, - "Need an argument to 'auth' command. 'auth ?' for help.\n"); - return 0; - } - - c = (struct authlist *) - genget(argv[1], (char **) AuthList, sizeof(struct authlist)); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('auth ?' for help).\n", - argv[1]); - return 0; - } - if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('auth ?' for help).\n", - argv[1]); - return 0; - } - if (c->narg + 2 != argc) { - fprintf(stderr, - "Need %s%d argument%s to 'auth %s' command. 'auth ?' for help.\n", - c->narg < argc + 2 ? "only " : "", - c->narg, c->narg == 1 ? "" : "s", c->name); - return 0; - } - return((*c->handler)(argv[2], argv[3])); -} -#endif - -#ifdef ENCRYPTION -/* - * The ENCRYPT command. - */ - -struct encryptlist { - char *name; - char *help; - int (*handler)(); - int needconnect; - int minarg; - int maxarg; -}; - -extern int - EncryptEnable P((char *, char *)), - EncryptDisable P((char *, char *)), - EncryptType P((char *, char *)), - EncryptStart P((char *)), - EncryptStartInput P((void)), - EncryptStartOutput P((void)), - EncryptStop P((char *)), - EncryptStopInput P((void)), - EncryptStopOutput P((void)), - EncryptStatus P((void)); -static int - EncryptHelp P((void)); - -struct encryptlist EncryptList[] = { - { "enable", "Enable encryption. ('encrypt enable ?' for more)", - EncryptEnable, 1, 1, 2 }, - { "disable", "Disable encryption. ('encrypt enable ?' for more)", - EncryptDisable, 0, 1, 2 }, - { "type", "Set encryption type. ('encrypt type ?' for more)", - EncryptType, 0, 1, 1 }, - { "start", "Start encryption. ('encrypt start ?' for more)", - EncryptStart, 1, 0, 1 }, - { "stop", "Stop encryption. ('encrypt stop ?' for more)", - EncryptStop, 1, 0, 1 }, - { "input", "Start encrypting the input stream", - EncryptStartInput, 1, 0, 0 }, - { "-input", "Stop encrypting the input stream", - EncryptStopInput, 1, 0, 0 }, - { "output", "Start encrypting the output stream", - EncryptStartOutput, 1, 0, 0 }, - { "-output", "Stop encrypting the output stream", - EncryptStopOutput, 1, 0, 0 }, - - { "status", "Display current status of authentication information", - EncryptStatus, 0, 0, 0 }, - { "help", 0, EncryptHelp, 0, 0, 0 }, - { "?", "Print help information", EncryptHelp, 0, 0, 0 }, - { 0 }, -}; - - static int -EncryptHelp() -{ - struct encryptlist *c; - - for (c = EncryptList; c->name; c++) { - if (c->help) { - if (*c->help) - printf("%-15s %s\n", c->name, c->help); - else - printf("\n"); - } - } - return 0; -} - -encrypt_cmd(argc, argv) - int argc; - char *argv[]; -{ - struct encryptlist *c; - - if (argc < 2) { - fprintf(stderr, - "Need an argument to 'encrypt' command. 'encrypt ?' for help.\n"); - return 0; - } - - c = (struct encryptlist *) - genget(argv[1], (char **) EncryptList, sizeof(struct encryptlist)); - if (c == 0) { - fprintf(stderr, "'%s': unknown argument ('encrypt ?' for help).\n", - argv[1]); - return 0; - } - if (Ambiguous(c)) { - fprintf(stderr, "'%s': ambiguous argument ('encrypt ?' for help).\n", - argv[1]); - return 0; - } - argc -= 2; - if (argc < c->minarg || argc > c->maxarg) { - if (c->minarg == c->maxarg) { - fprintf(stderr, "Need %s%d argument%s ", - c->minarg < argc ? "only " : "", c->minarg, - c->minarg == 1 ? "" : "s"); - } else { - fprintf(stderr, "Need %s%d-%d arguments ", - c->maxarg < argc ? "only " : "", c->minarg, c->maxarg); - } - fprintf(stderr, "to 'encrypt %s' command. 'encrypt ?' for help.\n", - c->name); - return 0; - } - if (c->needconnect && !connected) { - if (!(argc && (isprefix(argv[2], "help") || isprefix(argv[2], "?")))) { - printf("?Need to be connected first.\n"); - return 0; - } - } - return ((*c->handler)(argc > 0 ? argv[2] : 0, - argc > 1 ? argv[3] : 0, - argc > 2 ? argv[4] : 0)); -} -#endif /* ENCRYPTION */ - -#if defined(unix) && defined(TN3270) - static void -filestuff(fd) - int fd; -{ - int res; - -#ifdef F_GETOWN - setconnmode(0); - res = fcntl(fd, F_GETOWN, 0); - setcommandmode(); - - if (res == -1) { - perror("fcntl"); - return; - } - printf("\tOwner is %d.\n", res); -#endif - - setconnmode(0); - res = fcntl(fd, F_GETFL, 0); - setcommandmode(); - - if (res == -1) { - perror("fcntl"); - return; - } -#ifdef notdef - printf("\tFlags are 0x%x: %s\n", res, decodeflags(res)); -#endif -} -#endif /* defined(unix) && defined(TN3270) */ - -/* - * Print status about the connection. - */ - /*ARGSUSED*/ - static -status(argc, argv) - int argc; - char *argv[]; -{ - if (connected) { - printf("Connected to %s.\n", hostname); - if ((argc < 2) || strcmp(argv[1], "notmuch")) { - int mode = getconnmode(); - - if (my_want_state_is_will(TELOPT_LINEMODE)) { - printf("Operating with LINEMODE option\n"); - printf("%s line editing\n", (mode&MODE_EDIT) ? "Local" : "No"); - printf("%s catching of signals\n", - (mode&MODE_TRAPSIG) ? "Local" : "No"); - slcstate(); -#ifdef KLUDGELINEMODE - } else if (kludgelinemode && my_want_state_is_dont(TELOPT_SGA)) { - printf("Operating in obsolete linemode\n"); -#endif - } else { - printf("Operating in single character mode\n"); - if (localchars) - printf("Catching signals locally\n"); - } - printf("%s character echo\n", (mode&MODE_ECHO) ? "Local" : "Remote"); - if (my_want_state_is_will(TELOPT_LFLOW)) - printf("%s flow control\n", (mode&MODE_FLOW) ? "Local" : "No"); -#ifdef ENCRYPTION - encrypt_display(); -#endif /* ENCRYPTION */ - } - } else { - printf("No connection.\n"); - } -# if !defined(TN3270) - printf("Escape character is '%s'.\n", control(escape)); - (void) fflush(stdout); -# else /* !defined(TN3270) */ - if ((!In3270) && ((argc < 2) || strcmp(argv[1], "notmuch"))) { - printf("Escape character is '%s'.\n", control(escape)); - } -# if defined(unix) - if ((argc >= 2) && !strcmp(argv[1], "everything")) { - printf("SIGIO received %d time%s.\n", - sigiocount, (sigiocount == 1)? "":"s"); - if (In3270) { - printf("Process ID %d, process group %d.\n", - getpid(), getpgrp(getpid())); - printf("Terminal input:\n"); - filestuff(tin); - printf("Terminal output:\n"); - filestuff(tout); - printf("Network socket:\n"); - filestuff(net); - } - } - if (In3270 && transcom) { - printf("Transparent mode command is '%s'.\n", transcom); - } -# endif /* defined(unix) */ - (void) fflush(stdout); - if (In3270) { - return 0; - } -# endif /* defined(TN3270) */ - return 1; -} - -#ifdef SIGINFO -/* - * Function that gets called when SIGINFO is received. - */ -ayt_status() -{ - (void) call(status, "status", "notmuch", 0); -} -#endif - -unsigned long inet_addr(); - - int -tn(argc, argv) - int argc; - char *argv[]; -{ - register struct hostent *host = 0; - struct sockaddr_in sin; - struct servent *sp = 0; - unsigned long temp; - extern char *inet_ntoa(); -#if defined(IP_OPTIONS) && defined(IPPROTO_IP) - char *srp = 0, *strrchr(); - unsigned long sourceroute(), srlen; -#endif - char *cmd, *hostp = 0, *portp = 0, *user = 0; - - /* clear the socket address prior to use */ - memset((char *)&sin, 0, sizeof(sin)); - - if (connected) { - printf("?Already connected to %s\n", hostname); - setuid(getuid()); - return 0; - } - if (argc < 2) { - (void) strcpy(line, "open "); - printf("(to) "); - (void) fgets(&line[strlen(line)], sizeof(line) - strlen(line), stdin); - makeargv(); - argc = margc; - argv = margv; - } - cmd = *argv; - --argc; ++argv; - while (argc) { - if (strcmp(*argv, "help") == 0 || isprefix(*argv, "?")) - goto usage; - if (strcmp(*argv, "-l") == 0) { - --argc; ++argv; - if (argc == 0) - goto usage; - user = *argv++; - --argc; - continue; - } - if (strcmp(*argv, "-a") == 0) { - --argc; ++argv; - autologin = 1; - continue; - } - if (hostp == 0) { - hostp = *argv++; - --argc; - continue; - } - if (portp == 0) { - portp = *argv++; - --argc; - continue; - } - usage: - printf("usage: %s [-l user] [-a] host-name [port]\n", cmd); - setuid(getuid()); - return 0; - } - if (hostp == 0) - goto usage; - -#if defined(IP_OPTIONS) && defined(IPPROTO_IP) - if (hostp[0] == '@' || hostp[0] == '!') { - if ((hostname = strrchr(hostp, ':')) == NULL) - hostname = strrchr(hostp, '@'); - hostname++; - srp = 0; - temp = sourceroute(hostp, &srp, &srlen); - if (temp == 0) { - herror(srp); - setuid(getuid()); - return 0; - } else if (temp == -1) { - printf("Bad source route option: %s\n", hostp); - setuid(getuid()); - return 0; - } else { - sin.sin_addr.s_addr = temp; - sin.sin_family = AF_INET; - } - } else { -#endif - temp = inet_addr(hostp); - if (temp != INADDR_NONE) { - sin.sin_addr.s_addr = temp; - sin.sin_family = AF_INET; - host = gethostbyaddr((char *)&temp, sizeof(temp), AF_INET); - if (host) - (void) strncpy(_hostname, host->h_name, sizeof(_hostname)); - else - (void) strncpy(_hostname, hostp, sizeof(_hostname)); - _hostname[sizeof(_hostname)-1] = '\0'; - hostname = _hostname; - } else { - host = gethostbyname(hostp); - if (host) { - sin.sin_family = host->h_addrtype; -#if defined(h_addr) /* In 4.3, this is a #define */ - memmove((caddr_t)&sin.sin_addr, - host->h_addr_list[0], host->h_length); -#else /* defined(h_addr) */ - memmove((caddr_t)&sin.sin_addr, host->h_addr, host->h_length); -#endif /* defined(h_addr) */ - strncpy(_hostname, host->h_name, sizeof(_hostname)); - _hostname[sizeof(_hostname)-1] = '\0'; - hostname = _hostname; - } else { - herror(hostp); - setuid(getuid()); - return 0; - } - } -#if defined(IP_OPTIONS) && defined(IPPROTO_IP) - } -#endif - if (portp) { - if (*portp == '-') { - portp++; - telnetport = 1; - } else - telnetport = 0; - sin.sin_port = atoi(portp); - if (sin.sin_port == 0) { - sp = getservbyname(portp, "tcp"); - if (sp) - sin.sin_port = sp->s_port; - else { - printf("%s: bad port number\n", portp); - setuid(getuid()); - return 0; - } - } else { -#if !defined(htons) - u_short htons P((unsigned short)); -#endif /* !defined(htons) */ - sin.sin_port = htons(sin.sin_port); - } - } else { - if (sp == 0) { - sp = getservbyname("telnet", "tcp"); - if (sp == 0) { - fprintf(stderr, "telnet: tcp/telnet: unknown service\n"); - setuid(getuid()); - return 0; - } - sin.sin_port = sp->s_port; - } - telnetport = 1; - } - printf("Trying %s...\n", inet_ntoa(sin.sin_addr)); - do { - net = socket(AF_INET, SOCK_STREAM, 0); - setuid(getuid()); - if (net < 0) { - perror("telnet: socket"); - return 0; - } -#if defined(IP_OPTIONS) && defined(IPPROTO_IP) - if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0) - perror("setsockopt (IP_OPTIONS)"); -#endif -#if defined(IPPROTO_IP) && defined(IP_TOS) - { -# if defined(HAS_GETTOS) - struct tosent *tp; - if (tos < 0 && (tp = gettosbyname("telnet", "tcp"))) - tos = tp->t_tos; -# endif - if (tos < 0) - tos = 020; /* Low Delay bit */ - if (tos - && (setsockopt(net, IPPROTO_IP, IP_TOS, - (char *)&tos, sizeof(int)) < 0) - && (errno != ENOPROTOOPT)) - perror("telnet: setsockopt (IP_TOS) (ignored)"); - } -#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - - if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) { - perror("setsockopt (SO_DEBUG)"); - } - - if (connect(net, (struct sockaddr *)&sin, sizeof (sin)) < 0) { -#if defined(h_addr) /* In 4.3, this is a #define */ - if (host && host->h_addr_list[1]) { - int oerrno = errno; - - fprintf(stderr, "telnet: connect to address %s: ", - inet_ntoa(sin.sin_addr)); - errno = oerrno; - perror((char *)0); - host->h_addr_list++; - memmove((caddr_t)&sin.sin_addr, - host->h_addr_list[0], host->h_length); - (void) NetClose(net); - continue; - } -#endif /* defined(h_addr) */ - perror("telnet: Unable to connect to remote host"); - return 0; - } - connected++; -#if defined(AUTHENTICATION) || defined(ENCRYPTION) - auth_encrypt_connect(connected); -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ - } while (connected == 0); - cmdrc(hostp, hostname); - if (autologin && user == NULL) { - struct passwd *pw; - - user = getenv("USER"); - if (user == NULL || - (pw = getpwnam(user)) && pw->pw_uid != getuid()) { - if (pw = getpwuid(getuid())) - user = pw->pw_name; - else - user = NULL; - } - } - if (user) { - env_define((unsigned char *)"USER", (unsigned char *)user); - env_export((unsigned char *)"USER"); - } - (void) call(status, "status", "notmuch", 0); - if (setjmp(peerdied) == 0) - telnet(user); - (void) NetClose(net); - ExitString("Connection closed by foreign host.\n",1); - /*NOTREACHED*/ -} - -#define HELPINDENT (sizeof ("connect")) - -static char - openhelp[] = "connect to a site", - closehelp[] = "close current connection", - logouthelp[] = "forcibly logout remote user and close the connection", - quithelp[] = "exit telnet", - statushelp[] = "print status information", - helphelp[] = "print help information", - sendhelp[] = "transmit special characters ('send ?' for more)", - sethelp[] = "set operating parameters ('set ?' for more)", - unsethelp[] = "unset operating parameters ('unset ?' for more)", - togglestring[] ="toggle operating parameters ('toggle ?' for more)", - slchelp[] = "change state of special charaters ('slc ?' for more)", - displayhelp[] = "display operating parameters", -#if defined(TN3270) && defined(unix) - transcomhelp[] = "specify Unix command for transparent mode pipe", -#endif /* defined(TN3270) && defined(unix) */ -#if defined(AUTHENTICATION) - authhelp[] = "turn on (off) authentication ('auth ?' for more)", -#endif -#ifdef ENCRYPTION - encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)", -#endif /* ENCRYPTION */ -#if defined(unix) - zhelp[] = "suspend telnet", -#endif /* defined(unix) */ -#if defined(SKEY) - skeyhelp[] = "compute response to s/key challenge", -#endif - shellhelp[] = "invoke a subshell", - envhelp[] = "change environment variables ('environ ?' for more)", - modestring[] = "try to enter line or character mode ('mode ?' for more)"; - -static int help(); - -static Command cmdtab[] = { - { "close", closehelp, bye, 1 }, - { "logout", logouthelp, logout, 1 }, - { "display", displayhelp, display, 0 }, - { "mode", modestring, modecmd, 0 }, - { "open", openhelp, tn, 0 }, - { "quit", quithelp, quit, 0 }, - { "send", sendhelp, sendcmd, 0 }, - { "set", sethelp, setcmd, 0 }, - { "unset", unsethelp, unsetcmd, 0 }, - { "status", statushelp, status, 0 }, - { "toggle", togglestring, toggle, 0 }, - { "slc", slchelp, slccmd, 0 }, -#if defined(TN3270) && defined(unix) - { "transcom", transcomhelp, settranscom, 0 }, -#endif /* defined(TN3270) && defined(unix) */ -#if defined(AUTHENTICATION) - { "auth", authhelp, auth_cmd, 0 }, -#endif -#ifdef ENCRYPTION - { "encrypt", encrypthelp, encrypt_cmd, 0 }, -#endif /* ENCRYPTION */ -#if defined(unix) - { "z", zhelp, suspend, 0 }, -#endif /* defined(unix) */ -#if defined(TN3270) - { "!", shellhelp, shell, 1 }, -#else - { "!", shellhelp, shell, 0 }, -#endif - { "environ", envhelp, env_cmd, 0 }, - { "?", helphelp, help, 0 }, -#if defined(SKEY) - { "skey", skeyhelp, skey_calc, 0 }, -#endif - 0 -}; - -static char crmodhelp[] = "deprecated command -- use 'toggle crmod' instead"; -static char escapehelp[] = "deprecated command -- use 'set escape' instead"; - -static Command cmdtab2[] = { - { "help", 0, help, 0 }, - { "escape", escapehelp, setescape, 0 }, - { "crmod", crmodhelp, togcrmod, 0 }, - 0 -}; - - -/* - * Call routine with argc, argv set from args (terminated by 0). - */ - - /*VARARGS1*/ - static -call(va_alist) - va_dcl -{ - va_list ap; - typedef int (*intrtn_t)(); - intrtn_t routine; - char *args[100]; - int argno = 0; - - va_start(ap); - routine = (va_arg(ap, intrtn_t)); - while ((args[argno++] = va_arg(ap, char *)) != 0) { - ; - } - va_end(ap); - return (*routine)(argno-1, args); -} - - - static Command * -getcmd(name) - char *name; -{ - Command *cm; - - if (cm = (Command *) genget(name, (char **) cmdtab, sizeof(Command))) - return cm; - return (Command *) genget(name, (char **) cmdtab2, sizeof(Command)); -} - - void -command(top, tbuf, cnt) - int top; - char *tbuf; - int cnt; -{ - register Command *c; - - setcommandmode(); - if (!top) { - putchar('\n'); -#if defined(unix) - } else { - (void) signal(SIGINT, SIG_DFL); - (void) signal(SIGQUIT, SIG_DFL); -#endif /* defined(unix) */ - } - for (;;) { - if (rlogin == _POSIX_VDISABLE) - printf("%s> ", prompt); - if (tbuf) { - register char *cp; - cp = line; - while (cnt > 0 && (*cp++ = *tbuf++) != '\n') - cnt--; - tbuf = 0; - if (cp == line || *--cp != '\n' || cp == line) - goto getline; - *cp = '\0'; - if (rlogin == _POSIX_VDISABLE) - printf("%s\n", line); - } else { - getline: - if (rlogin != _POSIX_VDISABLE) - printf("%s> ", prompt); - if (fgets(line, sizeof(line), stdin) == NULL) { - if (feof(stdin) || ferror(stdin)) { - (void) quit(); - /*NOTREACHED*/ - } - break; - } - } - if (line[0] == 0) - break; - makeargv(); - if (margv[0] == 0) { - break; - } - c = getcmd(margv[0]); - if (Ambiguous(c)) { - printf("?Ambiguous command\n"); - continue; - } - if (c == 0) { - printf("?Invalid command\n"); - continue; - } - if (c->needconnect && !connected) { - printf("?Need to be connected first.\n"); - continue; - } - if ((*c->handler)(margc, margv)) { - break; - } - } - if (!top) { - if (!connected) { - longjmp(toplevel, 1); - /*NOTREACHED*/ - } -#if defined(TN3270) - if (shell_active == 0) { - setconnmode(0); - } -#else /* defined(TN3270) */ - setconnmode(0); -#endif /* defined(TN3270) */ - } -} - -/* - * Help command. - */ - static -help(argc, argv) - int argc; - char *argv[]; -{ - register Command *c; - - if (argc == 1) { - printf("Commands may be abbreviated. Commands are:\n\n"); - for (c = cmdtab; c->name; c++) - if (c->help) { - printf("%-*s\t%s\n", HELPINDENT, c->name, - c->help); - } - return 0; - } - while (--argc > 0) { - register char *arg; - arg = *++argv; - c = getcmd(arg); - if (Ambiguous(c)) - printf("?Ambiguous help command %s\n", arg); - else if (c == (Command *)0) - printf("?Invalid help command %s\n", arg); - else - printf("%s\n", c->help); - } - return 0; -} - -static char *rcname = 0; -static char rcbuf[128]; - -cmdrc(m1, m2) - char *m1, *m2; -{ - register Command *c; - FILE *rcfile; - int gotmachine = 0; - int l1 = strlen(m1); - int l2 = strlen(m2); - char m1save[64]; - - if (skiprc) - return; - - strcpy(m1save, m1); - m1 = m1save; - - if (rcname == 0) { - rcname = getenv("HOME"); - if (rcname && (strlen(rcname) + 10) < sizeof(rcbuf)) - strcpy(rcbuf, rcname); - else - rcbuf[0] = '\0'; - strcat(rcbuf, "/.telnetrc"); - rcname = rcbuf; - } - - if ((rcfile = fopen(rcname, "r")) == 0) { - return; - } - - for (;;) { - if (fgets(line, sizeof(line), rcfile) == NULL) - break; - if (line[0] == 0) - break; - if (line[0] == '#') - continue; - if (gotmachine) { - if (!isspace(line[0])) - gotmachine = 0; - } - if (gotmachine == 0) { - if (isspace(line[0])) - continue; - if (strncasecmp(line, m1, l1) == 0) - strncpy(line, &line[l1], sizeof(line) - l1); - else if (strncasecmp(line, m2, l2) == 0) - strncpy(line, &line[l2], sizeof(line) - l2); - else if (strncasecmp(line, "DEFAULT", 7) == 0) - strncpy(line, &line[7], sizeof(line) - 7); - else - continue; - if (line[0] != ' ' && line[0] != '\t' && line[0] != '\n') - continue; - gotmachine = 1; - } - makeargv(); - if (margv[0] == 0) - continue; - c = getcmd(margv[0]); - if (Ambiguous(c)) { - printf("?Ambiguous command: %s\n", margv[0]); - continue; - } - if (c == 0) { - printf("?Invalid command: %s\n", margv[0]); - continue; - } - /* - * This should never happen... - */ - if (c->needconnect && !connected) { - printf("?Need to be connected first for %s.\n", margv[0]); - continue; - } - (*c->handler)(margc, margv); - } - fclose(rcfile); -} - -#if defined(IP_OPTIONS) && defined(IPPROTO_IP) - -/* - * Source route is handed in as - * [!]@hop1@hop2...[@|:]dst - * If the leading ! is present, it is a - * strict source route, otherwise it is - * assmed to be a loose source route. - * - * We fill in the source route option as - * hop1,hop2,hop3...dest - * and return a pointer to hop1, which will - * be the address to connect() to. - * - * Arguments: - * arg: pointer to route list to decipher - * - * cpp: If *cpp is not equal to NULL, this is a - * pointer to a pointer to a character array - * that should be filled in with the option. - * - * lenp: pointer to an integer that contains the - * length of *cpp if *cpp != NULL. - * - * Return values: - * - * Returns the address of the host to connect to. If the - * return value is -1, there was a syntax error in the - * option, either unknown characters, or too many hosts. - * If the return value is 0, one of the hostnames in the - * path is unknown, and *cpp is set to point to the bad - * hostname. - * - * *cpp: If *cpp was equal to NULL, it will be filled - * in with a pointer to our static area that has - * the option filled in. This will be 32bit aligned. - * - * *lenp: This will be filled in with how long the option - * pointed to by *cpp is. - * - */ - unsigned long -sourceroute(arg, cpp, lenp) - char *arg; - char **cpp; - int *lenp; -{ - static char lsr[44]; -#ifdef sysV88 - static IOPTN ipopt; -#endif - char *cp, *cp2, *lsrp, *lsrep; - register int tmp; - struct in_addr sin_addr; - register struct hostent *host = 0; - register char c; - - /* - * Verify the arguments, and make sure we have - * at least 7 bytes for the option. - */ - if (cpp == NULL || lenp == NULL) - return((unsigned long)-1); - if (*cpp != NULL && *lenp < 7) - return((unsigned long)-1); - /* - * Decide whether we have a buffer passed to us, - * or if we need to use our own static buffer. - */ - if (*cpp) { - lsrp = *cpp; - lsrep = lsrp + *lenp; - } else { - *cpp = lsrp = lsr; - lsrep = lsrp + 44; - } - - cp = arg; - - /* - * Next, decide whether we have a loose source - * route or a strict source route, and fill in - * the begining of the option. - */ -#ifndef sysV88 - if (*cp == '!') { - cp++; - *lsrp++ = IPOPT_SSRR; - } else - *lsrp++ = IPOPT_LSRR; -#else - if (*cp == '!') { - cp++; - ipopt.io_type = IPOPT_SSRR; - } else - ipopt.io_type = IPOPT_LSRR; -#endif - - if (*cp != '@') - return((unsigned long)-1); - -#ifndef sysV88 - lsrp++; /* skip over length, we'll fill it in later */ - *lsrp++ = 4; -#endif - - cp++; - - sin_addr.s_addr = 0; - - for (c = 0;;) { - if (c == ':') - cp2 = 0; - else for (cp2 = cp; c = *cp2; cp2++) { - if (c == ',') { - *cp2++ = '\0'; - if (*cp2 == '@') - cp2++; - } else if (c == '@') { - *cp2++ = '\0'; - } else if (c == ':') { - *cp2++ = '\0'; - } else - continue; - break; - } - if (!c) - cp2 = 0; - - if ((tmp = inet_addr(cp)) != -1) { - sin_addr.s_addr = tmp; - } else if (host = gethostbyname(cp)) { -#if defined(h_addr) - memmove((caddr_t)&sin_addr, - host->h_addr_list[0], host->h_length); -#else - memmove((caddr_t)&sin_addr, host->h_addr, host->h_length); -#endif - } else { - *cpp = cp; - return(0); - } - memmove(lsrp, (char *)&sin_addr, 4); - lsrp += 4; - if (cp2) - cp = cp2; - else - break; - /* - * Check to make sure there is space for next address - */ - if (lsrp + 4 > lsrep) - return((unsigned long)-1); - } -#ifndef sysV88 - if ((*(*cpp+IPOPT_OLEN) = lsrp - *cpp) <= 7) { - *cpp = 0; - *lenp = 0; - return((unsigned long)-1); - } - *lsrp++ = IPOPT_NOP; /* 32 bit word align it */ - *lenp = lsrp - *cpp; -#else - ipopt.io_len = lsrp - *cpp; - if (ipopt.io_len <= 5) { /* Is 3 better ? */ - *cpp = 0; - *lenp = 0; - return((unsigned long)-1); - } - *lenp = sizeof(ipopt); - *cpp = (char *) &ipopt; -#endif - return(sin_addr.s_addr); -} -#endif diff --git a/secure/usr.bin/telnet/defines.h b/secure/usr.bin/telnet/defines.h deleted file mode 100644 index 0978173ea9958..0000000000000 --- a/secure/usr.bin/telnet/defines.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)defines.h 8.1 (Berkeley) 6/6/93 - */ - -#define settimer(x) clocks.x = clocks.system++ - -#if !defined(TN3270) - -#define SetIn3270() - -#endif /* !defined(TN3270) */ - -#define NETADD(c) { *netoring.supply = c; ring_supplied(&netoring, 1); } -#define NET2ADD(c1,c2) { NETADD(c1); NETADD(c2); } -#define NETBYTES() (ring_full_count(&netoring)) -#define NETROOM() (ring_empty_count(&netoring)) - -#define TTYADD(c) if (!(SYNCHing||flushout)) { \ - *ttyoring.supply = c; \ - ring_supplied(&ttyoring, 1); \ - } -#define TTYBYTES() (ring_full_count(&ttyoring)) -#define TTYROOM() (ring_empty_count(&ttyoring)) - -/* Various modes */ -#define MODE_LOCAL_CHARS(m) ((m)&(MODE_EDIT|MODE_TRAPSIG)) -#define MODE_LOCAL_ECHO(m) ((m)&MODE_ECHO) -#define MODE_COMMAND_LINE(m) ((m)==-1) - -#define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not portable */ diff --git a/secure/usr.bin/telnet/externs.h b/secure/usr.bin/telnet/externs.h deleted file mode 100644 index cefdf807a8570..0000000000000 --- a/secure/usr.bin/telnet/externs.h +++ /dev/null @@ -1,483 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)externs.h 8.3 (Berkeley) 5/30/95 - */ - -#ifndef BSD -# define BSD 43 -#endif - -/* - * ucb stdio.h defines BSD as something wierd - */ -#if defined(sun) && defined(__svr4__) -#define BSD 43 -#endif - -#ifndef USE_TERMIO -# if BSD > 43 || defined(SYSV_TERMIO) -# define USE_TERMIO -# endif -#endif - -#include -#include -#if defined(CRAY) && !defined(NO_BSD_SETJMP) -#include -#endif -#ifndef FILIO_H -#include -#else -#include -#endif -#ifdef CRAY -# include -#endif /* CRAY */ -#ifdef USE_TERMIO -# ifndef VINTR -# ifdef SYSV_TERMIO -# include -# else -# include -# define termio termios -# endif -# endif -#endif -#if defined(NO_CC_T) || !defined(USE_TERMIO) -# if !defined(USE_TERMIO) -typedef char cc_t; -# else -typedef unsigned char cc_t; -# endif -#endif - -#ifndef NO_STRING_H -#include -#else -#include -#endif - -#ifndef _POSIX_VDISABLE -# ifdef sun -# include /* pick up VDISABLE definition, mayby */ -# endif -# ifdef VDISABLE -# define _POSIX_VDISABLE VDISABLE -# else -# define _POSIX_VDISABLE ((cc_t)'\377') -# endif -#endif - -#define SUBBUFSIZE 256 - -#ifndef CRAY -extern int errno; /* outside this world */ -#endif /* !CRAY */ - -#if !defined(P) -# ifdef __STDC__ -# define P(x) x -# else -# define P(x) () -# endif -#endif - -extern int - autologin, /* Autologin enabled */ - skiprc, /* Don't process the ~/.telnetrc file */ - eight, /* use eight bit mode (binary in and/or out */ - flushout, /* flush output */ - connected, /* Are we connected to the other side? */ - globalmode, /* Mode tty should be in */ - In3270, /* Are we in 3270 mode? */ - telnetport, /* Are we connected to the telnet port? */ - localflow, /* Flow control handled locally */ - restartany, /* If flow control, restart output on any character */ - localchars, /* we recognize interrupt/quit */ - donelclchars, /* the user has set "localchars" */ - showoptions, - net, /* Network file descriptor */ - tin, /* Terminal input file descriptor */ - tout, /* Terminal output file descriptor */ - crlf, /* Should '\r' be mapped to (or )? */ - autoflush, /* flush output when interrupting? */ - autosynch, /* send interrupt characters with SYNCH? */ - SYNCHing, /* Is the stream in telnet SYNCH mode? */ - donebinarytoggle, /* the user has put us in binary */ - dontlecho, /* do we suppress local echoing right now? */ - crmod, - netdata, /* Print out network data flow */ - prettydump, /* Print "netdata" output in user readable format */ -#if defined(unix) -#if defined(TN3270) - cursesdata, /* Print out curses data flow */ - apitrace, /* Trace API transactions */ -#endif /* defined(TN3270) */ - termdata, /* Print out terminal data flow */ -#endif /* defined(unix) */ - debug, /* Debug level */ - clienteof; /* Client received EOF */ - -extern cc_t escape; /* Escape to command mode */ -extern cc_t rlogin; /* Rlogin mode escape character */ -#ifdef KLUDGELINEMODE -extern cc_t echoc; /* Toggle local echoing */ -#endif - -extern char - *prompt; /* Prompt for command. */ - -extern char - doopt[], - dont[], - will[], - wont[], - options[], /* All the little options */ - *hostname; /* Who are we connected to? */ -#ifdef ENCRYPTION -extern void (*encrypt_output) P((unsigned char *, int)); -extern int (*decrypt_input) P((int)); -#endif /* ENCRYPTION */ - -/* - * We keep track of each side of the option negotiation. - */ - -#define MY_STATE_WILL 0x01 -#define MY_WANT_STATE_WILL 0x02 -#define MY_STATE_DO 0x04 -#define MY_WANT_STATE_DO 0x08 - -/* - * Macros to check the current state of things - */ - -#define my_state_is_do(opt) (options[opt]&MY_STATE_DO) -#define my_state_is_will(opt) (options[opt]&MY_STATE_WILL) -#define my_want_state_is_do(opt) (options[opt]&MY_WANT_STATE_DO) -#define my_want_state_is_will(opt) (options[opt]&MY_WANT_STATE_WILL) - -#define my_state_is_dont(opt) (!my_state_is_do(opt)) -#define my_state_is_wont(opt) (!my_state_is_will(opt)) -#define my_want_state_is_dont(opt) (!my_want_state_is_do(opt)) -#define my_want_state_is_wont(opt) (!my_want_state_is_will(opt)) - -#define set_my_state_do(opt) {options[opt] |= MY_STATE_DO;} -#define set_my_state_will(opt) {options[opt] |= MY_STATE_WILL;} -#define set_my_want_state_do(opt) {options[opt] |= MY_WANT_STATE_DO;} -#define set_my_want_state_will(opt) {options[opt] |= MY_WANT_STATE_WILL;} - -#define set_my_state_dont(opt) {options[opt] &= ~MY_STATE_DO;} -#define set_my_state_wont(opt) {options[opt] &= ~MY_STATE_WILL;} -#define set_my_want_state_dont(opt) {options[opt] &= ~MY_WANT_STATE_DO;} -#define set_my_want_state_wont(opt) {options[opt] &= ~MY_WANT_STATE_WILL;} - -/* - * Make everything symetrical - */ - -#define HIS_STATE_WILL MY_STATE_DO -#define HIS_WANT_STATE_WILL MY_WANT_STATE_DO -#define HIS_STATE_DO MY_STATE_WILL -#define HIS_WANT_STATE_DO MY_WANT_STATE_WILL - -#define his_state_is_do my_state_is_will -#define his_state_is_will my_state_is_do -#define his_want_state_is_do my_want_state_is_will -#define his_want_state_is_will my_want_state_is_do - -#define his_state_is_dont my_state_is_wont -#define his_state_is_wont my_state_is_dont -#define his_want_state_is_dont my_want_state_is_wont -#define his_want_state_is_wont my_want_state_is_dont - -#define set_his_state_do set_my_state_will -#define set_his_state_will set_my_state_do -#define set_his_want_state_do set_my_want_state_will -#define set_his_want_state_will set_my_want_state_do - -#define set_his_state_dont set_my_state_wont -#define set_his_state_wont set_my_state_dont -#define set_his_want_state_dont set_my_want_state_wont -#define set_his_want_state_wont set_my_want_state_dont - - -extern FILE - *NetTrace; /* Where debugging output goes */ -extern unsigned char - NetTraceFile[]; /* Name of file where debugging output goes */ -extern void - SetNetTrace P((char *)); /* Function to change where debugging goes */ - -extern jmp_buf - peerdied, - toplevel; /* For error conditions. */ - -extern void - command P((int, char *, int)), - Dump P((int, unsigned char *, int)), - init_3270 P((void)), - printoption P((char *, int, int)), - printsub P((int, unsigned char *, int)), - sendnaws P((void)), - setconnmode P((int)), - setcommandmode P((void)), - setneturg P((void)), - sys_telnet_init P((void)), - telnet P((char *)), - tel_enter_binary P((int)), - TerminalFlushOutput P((void)), - TerminalNewMode P((int)), - TerminalRestoreState P((void)), - TerminalSaveState P((void)), - tninit P((void)), - upcase P((char *)), - willoption P((int)), - wontoption P((int)); - -extern void - send_do P((int, int)), - send_dont P((int, int)), - send_will P((int, int)), - send_wont P((int, int)); - -extern void - lm_will P((unsigned char *, int)), - lm_wont P((unsigned char *, int)), - lm_do P((unsigned char *, int)), - lm_dont P((unsigned char *, int)), - lm_mode P((unsigned char *, int, int)); - -extern void - slc_init P((void)), - slcstate P((void)), - slc_mode_export P((void)), - slc_mode_import P((int)), - slc_import P((int)), - slc_export P((void)), - slc P((unsigned char *, int)), - slc_check P((void)), - slc_start_reply P((void)), - slc_add_reply P((int, int, int)), - slc_end_reply P((void)); -extern int - slc_update P((void)); - -extern void - env_opt P((unsigned char *, int)), - env_opt_start P((void)), - env_opt_start_info P((void)), - env_opt_add P((unsigned char *)), - env_opt_end P((int)); - -extern unsigned char - *env_default P((int, int)), - *env_getvalue P((unsigned char *)); - -extern int - get_status P((void)), - dosynch P((void)); - -extern cc_t - *tcval P((int)); - -#ifndef USE_TERMIO - -extern struct tchars ntc; -extern struct ltchars nltc; -extern struct sgttyb nttyb; - -# define termEofChar ntc.t_eofc -# define termEraseChar nttyb.sg_erase -# define termFlushChar nltc.t_flushc -# define termIntChar ntc.t_intrc -# define termKillChar nttyb.sg_kill -# define termLiteralNextChar nltc.t_lnextc -# define termQuitChar ntc.t_quitc -# define termSuspChar nltc.t_suspc -# define termRprntChar nltc.t_rprntc -# define termWerasChar nltc.t_werasc -# define termStartChar ntc.t_startc -# define termStopChar ntc.t_stopc -# define termForw1Char ntc.t_brkc -extern cc_t termForw2Char; -extern cc_t termAytChar; - -# define termEofCharp (cc_t *)&ntc.t_eofc -# define termEraseCharp (cc_t *)&nttyb.sg_erase -# define termFlushCharp (cc_t *)&nltc.t_flushc -# define termIntCharp (cc_t *)&ntc.t_intrc -# define termKillCharp (cc_t *)&nttyb.sg_kill -# define termLiteralNextCharp (cc_t *)&nltc.t_lnextc -# define termQuitCharp (cc_t *)&ntc.t_quitc -# define termSuspCharp (cc_t *)&nltc.t_suspc -# define termRprntCharp (cc_t *)&nltc.t_rprntc -# define termWerasCharp (cc_t *)&nltc.t_werasc -# define termStartCharp (cc_t *)&ntc.t_startc -# define termStopCharp (cc_t *)&ntc.t_stopc -# define termForw1Charp (cc_t *)&ntc.t_brkc -# define termForw2Charp (cc_t *)&termForw2Char -# define termAytCharp (cc_t *)&termAytChar - -# else - -extern struct termio new_tc; - -# define termEofChar new_tc.c_cc[VEOF] -# define termEraseChar new_tc.c_cc[VERASE] -# define termIntChar new_tc.c_cc[VINTR] -# define termKillChar new_tc.c_cc[VKILL] -# define termQuitChar new_tc.c_cc[VQUIT] - -# ifndef VSUSP -extern cc_t termSuspChar; -# else -# define termSuspChar new_tc.c_cc[VSUSP] -# endif -# if defined(VFLUSHO) && !defined(VDISCARD) -# define VDISCARD VFLUSHO -# endif -# ifndef VDISCARD -extern cc_t termFlushChar; -# else -# define termFlushChar new_tc.c_cc[VDISCARD] -# endif -# ifndef VWERASE -extern cc_t termWerasChar; -# else -# define termWerasChar new_tc.c_cc[VWERASE] -# endif -# ifndef VREPRINT -extern cc_t termRprntChar; -# else -# define termRprntChar new_tc.c_cc[VREPRINT] -# endif -# ifndef VLNEXT -extern cc_t termLiteralNextChar; -# else -# define termLiteralNextChar new_tc.c_cc[VLNEXT] -# endif -# ifndef VSTART -extern cc_t termStartChar; -# else -# define termStartChar new_tc.c_cc[VSTART] -# endif -# ifndef VSTOP -extern cc_t termStopChar; -# else -# define termStopChar new_tc.c_cc[VSTOP] -# endif -# ifndef VEOL -extern cc_t termForw1Char; -# else -# define termForw1Char new_tc.c_cc[VEOL] -# endif -# ifndef VEOL2 -extern cc_t termForw2Char; -# else -# define termForw2Char new_tc.c_cc[VEOL] -# endif -# ifndef VSTATUS -extern cc_t termAytChar; -#else -# define termAytChar new_tc.c_cc[VSTATUS] -#endif - -# if !defined(CRAY) || defined(__STDC__) -# define termEofCharp &termEofChar -# define termEraseCharp &termEraseChar -# define termIntCharp &termIntChar -# define termKillCharp &termKillChar -# define termQuitCharp &termQuitChar -# define termSuspCharp &termSuspChar -# define termFlushCharp &termFlushChar -# define termWerasCharp &termWerasChar -# define termRprntCharp &termRprntChar -# define termLiteralNextCharp &termLiteralNextChar -# define termStartCharp &termStartChar -# define termStopCharp &termStopChar -# define termForw1Charp &termForw1Char -# define termForw2Charp &termForw2Char -# define termAytCharp &termAytChar -# else - /* Work around a compiler bug */ -# define termEofCharp 0 -# define termEraseCharp 0 -# define termIntCharp 0 -# define termKillCharp 0 -# define termQuitCharp 0 -# define termSuspCharp 0 -# define termFlushCharp 0 -# define termWerasCharp 0 -# define termRprntCharp 0 -# define termLiteralNextCharp 0 -# define termStartCharp 0 -# define termStopCharp 0 -# define termForw1Charp 0 -# define termForw2Charp 0 -# define termAytCharp 0 -# endif -#endif - - -/* Ring buffer structures which are shared */ - -extern Ring - netoring, - netiring, - ttyoring, - ttyiring; - -/* Tn3270 section */ -#if defined(TN3270) - -extern int - HaveInput, /* Whether an asynchronous I/O indication came in */ - noasynchtty, /* Don't do signals on I/O (SIGURG, SIGIO) */ - noasynchnet, /* Don't do signals on I/O (SIGURG, SIGIO) */ - sigiocount, /* Count of SIGIO receptions */ - shell_active; /* Subshell is active */ - -extern char - *Ibackp, /* Oldest byte of 3270 data */ - Ibuf[], /* 3270 buffer */ - *Ifrontp, /* Where next 3270 byte goes */ - tline[], - *transcom; /* Transparent command */ - -extern int - settranscom P((int, char**)); - -extern void - inputAvailable P((int)); -#endif /* defined(TN3270) */ diff --git a/secure/usr.bin/telnet/fdset.h b/secure/usr.bin/telnet/fdset.h deleted file mode 100644 index 045bb72214195..0000000000000 --- a/secure/usr.bin/telnet/fdset.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)fdset.h 8.1 (Berkeley) 6/6/93 - */ - -/* - * The following is defined just in case someone should want to run - * this telnet on a 4.2 system. - * - */ - -#ifndef FD_SETSIZE - -#define FD_SET(n, p) ((p)->fds_bits[0] |= (1<<(n))) -#define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1<<(n))) -#define FD_ISSET(n, p) ((p)->fds_bits[0] & (1<<(n))) -#define FD_ZERO(p) ((p)->fds_bits[0] = 0) - -#endif diff --git a/secure/usr.bin/telnet/general.h b/secure/usr.bin/telnet/general.h deleted file mode 100644 index 4efa9519469e2..0000000000000 --- a/secure/usr.bin/telnet/general.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)general.h 8.1 (Berkeley) 6/6/93 - */ - -/* - * Some general definitions. - */ - - -#define numberof(x) (sizeof x/sizeof x[0]) -#define highestof(x) (numberof(x)-1) - -#define ClearElement(x) memset((char *)&x, 0, sizeof x) -#define ClearArray(x) memset((char *)x, 0, sizeof x) diff --git a/secure/usr.bin/telnet/main.c b/secure/usr.bin/telnet/main.c deleted file mode 100644 index 09ac26c38caf9..0000000000000 --- a/secure/usr.bin/telnet/main.c +++ /dev/null @@ -1,322 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1988, 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include - -#include "ring.h" -#include "externs.h" -#include "defines.h" - -/* These values need to be the same as defined in libtelnet/kerberos5.c */ -/* Either define them in both places, or put in some common header file. */ -#define OPTS_FORWARD_CREDS 0x00000002 -#define OPTS_FORWARDABLE_CREDS 0x00000001 - -#if 0 -#define FORWARD -#endif - -/* - * Initialize variables. - */ - void -tninit() -{ - init_terminal(); - - init_network(); - - init_telnet(); - - init_sys(); - -#if defined(TN3270) - init_3270(); -#endif -} - - void -usage() -{ - fprintf(stderr, "Usage: %s %s%s%s%s\n", - prompt, -#ifdef AUTHENTICATION - "[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]", - "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] ", -#else - "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]", - "\n\t[-n tracefile]", -#endif -#if defined(TN3270) && defined(unix) -# ifdef AUTHENTICATION - "[-noasynch] [-noasynctty]\n\t[-noasyncnet] [-r] [-t transcom] ", -# else - "[-noasynch] [-noasynctty] [-noasyncnet] [-r]\n\t[-t transcom]", -# endif -#else - "[-r] ", -#endif -#ifdef ENCRYPTION - "[-x] [host-name [port]]" -#else /* ENCRYPTION */ - "[host-name [port]]" -#endif /* ENCRYPTION */ - ); - exit(1); -} - -/* - * main. Parse arguments, invoke the protocol or command parser. - */ - - -main(argc, argv) - int argc; - char *argv[]; -{ - extern char *optarg; - extern int optind; - int ch; - char *user, *strrchr(); -#ifdef FORWARD - extern int forward_flags; -#endif /* FORWARD */ - - tninit(); /* Clear out things */ -#if defined(CRAY) && !defined(__STDC__) - _setlist_init(); /* Work around compiler bug */ -#endif - - TerminalSaveState(); - - if (prompt = strrchr(argv[0], '/')) - ++prompt; - else - prompt = argv[0]; - - user = NULL; - - rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE; - autologin = -1; - - while ((ch = getopt(argc, argv, "8EKLS:X:acde:fFk:l:n:rt:x")) != EOF) { - switch(ch) { - case '8': - eight = 3; /* binary output and input */ - break; - case 'E': - rlogin = escape = _POSIX_VDISABLE; - break; - case 'K': -#ifdef AUTHENTICATION - autologin = 0; -#endif - break; - case 'L': - eight |= 2; /* binary output only */ - break; - case 'S': - { -#ifdef HAS_GETTOS - extern int tos; - - if ((tos = parsetos(optarg, "tcp")) < 0) - fprintf(stderr, "%s%s%s%s\n", - prompt, ": Bad TOS argument '", - optarg, - "; will try to use default TOS"); -#else - fprintf(stderr, - "%s: Warning: -S ignored, no parsetos() support.\n", - prompt); -#endif - } - break; - case 'X': -#ifdef AUTHENTICATION - auth_disable_name(optarg); -#endif - break; - case 'a': - autologin = 1; - break; - case 'c': - skiprc = 1; - break; - case 'd': - debug = 1; - break; - case 'e': - set_escape_char(optarg); - break; - case 'f': -#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) - if (forward_flags & OPTS_FORWARD_CREDS) { - fprintf(stderr, - "%s: Only one of -f and -F allowed.\n", - prompt); - usage(); - } - forward_flags |= OPTS_FORWARD_CREDS; -#else - fprintf(stderr, - "%s: Warning: -f ignored, no Kerberos V5 support.\n", - prompt); -#endif - break; - case 'F': -#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) - if (forward_flags & OPTS_FORWARD_CREDS) { - fprintf(stderr, - "%s: Only one of -f and -F allowed.\n", - prompt); - usage(); - } - forward_flags |= OPTS_FORWARD_CREDS; - forward_flags |= OPTS_FORWARDABLE_CREDS; -#else - fprintf(stderr, - "%s: Warning: -F ignored, no Kerberos V5 support.\n", - prompt); -#endif - break; - case 'k': -#if defined(AUTHENTICATION) && defined(KRB4) - { - extern char *dest_realm, dst_realm_buf[], dst_realm_sz; - dest_realm = dst_realm_buf; - (void)strncpy(dest_realm, optarg, dst_realm_sz); - } -#else - fprintf(stderr, - "%s: Warning: -k ignored, no Kerberos V4 support.\n", - prompt); -#endif - break; - case 'l': - autologin = 1; - user = optarg; - break; - case 'n': -#if defined(TN3270) && defined(unix) - /* distinguish between "-n oasynch" and "-noasynch" */ - if (argv[optind - 1][0] == '-' && argv[optind - 1][1] - == 'n' && argv[optind - 1][2] == 'o') { - if (!strcmp(optarg, "oasynch")) { - noasynchtty = 1; - noasynchnet = 1; - } else if (!strcmp(optarg, "oasynchtty")) - noasynchtty = 1; - else if (!strcmp(optarg, "oasynchnet")) - noasynchnet = 1; - } else -#endif /* defined(TN3270) && defined(unix) */ - SetNetTrace(optarg); - break; - case 'r': - rlogin = '~'; - break; - case 't': -#if defined(TN3270) && defined(unix) - transcom = tline; - (void)strcpy(transcom, optarg); -#else - fprintf(stderr, - "%s: Warning: -t ignored, no TN3270 support.\n", - prompt); -#endif - break; - case 'x': -#ifdef ENCRYPTION - encrypt_auto(1); - decrypt_auto(1); -#else /* ENCRYPTION */ - fprintf(stderr, - "%s: Warning: -x ignored, no ENCRYPT support.\n", - prompt); -#endif /* ENCRYPTION */ - break; - case '?': - default: - usage(); - /* NOTREACHED */ - } - } - if (autologin == -1) - autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1; - - argc -= optind; - argv += optind; - - if (argc) { - char *args[7], **argp = args; - - if (argc > 2) - usage(); - *argp++ = prompt; - if (user) { - *argp++ = "-l"; - *argp++ = user; - } - *argp++ = argv[0]; /* host */ - if (argc > 1) - *argp++ = argv[1]; /* port */ - *argp = 0; - - if (setjmp(toplevel) != 0) - Exit(0); - if (tn(argp - args, args) == 1) - return (0); - else - return (1); - } - (void)setjmp(toplevel); - for (;;) { -#ifdef TN3270 - if (shell_active) - shell_continue(); - else -#endif - command(1, 0, 0); - } -} diff --git a/secure/usr.bin/telnet/network.c b/secure/usr.bin/telnet/network.c deleted file mode 100644 index 0fe5cee0be4c8..0000000000000 --- a/secure/usr.bin/telnet/network.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; -#endif /* not lint */ - -#include -#include -#include - -#include - -#include - -#include "ring.h" - -#include "defines.h" -#include "externs.h" -#include "fdset.h" - -Ring netoring, netiring; -unsigned char netobuf[2*BUFSIZ], netibuf[BUFSIZ]; - -/* - * Initialize internal network data structures. - */ - - void -init_network() -{ - if (ring_init(&netoring, netobuf, sizeof netobuf) != 1) { - exit(1); - } - if (ring_init(&netiring, netibuf, sizeof netibuf) != 1) { - exit(1); - } - NetTrace = stdout; -} - - -/* - * Check to see if any out-of-band data exists on a socket (for - * Telnet "synch" processing). - */ - - int -stilloob() -{ - static struct timeval timeout = { 0 }; - fd_set excepts; - int value; - - do { - FD_ZERO(&excepts); - FD_SET(net, &excepts); - value = select(net+1, (fd_set *)0, (fd_set *)0, &excepts, &timeout); - } while ((value == -1) && (errno == EINTR)); - - if (value < 0) { - perror("select"); - (void) quit(); - /* NOTREACHED */ - } - if (FD_ISSET(net, &excepts)) { - return 1; - } else { - return 0; - } -} - - -/* - * setneturg() - * - * Sets "neturg" to the current location. - */ - - void -setneturg() -{ - ring_mark(&netoring); -} - - -/* - * netflush - * Send as much data as possible to the network, - * handling requests for urgent data. - * - * The return value indicates whether we did any - * useful work. - */ - - - int -netflush() -{ - register int n, n1; - -#ifdef ENCRYPTION - if (encrypt_output) - ring_encrypt(&netoring, encrypt_output); -#endif /* ENCRYPTION */ - if ((n1 = n = ring_full_consecutive(&netoring)) > 0) { - if (!ring_at_mark(&netoring)) { - n = send(net, (char *)netoring.consume, n, 0); /* normal write */ - } else { - /* - * In 4.2 (and 4.3) systems, there is some question about - * what byte in a sendOOB operation is the "OOB" data. - * To make ourselves compatible, we only send ONE byte - * out of band, the one WE THINK should be OOB (though - * we really have more the TCP philosophy of urgent data - * rather than the Unix philosophy of OOB data). - */ - n = send(net, (char *)netoring.consume, 1, MSG_OOB);/* URGENT data */ - } - } - if (n < 0) { - if (errno != ENOBUFS && errno != EWOULDBLOCK) { - setcommandmode(); - perror(hostname); - (void)NetClose(net); - ring_clear_mark(&netoring); - longjmp(peerdied, -1); - /*NOTREACHED*/ - } - n = 0; - } - if (netdata && n) { - Dump('>', netoring.consume, n); - } - if (n) { - ring_consumed(&netoring, n); - /* - * If we sent all, and more to send, then recurse to pick - * up the other half. - */ - if ((n1 == n) && ring_full_consecutive(&netoring)) { - (void) netflush(); - } - return 1; - } else { - return 0; - } -} diff --git a/secure/usr.bin/telnet/ring.c b/secure/usr.bin/telnet/ring.c deleted file mode 100644 index 37dfda8bc4992..0000000000000 --- a/secure/usr.bin/telnet/ring.c +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * This defines a structure for a ring buffer. - * - * The circular buffer has two parts: - *((( - * full: [consume, supply) - * empty: [supply, consume) - *]]] - * - */ - -#include -#include - -#ifdef size_t -#undef size_t -#endif - -#include -#ifndef FILIO_H -#include -#endif -#include - -#include "ring.h" -#include "general.h" - -/* Internal macros */ - -#if !defined(MIN) -#define MIN(a,b) (((a)<(b))? (a):(b)) -#endif /* !defined(MIN) */ - -#define ring_subtract(d,a,b) (((a)-(b) >= 0)? \ - (a)-(b): (((a)-(b))+(d)->size)) - -#define ring_increment(d,a,c) (((a)+(c) < (d)->top)? \ - (a)+(c) : (((a)+(c))-(d)->size)) - -#define ring_decrement(d,a,c) (((a)-(c) >= (d)->bottom)? \ - (a)-(c) : (((a)-(c))-(d)->size)) - - -/* - * The following is a clock, used to determine full, empty, etc. - * - * There is some trickiness here. Since the ring buffers are initialized - * to ZERO on allocation, we need to make sure, when interpreting the - * clock, that when the times are EQUAL, then the buffer is FULL. - */ -static u_long ring_clock = 0; - - -#define ring_empty(d) (((d)->consume == (d)->supply) && \ - ((d)->consumetime >= (d)->supplytime)) -#define ring_full(d) (((d)->supply == (d)->consume) && \ - ((d)->supplytime > (d)->consumetime)) - - - - - -/* Buffer state transition routines */ - - ring_init(ring, buffer, count) -Ring *ring; - unsigned char *buffer; - int count; -{ - memset((char *)ring, 0, sizeof *ring); - - ring->size = count; - - ring->supply = ring->consume = ring->bottom = buffer; - - ring->top = ring->bottom+ring->size; - -#ifdef ENCRYPTION - ring->clearto = 0; -#endif /* ENCRYPTION */ - - return 1; -} - -/* Mark routines */ - -/* - * Mark the most recently supplied byte. - */ - - void -ring_mark(ring) - Ring *ring; -{ - ring->mark = ring_decrement(ring, ring->supply, 1); -} - -/* - * Is the ring pointing to the mark? - */ - - int -ring_at_mark(ring) - Ring *ring; -{ - if (ring->mark == ring->consume) { - return 1; - } else { - return 0; - } -} - -/* - * Clear any mark set on the ring. - */ - - void -ring_clear_mark(ring) - Ring *ring; -{ - ring->mark = 0; -} - -/* - * Add characters from current segment to ring buffer. - */ - void -ring_supplied(ring, count) - Ring *ring; - int count; -{ - ring->supply = ring_increment(ring, ring->supply, count); - ring->supplytime = ++ring_clock; -} - -/* - * We have just consumed "c" bytes. - */ - void -ring_consumed(ring, count) - Ring *ring; - int count; -{ - if (count == 0) /* don't update anything */ - return; - - if (ring->mark && - (ring_subtract(ring, ring->mark, ring->consume) < count)) { - ring->mark = 0; - } -#ifdef ENCRYPTION - if (ring->consume < ring->clearto && - ring->clearto <= ring->consume + count) - ring->clearto = 0; - else if (ring->consume + count > ring->top && - ring->bottom <= ring->clearto && - ring->bottom + ((ring->consume + count) - ring->top)) - ring->clearto = 0; -#endif /* ENCRYPTION */ - ring->consume = ring_increment(ring, ring->consume, count); - ring->consumetime = ++ring_clock; - /* - * Try to encourage "ring_empty_consecutive()" to be large. - */ - if (ring_empty(ring)) { - ring->consume = ring->supply = ring->bottom; - } -} - - - -/* Buffer state query routines */ - - -/* Number of bytes that may be supplied */ - int -ring_empty_count(ring) - Ring *ring; -{ - if (ring_empty(ring)) { /* if empty */ - return ring->size; - } else { - return ring_subtract(ring, ring->consume, ring->supply); - } -} - -/* number of CONSECUTIVE bytes that may be supplied */ - int -ring_empty_consecutive(ring) - Ring *ring; -{ - if ((ring->consume < ring->supply) || ring_empty(ring)) { - /* - * if consume is "below" supply, or empty, then - * return distance to the top - */ - return ring_subtract(ring, ring->top, ring->supply); - } else { - /* - * else, return what we may. - */ - return ring_subtract(ring, ring->consume, ring->supply); - } -} - -/* Return the number of bytes that are available for consuming - * (but don't give more than enough to get to cross over set mark) - */ - - int -ring_full_count(ring) - Ring *ring; -{ - if ((ring->mark == 0) || (ring->mark == ring->consume)) { - if (ring_full(ring)) { - return ring->size; /* nothing consumed, but full */ - } else { - return ring_subtract(ring, ring->supply, ring->consume); - } - } else { - return ring_subtract(ring, ring->mark, ring->consume); - } -} - -/* - * Return the number of CONSECUTIVE bytes available for consuming. - * However, don't return more than enough to cross over set mark. - */ - int -ring_full_consecutive(ring) - Ring *ring; -{ - if ((ring->mark == 0) || (ring->mark == ring->consume)) { - if ((ring->supply < ring->consume) || ring_full(ring)) { - return ring_subtract(ring, ring->top, ring->consume); - } else { - return ring_subtract(ring, ring->supply, ring->consume); - } - } else { - if (ring->mark < ring->consume) { - return ring_subtract(ring, ring->top, ring->consume); - } else { /* Else, distance to mark */ - return ring_subtract(ring, ring->mark, ring->consume); - } - } -} - -/* - * Move data into the "supply" portion of of the ring buffer. - */ - void -ring_supply_data(ring, buffer, count) - Ring *ring; - unsigned char *buffer; - int count; -{ - int i; - - while (count) { - i = MIN(count, ring_empty_consecutive(ring)); - memmove(ring->supply, buffer, i); - ring_supplied(ring, i); - count -= i; - buffer += i; - } -} - -#ifdef notdef - -/* - * Move data from the "consume" portion of the ring buffer - */ - void -ring_consume_data(ring, buffer, count) - Ring *ring; - unsigned char *buffer; - int count; -{ - int i; - - while (count) { - i = MIN(count, ring_full_consecutive(ring)); - memmove(buffer, ring->consume, i); - ring_consumed(ring, i); - count -= i; - buffer += i; - } -} -#endif - -#ifdef ENCRYPTION - void -ring_encrypt(ring, encryptor) - Ring *ring; - void (*encryptor)(); -{ - unsigned char *s, *c; - - if (ring_empty(ring) || ring->clearto == ring->supply) - return; - - if (!(c = ring->clearto)) - c = ring->consume; - - s = ring->supply; - - if (s <= c) { - (*encryptor)(c, ring->top - c); - (*encryptor)(ring->bottom, s - ring->bottom); - } else - (*encryptor)(c, s - c); - - ring->clearto = ring->supply; -} - - void -ring_clearto(ring) - Ring *ring; -{ - if (!ring_empty(ring)) - ring->clearto = ring->supply; - else - ring->clearto = 0; -} -#endif /* ENCRYPTION */ diff --git a/secure/usr.bin/telnet/ring.h b/secure/usr.bin/telnet/ring.h deleted file mode 100644 index 2a36781e5ae57..0000000000000 --- a/secure/usr.bin/telnet/ring.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)ring.h 8.1 (Berkeley) 6/6/93 - */ - -#if defined(P) -# undef P -#endif - -#if defined(__STDC__) || defined(LINT_ARGS) -# define P(x) x -#else -# define P(x) () -#endif - -/* - * This defines a structure for a ring buffer. - * - * The circular buffer has two parts: - *((( - * full: [consume, supply) - * empty: [supply, consume) - *]]] - * - */ -typedef struct { - unsigned char *consume, /* where data comes out of */ - *supply, /* where data comes in to */ - *bottom, /* lowest address in buffer */ - *top, /* highest address+1 in buffer */ - *mark; /* marker (user defined) */ -#ifdef ENCRYPTION - unsigned char *clearto; /* Data to this point is clear text */ - unsigned char *encryyptedto; /* Data is encrypted to here */ -#endif /* ENCRYPTION */ - int size; /* size in bytes of buffer */ - u_long consumetime, /* help us keep straight full, empty, etc. */ - supplytime; -} Ring; - -/* Here are some functions and macros to deal with the ring buffer */ - -/* Initialization routine */ -extern int - ring_init P((Ring *ring, unsigned char *buffer, int count)); - -/* Data movement routines */ -extern void - ring_supply_data P((Ring *ring, unsigned char *buffer, int count)); -#ifdef notdef -extern void - ring_consume_data P((Ring *ring, unsigned char *buffer, int count)); -#endif - -/* Buffer state transition routines */ -extern void - ring_supplied P((Ring *ring, int count)), - ring_consumed P((Ring *ring, int count)); - -/* Buffer state query routines */ -extern int - ring_empty_count P((Ring *ring)), - ring_empty_consecutive P((Ring *ring)), - ring_full_count P((Ring *ring)), - ring_full_consecutive P((Ring *ring)); - -#ifdef ENCRYPTION -extern void - ring_encrypt P((Ring *ring, void (*func)())), - ring_clearto P((Ring *ring)); -#endif /* ENCRYPTION */ - -extern void - ring_clear_mark(), - ring_mark(); diff --git a/secure/usr.bin/telnet/sys_bsd.c b/secure/usr.bin/telnet/sys_bsd.c deleted file mode 100644 index 832009916313d..0000000000000 --- a/secure/usr.bin/telnet/sys_bsd.c +++ /dev/null @@ -1,1220 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; -#endif /* not lint */ - -/* - * The following routines try to encapsulate what is system dependent - * (at least between 4.x and dos) which is used in telnet.c. - */ - - -#include -#include -#include -#include -#include -#include -#include - -#include "ring.h" - -#include "fdset.h" - -#include "defines.h" -#include "externs.h" -#include "types.h" - -#if defined(CRAY) || (defined(USE_TERMIO) && !defined(SYSV_TERMIO)) -#define SIG_FUNC_RET void -#else -#define SIG_FUNC_RET int -#endif - -#ifdef SIGINFO -extern SIG_FUNC_RET ayt_status(); -#endif - -int - tout, /* Output file descriptor */ - tin, /* Input file descriptor */ - net; - -#ifndef USE_TERMIO -struct tchars otc = { 0 }, ntc = { 0 }; -struct ltchars oltc = { 0 }, nltc = { 0 }; -struct sgttyb ottyb = { 0 }, nttyb = { 0 }; -int olmode = 0; -# define cfgetispeed(ptr) (ptr)->sg_ispeed -# define cfgetospeed(ptr) (ptr)->sg_ospeed -# define old_tc ottyb - -#else /* USE_TERMIO */ -struct termio old_tc = { 0 }; -extern struct termio new_tc; - -# ifndef TCSANOW -# ifdef TCSETS -# define TCSANOW TCSETS -# define TCSADRAIN TCSETSW -# define tcgetattr(f, t) ioctl(f, TCGETS, (char *)t) -# else -# ifdef TCSETA -# define TCSANOW TCSETA -# define TCSADRAIN TCSETAW -# define tcgetattr(f, t) ioctl(f, TCGETA, (char *)t) -# else -# define TCSANOW TIOCSETA -# define TCSADRAIN TIOCSETAW -# define tcgetattr(f, t) ioctl(f, TIOCGETA, (char *)t) -# endif -# endif -# define tcsetattr(f, a, t) ioctl(f, a, (char *)t) -# define cfgetospeed(ptr) ((ptr)->c_cflag&CBAUD) -# ifdef CIBAUD -# define cfgetispeed(ptr) (((ptr)->c_cflag&CIBAUD) >> IBSHIFT) -# else -# define cfgetispeed(ptr) cfgetospeed(ptr) -# endif -# endif /* TCSANOW */ -# ifdef sysV88 -# define TIOCFLUSH TC_PX_DRAIN -# endif -#endif /* USE_TERMIO */ - -static fd_set ibits, obits, xbits; - - - void -init_sys() -{ - tout = fileno(stdout); - tin = fileno(stdin); - FD_ZERO(&ibits); - FD_ZERO(&obits); - FD_ZERO(&xbits); - - errno = 0; -} - - - int -TerminalWrite(buf, n) - char *buf; - int n; -{ - return write(tout, buf, n); -} - - int -TerminalRead(buf, n) - char *buf; - int n; -{ - return read(tin, buf, n); -} - -/* - * - */ - - int -TerminalAutoFlush() -{ -#if defined(LNOFLSH) - int flush; - - ioctl(0, TIOCLGET, (char *)&flush); - return !(flush&LNOFLSH); /* if LNOFLSH, no autoflush */ -#else /* LNOFLSH */ - return 1; -#endif /* LNOFLSH */ -} - -#ifdef KLUDGELINEMODE -extern int kludgelinemode; -#endif -/* - * TerminalSpecialChars() - * - * Look at an input character to see if it is a special character - * and decide what to do. - * - * Output: - * - * 0 Don't add this character. - * 1 Do add this character - */ - -extern void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk(); - - int -TerminalSpecialChars(c) - int c; -{ - if (c == termIntChar) { - intp(); - return 0; - } else if (c == termQuitChar) { -#ifdef KLUDGELINEMODE - if (kludgelinemode) - sendbrk(); - else -#endif - sendabort(); - return 0; - } else if (c == termEofChar) { - if (my_want_state_is_will(TELOPT_LINEMODE)) { - sendeof(); - return 0; - } - return 1; - } else if (c == termSuspChar) { - sendsusp(); - return(0); - } else if (c == termFlushChar) { - xmitAO(); /* Transmit Abort Output */ - return 0; - } else if (!MODE_LOCAL_CHARS(globalmode)) { - if (c == termKillChar) { - xmitEL(); - return 0; - } else if (c == termEraseChar) { - xmitEC(); /* Transmit Erase Character */ - return 0; - } - } - return 1; -} - - -/* - * Flush output to the terminal - */ - - void -TerminalFlushOutput() -{ -#ifdef TIOCFLUSH - (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0); -#else - (void) ioctl(fileno(stdout), TCFLSH, (char *) 0); -#endif -} - - void -TerminalSaveState() -{ -#ifndef USE_TERMIO - ioctl(0, TIOCGETP, (char *)&ottyb); - ioctl(0, TIOCGETC, (char *)&otc); - ioctl(0, TIOCGLTC, (char *)&oltc); - ioctl(0, TIOCLGET, (char *)&olmode); - - ntc = otc; - nltc = oltc; - nttyb = ottyb; - -#else /* USE_TERMIO */ - tcgetattr(0, &old_tc); - - new_tc = old_tc; - -#ifndef VDISCARD - termFlushChar = CONTROL('O'); -#endif -#ifndef VWERASE - termWerasChar = CONTROL('W'); -#endif -#ifndef VREPRINT - termRprntChar = CONTROL('R'); -#endif -#ifndef VLNEXT - termLiteralNextChar = CONTROL('V'); -#endif -#ifndef VSTART - termStartChar = CONTROL('Q'); -#endif -#ifndef VSTOP - termStopChar = CONTROL('S'); -#endif -#ifndef VSTATUS - termAytChar = CONTROL('T'); -#endif -#endif /* USE_TERMIO */ -} - - cc_t * -tcval(func) - register int func; -{ - switch(func) { - case SLC_IP: return(&termIntChar); - case SLC_ABORT: return(&termQuitChar); - case SLC_EOF: return(&termEofChar); - case SLC_EC: return(&termEraseChar); - case SLC_EL: return(&termKillChar); - case SLC_XON: return(&termStartChar); - case SLC_XOFF: return(&termStopChar); - case SLC_FORW1: return(&termForw1Char); -#ifdef USE_TERMIO - case SLC_FORW2: return(&termForw2Char); -# ifdef VDISCARD - case SLC_AO: return(&termFlushChar); -# endif -# ifdef VSUSP - case SLC_SUSP: return(&termSuspChar); -# endif -# ifdef VWERASE - case SLC_EW: return(&termWerasChar); -# endif -# ifdef VREPRINT - case SLC_RP: return(&termRprntChar); -# endif -# ifdef VLNEXT - case SLC_LNEXT: return(&termLiteralNextChar); -# endif -# ifdef VSTATUS - case SLC_AYT: return(&termAytChar); -# endif -#endif - - case SLC_SYNCH: - case SLC_BRK: - case SLC_EOR: - default: - return((cc_t *)0); - } -} - - void -TerminalDefaultChars() -{ -#ifndef USE_TERMIO - ntc = otc; - nltc = oltc; - nttyb.sg_kill = ottyb.sg_kill; - nttyb.sg_erase = ottyb.sg_erase; -#else /* USE_TERMIO */ - memmove(new_tc.c_cc, old_tc.c_cc, sizeof(old_tc.c_cc)); -# ifndef VDISCARD - termFlushChar = CONTROL('O'); -# endif -# ifndef VWERASE - termWerasChar = CONTROL('W'); -# endif -# ifndef VREPRINT - termRprntChar = CONTROL('R'); -# endif -# ifndef VLNEXT - termLiteralNextChar = CONTROL('V'); -# endif -# ifndef VSTART - termStartChar = CONTROL('Q'); -# endif -# ifndef VSTOP - termStopChar = CONTROL('S'); -# endif -# ifndef VSTATUS - termAytChar = CONTROL('T'); -# endif -#endif /* USE_TERMIO */ -} - -#ifdef notdef -void -TerminalRestoreState() -{ -} -#endif - -/* - * TerminalNewMode - set up terminal to a specific mode. - * MODE_ECHO: do local terminal echo - * MODE_FLOW: do local flow control - * MODE_TRAPSIG: do local mapping to TELNET IAC sequences - * MODE_EDIT: do local line editing - * - * Command mode: - * MODE_ECHO|MODE_EDIT|MODE_FLOW|MODE_TRAPSIG - * local echo - * local editing - * local xon/xoff - * local signal mapping - * - * Linemode: - * local/no editing - * Both Linemode and Single Character mode: - * local/remote echo - * local/no xon/xoff - * local/no signal mapping - */ - - - void -TerminalNewMode(f) - register int f; -{ - static int prevmode = 0; -#ifndef USE_TERMIO - struct tchars tc; - struct ltchars ltc; - struct sgttyb sb; - int lmode; -#else /* USE_TERMIO */ - struct termio tmp_tc; -#endif /* USE_TERMIO */ - int onoff; - int old; - cc_t esc; - - globalmode = f&~MODE_FORCE; - if (prevmode == f) - return; - - /* - * Write any outstanding data before switching modes - * ttyflush() returns 0 only when there is no more data - * left to write out, it returns -1 if it couldn't do - * anything at all, otherwise it returns 1 + the number - * of characters left to write. -#ifndef USE_TERMIO - * We would really like ask the kernel to wait for the output - * to drain, like we can do with the TCSADRAIN, but we don't have - * that option. The only ioctl that waits for the output to - * drain, TIOCSETP, also flushes the input queue, which is NOT - * what we want (TIOCSETP is like TCSADFLUSH). -#endif - */ - old = ttyflush(SYNCHing|flushout); - if (old < 0 || old > 1) { -#ifdef USE_TERMIO - tcgetattr(tin, &tmp_tc); -#endif /* USE_TERMIO */ - do { - /* - * Wait for data to drain, then flush again. - */ -#ifdef USE_TERMIO - tcsetattr(tin, TCSADRAIN, &tmp_tc); -#endif /* USE_TERMIO */ - old = ttyflush(SYNCHing|flushout); - } while (old < 0 || old > 1); - } - - old = prevmode; - prevmode = f&~MODE_FORCE; -#ifndef USE_TERMIO - sb = nttyb; - tc = ntc; - ltc = nltc; - lmode = olmode; -#else - tmp_tc = new_tc; -#endif - - if (f&MODE_ECHO) { -#ifndef USE_TERMIO - sb.sg_flags |= ECHO; -#else - tmp_tc.c_lflag |= ECHO; - tmp_tc.c_oflag |= ONLCR; - if (crlf) - tmp_tc.c_iflag |= ICRNL; -#endif - } else { -#ifndef USE_TERMIO - sb.sg_flags &= ~ECHO; -#else - tmp_tc.c_lflag &= ~ECHO; - tmp_tc.c_oflag &= ~ONLCR; -# ifdef notdef - if (crlf) - tmp_tc.c_iflag &= ~ICRNL; -# endif -#endif - } - - if ((f&MODE_FLOW) == 0) { -#ifndef USE_TERMIO - tc.t_startc = _POSIX_VDISABLE; - tc.t_stopc = _POSIX_VDISABLE; -#else - tmp_tc.c_iflag &= ~(IXOFF|IXON); /* Leave the IXANY bit alone */ - } else { - if (restartany < 0) { - tmp_tc.c_iflag |= IXOFF|IXON; /* Leave the IXANY bit alone */ - } else if (restartany > 0) { - tmp_tc.c_iflag |= IXOFF|IXON|IXANY; - } else { - tmp_tc.c_iflag |= IXOFF|IXON; - tmp_tc.c_iflag &= ~IXANY; - } -#endif - } - - if ((f&MODE_TRAPSIG) == 0) { -#ifndef USE_TERMIO - tc.t_intrc = _POSIX_VDISABLE; - tc.t_quitc = _POSIX_VDISABLE; - tc.t_eofc = _POSIX_VDISABLE; - ltc.t_suspc = _POSIX_VDISABLE; - ltc.t_dsuspc = _POSIX_VDISABLE; -#else - tmp_tc.c_lflag &= ~ISIG; -#endif - localchars = 0; - } else { -#ifdef USE_TERMIO - tmp_tc.c_lflag |= ISIG; -#endif - localchars = 1; - } - - if (f&MODE_EDIT) { -#ifndef USE_TERMIO - sb.sg_flags &= ~CBREAK; - sb.sg_flags |= CRMOD; -#else - tmp_tc.c_lflag |= ICANON; -#endif - } else { -#ifndef USE_TERMIO - sb.sg_flags |= CBREAK; - if (f&MODE_ECHO) - sb.sg_flags |= CRMOD; - else - sb.sg_flags &= ~CRMOD; -#else - tmp_tc.c_lflag &= ~ICANON; - tmp_tc.c_iflag &= ~ICRNL; - tmp_tc.c_cc[VMIN] = 1; - tmp_tc.c_cc[VTIME] = 0; -#endif - } - - if ((f&(MODE_EDIT|MODE_TRAPSIG)) == 0) { -#ifndef USE_TERMIO - ltc.t_lnextc = _POSIX_VDISABLE; -#else -# ifdef VLNEXT - tmp_tc.c_cc[VLNEXT] = (cc_t)(_POSIX_VDISABLE); -# endif -#endif - } - - if (f&MODE_SOFT_TAB) { -#ifndef USE_TERMIO - sb.sg_flags |= XTABS; -#else -# ifdef OXTABS - tmp_tc.c_oflag |= OXTABS; -# endif -# ifdef TABDLY - tmp_tc.c_oflag &= ~TABDLY; - tmp_tc.c_oflag |= TAB3; -# endif -#endif - } else { -#ifndef USE_TERMIO - sb.sg_flags &= ~XTABS; -#else -# ifdef OXTABS - tmp_tc.c_oflag &= ~OXTABS; -# endif -# ifdef TABDLY - tmp_tc.c_oflag &= ~TABDLY; -# endif -#endif - } - - if (f&MODE_LIT_ECHO) { -#ifndef USE_TERMIO - lmode &= ~LCTLECH; -#else -# ifdef ECHOCTL - tmp_tc.c_lflag &= ~ECHOCTL; -# endif -#endif - } else { -#ifndef USE_TERMIO - lmode |= LCTLECH; -#else -# ifdef ECHOCTL - tmp_tc.c_lflag |= ECHOCTL; -# endif -#endif - } - - if (f == -1) { - onoff = 0; - } else { -#ifndef USE_TERMIO - if (f & MODE_OUTBIN) - lmode |= LLITOUT; - else - lmode &= ~LLITOUT; - - if (f & MODE_INBIN) - lmode |= LPASS8; - else - lmode &= ~LPASS8; -#else - if (f & MODE_INBIN) - tmp_tc.c_iflag &= ~ISTRIP; - else - tmp_tc.c_iflag |= ISTRIP; - if (f & MODE_OUTBIN) { - tmp_tc.c_cflag &= ~(CSIZE|PARENB); - tmp_tc.c_cflag |= CS8; - tmp_tc.c_oflag &= ~OPOST; - } else { - tmp_tc.c_cflag &= ~(CSIZE|PARENB); - tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB); - tmp_tc.c_oflag |= OPOST; - } -#endif - onoff = 1; - } - - if (f != -1) { -#ifdef SIGTSTP - SIG_FUNC_RET susp(); -#endif /* SIGTSTP */ -#ifdef SIGINFO - SIG_FUNC_RET ayt(); -#endif - -#ifdef SIGTSTP - (void) signal(SIGTSTP, susp); -#endif /* SIGTSTP */ -#ifdef SIGINFO - (void) signal(SIGINFO, ayt); -#endif -#if defined(USE_TERMIO) && defined(NOKERNINFO) - tmp_tc.c_lflag |= NOKERNINFO; -#endif - /* - * We don't want to process ^Y here. It's just another - * character that we'll pass on to the back end. It has - * to process it because it will be processed when the - * user attempts to read it, not when we send it. - */ -#ifndef USE_TERMIO - ltc.t_dsuspc = _POSIX_VDISABLE; -#else -# ifdef VDSUSP - tmp_tc.c_cc[VDSUSP] = (cc_t)(_POSIX_VDISABLE); -# endif -#endif -#ifdef USE_TERMIO - /* - * If the VEOL character is already set, then use VEOL2, - * otherwise use VEOL. - */ - esc = (rlogin != _POSIX_VDISABLE) ? rlogin : escape; - if ((tmp_tc.c_cc[VEOL] != esc) -# ifdef VEOL2 - && (tmp_tc.c_cc[VEOL2] != esc) -# endif - ) { - if (tmp_tc.c_cc[VEOL] == (cc_t)(_POSIX_VDISABLE)) - tmp_tc.c_cc[VEOL] = esc; -# ifdef VEOL2 - else if (tmp_tc.c_cc[VEOL2] == (cc_t)(_POSIX_VDISABLE)) - tmp_tc.c_cc[VEOL2] = esc; -# endif - } -#else - if (tc.t_brkc == (cc_t)(_POSIX_VDISABLE)) - tc.t_brkc = esc; -#endif - } else { -#ifdef SIGINFO - SIG_FUNC_RET ayt_status(); - - (void) signal(SIGINFO, ayt_status); -#endif -#ifdef SIGTSTP - (void) signal(SIGTSTP, SIG_DFL); -# ifndef SOLARIS - (void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1))); -# else SOLARIS - (void) sigrelse(SIGTSTP); -# endif SOLARIS -#endif /* SIGTSTP */ -#ifndef USE_TERMIO - ltc = oltc; - tc = otc; - sb = ottyb; - lmode = olmode; -#else - tmp_tc = old_tc; -#endif - } -#ifndef USE_TERMIO - ioctl(tin, TIOCLSET, (char *)&lmode); - ioctl(tin, TIOCSLTC, (char *)<c); - ioctl(tin, TIOCSETC, (char *)&tc); - ioctl(tin, TIOCSETN, (char *)&sb); -#else - if (tcsetattr(tin, TCSADRAIN, &tmp_tc) < 0) - tcsetattr(tin, TCSANOW, &tmp_tc); -#endif - -#if (!defined(TN3270)) || ((!defined(NOT43)) || defined(PUTCHAR)) -# if !defined(sysV88) - ioctl(tin, FIONBIO, (char *)&onoff); - ioctl(tout, FIONBIO, (char *)&onoff); -# endif -#endif /* (!defined(TN3270)) || ((!defined(NOT43)) || defined(PUTCHAR)) */ -#if defined(TN3270) - if (noasynchtty == 0) { - ioctl(tin, FIOASYNC, (char *)&onoff); - } -#endif /* defined(TN3270) */ - -} - -/* - * Try to guess whether speeds are "encoded" (4.2BSD) or just numeric (4.4BSD). - */ -#if B4800 != 4800 -#define DECODE_BAUD -#endif - -#ifdef DECODE_BAUD -#ifndef B7200 -#define B7200 B4800 -#endif - -#ifndef B14400 -#define B14400 B9600 -#endif - -#ifndef B19200 -# define B19200 B14400 -#endif - -#ifndef B28800 -#define B28800 B19200 -#endif - -#ifndef B38400 -# define B38400 B28800 -#endif - -#ifndef B57600 -#define B57600 B38400 -#endif - -#ifndef B76800 -#define B76800 B57600 -#endif - -#ifndef B115200 -#define B115200 B76800 -#endif - -#ifndef B230400 -#define B230400 B115200 -#endif - - -/* - * This code assumes that the values B0, B50, B75... - * are in ascending order. They do not have to be - * contiguous. - */ -struct termspeeds { - long speed; - long value; -} termspeeds[] = { - { 0, B0 }, { 50, B50 }, { 75, B75 }, - { 110, B110 }, { 134, B134 }, { 150, B150 }, - { 200, B200 }, { 300, B300 }, { 600, B600 }, - { 1200, B1200 }, { 1800, B1800 }, { 2400, B2400 }, - { 4800, B4800 }, { 7200, B7200 }, { 9600, B9600 }, - { 14400, B14400 }, { 19200, B19200 }, { 28800, B28800 }, - { 38400, B38400 }, { 57600, B57600 }, { 115200, B115200 }, - { 230400, B230400 }, { -1, B230400 } -}; -#endif /* DECODE_BAUD */ - - void -TerminalSpeeds(ispeed, ospeed) - long *ispeed; - long *ospeed; -{ -#ifdef DECODE_BAUD - register struct termspeeds *tp; -#endif /* DECODE_BAUD */ - register long in, out; - - out = cfgetospeed(&old_tc); - in = cfgetispeed(&old_tc); - if (in == 0) - in = out; - -#ifdef DECODE_BAUD - tp = termspeeds; - while ((tp->speed != -1) && (tp->value < in)) - tp++; - *ispeed = tp->speed; - - tp = termspeeds; - while ((tp->speed != -1) && (tp->value < out)) - tp++; - *ospeed = tp->speed; -#else /* DECODE_BAUD */ - *ispeed = in; - *ospeed = out; -#endif /* DECODE_BAUD */ -} - - int -TerminalWindowSize(rows, cols) - long *rows, *cols; -{ -#ifdef TIOCGWINSZ - struct winsize ws; - - if (ioctl(fileno(stdin), TIOCGWINSZ, (char *)&ws) >= 0) { - *rows = ws.ws_row; - *cols = ws.ws_col; - return 1; - } -#endif /* TIOCGWINSZ */ - return 0; -} - - int -NetClose(fd) - int fd; -{ - return close(fd); -} - - - void -NetNonblockingIO(fd, onoff) - int fd; - int onoff; -{ - ioctl(fd, FIONBIO, (char *)&onoff); -} - -#if defined(TN3270) - void -NetSigIO(fd, onoff) - int fd; - int onoff; -{ - ioctl(fd, FIOASYNC, (char *)&onoff); /* hear about input */ -} - - void -NetSetPgrp(fd) - int fd; -{ - int myPid; - - myPid = getpid(); - fcntl(fd, F_SETOWN, myPid); -} -#endif /*defined(TN3270)*/ - -/* - * Various signal handling routines. - */ - - /* ARGSUSED */ - SIG_FUNC_RET -deadpeer(sig) - int sig; -{ - setcommandmode(); - longjmp(peerdied, -1); -} - - /* ARGSUSED */ - SIG_FUNC_RET -intr(sig) - int sig; -{ - if (localchars) { - intp(); - return; - } - setcommandmode(); - longjmp(toplevel, -1); -} - - /* ARGSUSED */ - SIG_FUNC_RET -intr2(sig) - int sig; -{ - if (localchars) { -#ifdef KLUDGELINEMODE - if (kludgelinemode) - sendbrk(); - else -#endif - sendabort(); - return; - } -} - -#ifdef SIGTSTP - /* ARGSUSED */ - SIG_FUNC_RET -susp(sig) - int sig; -{ - if ((rlogin != _POSIX_VDISABLE) && rlogin_susp()) - return; - if (localchars) - sendsusp(); -} -#endif - -#ifdef SIGWINCH - /* ARGSUSED */ - SIG_FUNC_RET -sendwin(sig) - int sig; -{ - if (connected) { - sendnaws(); - } -} -#endif - -#ifdef SIGINFO - /* ARGSUSED */ - SIG_FUNC_RET -ayt(sig) - int sig; -{ - if (connected) - sendayt(); - else - ayt_status(); -} -#endif - - - void -sys_telnet_init() -{ - (void) signal(SIGINT, intr); - (void) signal(SIGQUIT, intr2); - (void) signal(SIGPIPE, deadpeer); -#ifdef SIGWINCH - (void) signal(SIGWINCH, sendwin); -#endif -#ifdef SIGTSTP - (void) signal(SIGTSTP, susp); -#endif -#ifdef SIGINFO - (void) signal(SIGINFO, ayt); -#endif - - setconnmode(0); - - NetNonblockingIO(net, 1); - -#if defined(TN3270) - if (noasynchnet == 0) { /* DBX can't handle! */ - NetSigIO(net, 1); - NetSetPgrp(net); - } -#endif /* defined(TN3270) */ - -#if defined(SO_OOBINLINE) - if (SetSockOpt(net, SOL_SOCKET, SO_OOBINLINE, 1) == -1) { - perror("SetSockOpt"); - } -#endif /* defined(SO_OOBINLINE) */ -} - -/* - * Process rings - - * - * This routine tries to fill up/empty our various rings. - * - * The parameter specifies whether this is a poll operation, - * or a block-until-something-happens operation. - * - * The return value is 1 if something happened, 0 if not. - */ - - int -process_rings(netin, netout, netex, ttyin, ttyout, poll) - int poll; /* If 0, then block until something to do */ -{ - register int c; - /* One wants to be a bit careful about setting returnValue - * to one, since a one implies we did some useful work, - * and therefore probably won't be called to block next - * time (TN3270 mode only). - */ - int returnValue = 0; - static struct timeval TimeValue = { 0 }; - - if (netout) { - FD_SET(net, &obits); - } - if (ttyout) { - FD_SET(tout, &obits); - } -#if defined(TN3270) - if (ttyin) { - FD_SET(tin, &ibits); - } -#else /* defined(TN3270) */ - if (ttyin) { - FD_SET(tin, &ibits); - } -#endif /* defined(TN3270) */ -#if defined(TN3270) - if (netin) { - FD_SET(net, &ibits); - } -# else /* !defined(TN3270) */ - if (netin) { - FD_SET(net, &ibits); - } -# endif /* !defined(TN3270) */ - if (netex) { - FD_SET(net, &xbits); - } - if ((c = select(16, &ibits, &obits, &xbits, - (poll == 0)? (struct timeval *)0 : &TimeValue)) < 0) { - if (c == -1) { - /* - * we can get EINTR if we are in line mode, - * and the user does an escape (TSTP), or - * some other signal generator. - */ - if (errno == EINTR) { - return 0; - } -# if defined(TN3270) - /* - * we can get EBADF if we were in transparent - * mode, and the transcom process died. - */ - if (errno == EBADF) { - /* - * zero the bits (even though kernel does it) - * to make sure we are selecting on the right - * ones. - */ - FD_ZERO(&ibits); - FD_ZERO(&obits); - FD_ZERO(&xbits); - return 0; - } -# endif /* defined(TN3270) */ - /* I don't like this, does it ever happen? */ - printf("sleep(5) from telnet, after select: %s\r\n", strerror(errno)); - sleep(5); - } - return 0; - } - - /* - * Any urgent data? - */ - if (FD_ISSET(net, &xbits)) { - FD_CLR(net, &xbits); - SYNCHing = 1; - (void) ttyflush(1); /* flush already enqueued data */ - } - - /* - * Something to read from the network... - */ - if (FD_ISSET(net, &ibits)) { - int canread; - - FD_CLR(net, &ibits); - canread = ring_empty_consecutive(&netiring); -#if !defined(SO_OOBINLINE) - /* - * In 4.2 (and some early 4.3) systems, the - * OOB indication and data handling in the kernel - * is such that if two separate TCP Urgent requests - * come in, one byte of TCP data will be overlaid. - * This is fatal for Telnet, but we try to live - * with it. - * - * In addition, in 4.2 (and...), a special protocol - * is needed to pick up the TCP Urgent data in - * the correct sequence. - * - * What we do is: if we think we are in urgent - * mode, we look to see if we are "at the mark". - * If we are, we do an OOB receive. If we run - * this twice, we will do the OOB receive twice, - * but the second will fail, since the second - * time we were "at the mark", but there wasn't - * any data there (the kernel doesn't reset - * "at the mark" until we do a normal read). - * Once we've read the OOB data, we go ahead - * and do normal reads. - * - * There is also another problem, which is that - * since the OOB byte we read doesn't put us - * out of OOB state, and since that byte is most - * likely the TELNET DM (data mark), we would - * stay in the TELNET SYNCH (SYNCHing) state. - * So, clocks to the rescue. If we've "just" - * received a DM, then we test for the - * presence of OOB data when the receive OOB - * fails (and AFTER we did the normal mode read - * to clear "at the mark"). - */ - if (SYNCHing) { - int atmark; - static int bogus_oob = 0, first = 1; - - ioctl(net, SIOCATMARK, (char *)&atmark); - if (atmark) { - c = recv(net, netiring.supply, canread, MSG_OOB); - if ((c == -1) && (errno == EINVAL)) { - c = recv(net, netiring.supply, canread, 0); - if (clocks.didnetreceive < clocks.gotDM) { - SYNCHing = stilloob(net); - } - } else if (first && c > 0) { - /* - * Bogosity check. Systems based on 4.2BSD - * do not return an error if you do a second - * recv(MSG_OOB). So, we do one. If it - * succeeds and returns exactly the same - * data, then assume that we are running - * on a broken system and set the bogus_oob - * flag. (If the data was different, then - * we probably got some valid new data, so - * increment the count...) - */ - int i; - i = recv(net, netiring.supply + c, canread - c, MSG_OOB); - if (i == c && - memcmp(netiring.supply, netiring.supply + c, i) == 0) { - bogus_oob = 1; - first = 0; - } else if (i < 0) { - bogus_oob = 0; - first = 0; - } else - c += i; - } - if (bogus_oob && c > 0) { - int i; - /* - * Bogosity. We have to do the read - * to clear the atmark to get out of - * an infinate loop. - */ - i = read(net, netiring.supply + c, canread - c); - if (i > 0) - c += i; - } - } else { - c = recv(net, netiring.supply, canread, 0); - } - } else { - c = recv(net, netiring.supply, canread, 0); - } - settimer(didnetreceive); -#else /* !defined(SO_OOBINLINE) */ - c = recv(net, (char *)netiring.supply, canread, 0); -#endif /* !defined(SO_OOBINLINE) */ - if (c < 0 && errno == EWOULDBLOCK) { - c = 0; - } else if (c <= 0) { - return -1; - } - if (netdata) { - Dump('<', netiring.supply, c); - } - if (c) - ring_supplied(&netiring, c); - returnValue = 1; - } - - /* - * Something to read from the tty... - */ - if (FD_ISSET(tin, &ibits)) { - FD_CLR(tin, &ibits); - c = TerminalRead(ttyiring.supply, ring_empty_consecutive(&ttyiring)); - if (c < 0 && errno == EIO) - c = 0; - if (c < 0 && errno == EWOULDBLOCK) { - c = 0; - } else { - /* EOF detection for line mode!!!! */ - if ((c == 0) && MODE_LOCAL_CHARS(globalmode) && isatty(tin)) { - /* must be an EOF... */ - *ttyiring.supply = termEofChar; - c = 1; - } - if (c <= 0) { - return -1; - } - if (termdata) { - Dump('<', ttyiring.supply, c); - } - ring_supplied(&ttyiring, c); - } - returnValue = 1; /* did something useful */ - } - - if (FD_ISSET(net, &obits)) { - FD_CLR(net, &obits); - returnValue |= netflush(); - } - if (FD_ISSET(tout, &obits)) { - FD_CLR(tout, &obits); - returnValue |= (ttyflush(SYNCHing|flushout) > 0); - } - - return returnValue; -} diff --git a/secure/usr.bin/telnet/telnet.1 b/secure/usr.bin/telnet/telnet.1 deleted file mode 100644 index b996fea3b2b43..0000000000000 --- a/secure/usr.bin/telnet/telnet.1 +++ /dev/null @@ -1,1366 +0,0 @@ -.\" Copyright (c) 1983, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 -.\" -.Dd June 1, 1994 -.Dt TELNET 1 -.Os BSD 4.2 -.Sh NAME -.Nm telnet -.Nd user interface to the -.Tn TELNET -protocol -.Sh SYNOPSIS -.Nm telnet -.Op Fl 8EFKLacdfrx -.Op Fl S Ar tos -.Op Fl X Ar authtype -.Op Fl e Ar escapechar -.Op Fl k Ar realm -.Op Fl l Ar user -.Op Fl n Ar tracefile -.Oo -.Ar host -.Op port -.Oc -.Sh DESCRIPTION -The -.Nm telnet -command -is used to communicate with another host using the -.Tn TELNET -protocol. -If -.Nm telnet -is invoked without the -.Ar host -argument, it enters command mode, -indicated by its prompt -.Pq Nm telnet\&> . -In this mode, it accepts and executes the commands listed below. -If it is invoked with arguments, it performs an -.Ic open -command with those arguments. -.Pp -Options: -.Bl -tag -width indent -.It Fl 8 -Specifies an 8-bit data path. This causes an attempt to -negotiate the -.Dv TELNET BINARY -option on both input and output. -.It Fl E -Stops any character from being recognized as an escape character. -.It Fl F -If Kerberos V5 authentication is being used, the -.Fl F -option allows the local credentials to be forwarded -to the remote system, including any credentials that -have already been forwarded into the local environment. -.It Fl K -Specifies no automatic login to the remote system. -.It Fl L -Specifies an 8-bit data path on output. This causes the -BINARY option to be negotiated on output. -.It Fl S Ar tos -Sets the IP type-of-service (TOS) option for the telnet -connection to the value -.Ar tos, -which can be a numeric TOS value -or, on systems that support it, a symbolic -TOS name found in the /etc/iptos file. -.It Fl X Ar atype -Disables the -.Ar atype -type of authentication. -.It Fl a -Attempt automatic login. -Currently, this sends the user name via the -.Ev USER -variable -of the -.Ev ENVIRON -option if supported by the remote system. -The name used is that of the current user as returned by -.Xr getlogin 2 -if it agrees with the current user ID, -otherwise it is the name associated with the user ID. -.It Fl c -Disables the reading of the user's -.Pa \&.telnetrc -file. (See the -.Ic toggle skiprc -command on this man page.) -.It Fl d -Sets the initial value of the -.Ic debug -toggle to -.Dv TRUE -.It Fl e Ar escape char -Sets the initial -.Nm -.Nm telnet -escape character to -.Ar escape char. -If -.Ar escape char -is omitted, then -there will be no escape character. -.It Fl f -If Kerberos V5 authentication is being used, the -.Fl f -option allows the local credentials to be forwarded to the remote system. -.ne 1i -.It Fl k Ar realm -If Kerberos authentication is being used, the -.Fl k -option requests that telnet obtain tickets for the remote host in -realm realm instead of the remote host's realm, as determined -by -.Xr krb_realmofhost 3 . -.It Fl l Ar user -When connecting to the remote system, if the remote system -understands the -.Ev ENVIRON -option, then -.Ar user -will be sent to the remote system as the value for the variable USER. -This option implies the -.Fl a -option. -This option may also be used with the -.Ic open -command. -.It Fl n Ar tracefile -Opens -.Ar tracefile -for recording trace information. -See the -.Ic set tracefile -command below. -.It Fl r -Specifies a user interface similar to -.Xr rlogin 1 . -In this -mode, the escape character is set to the tilde (~) character, -unless modified by the -e option. -.It Fl x -Turns on encryption of the data stream if possible. This -option is not available outside of the United States and -Canada. -.It Ar host -Indicates the official name, an alias, or the Internet address -of a remote host. -.It Ar port -Indicates a port number (address of an application). If a number is -not specified, the default -.Nm telnet -port is used. -.El -.Pp -When in rlogin mode, a line of the form ~. disconnects from the -remote host; ~ is the telnet escape character. -Similarly, the line ~^Z suspends the telnet session. -The line ~^] escapes to the normal telnet escape prompt. -.Pp -Once a connection has been opened, -.Nm telnet -will attempt to enable the -.Dv TELNET LINEMODE -option. -If this fails, then -.Nm telnet -will revert to one of two input modes: -either \*(Lqcharacter at a time\*(Rq -or \*(Lqold line by line\*(Rq -depending on what the remote system supports. -.Pp -When -.Dv LINEMODE -is enabled, character processing is done on the -local system, under the control of the remote system. When input -editing or character echoing is to be disabled, the remote system -will relay that information. The remote system will also relay -changes to any special characters that happen on the remote -system, so that they can take effect on the local system. -.Pp -In \*(Lqcharacter at a time\*(Rq mode, most -text typed is immediately sent to the remote host for processing. -.Pp -In \*(Lqold line by line\*(Rq mode, all text is echoed locally, -and (normally) only completed lines are sent to the remote host. -The \*(Lqlocal echo character\*(Rq (initially \*(Lq^E\*(Rq) may be used -to turn off and on the local echo -(this would mostly be used to enter passwords -without the password being echoed). -.Pp -If the -.Dv LINEMODE -option is enabled, or if the -.Ic localchars -toggle is -.Dv TRUE -(the default for \*(Lqold line by line\*(Lq; see below), -the user's -.Ic quit , -.Ic intr , -and -.Ic flush -characters are trapped locally, and sent as -.Tn TELNET -protocol sequences to the remote side. -If -.Dv LINEMODE -has ever been enabled, then the user's -.Ic susp -and -.Ic eof -are also sent as -.Tn TELNET -protocol sequences, -and -.Ic quit -is sent as a -.Dv TELNET ABORT -instead of -.Dv BREAK -There are options (see -.Ic toggle -.Ic autoflush -and -.Ic toggle -.Ic autosynch -below) -which cause this action to flush subsequent output to the terminal -(until the remote host acknowledges the -.Tn TELNET -sequence) and flush previous terminal input -(in the case of -.Ic quit -and -.Ic intr ) . -.Pp -While connected to a remote host, -.Nm telnet -command mode may be entered by typing the -.Nm telnet -\*(Lqescape character\*(Rq (initially \*(Lq^]\*(Rq). -When in command mode, the normal terminal editing conventions are available. -.Pp -The following -.Nm telnet -commands are available. -Only enough of each command to uniquely identify it need be typed -(this is also true for arguments to the -.Ic mode , -.Ic set , -.Ic toggle , -.Ic unset , -.Ic slc , -.Ic environ , -and -.Ic display -commands). -.Pp -.Bl -tag -width "mode type" -.It Ic auth Ar argument ... -The auth command manipulates the information sent through the -.Dv TELNET AUTHENTICATE -option. Valid arguments for the -auth command are as follows: -.Bl -tag -width "disable type" -.It Ic disable Ar type -Disables the specified type of authentication. To -obtain a list of available types, use the -.Ic auth disable \&? -command. -.It Ic enable Ar type -Enables the specified type of authentication. To -obtain a list of available types, use the -.Ic auth enable \&? -command. -.It Ic status -Lists the current status of the various types of -authentication. -.El -.It Ic close -Close a -.Tn TELNET -session and return to command mode. -.It Ic display Ar argument ... -Displays all, or some, of the -.Ic set -and -.Ic toggle -values (see below). -.It Ic encrypt Ar argument ... -The encrypt command manipulates the information sent through the -.Dv TELNET ENCRYPT -option. -.Pp -Note: Because of export controls, the -.Dv TELNET ENCRYPT -option is not supported outside of the United States and Canada. -.Pp -Valid arguments for the encrypt command are as follows: -.Bl -tag -width Ar -.It Ic disable Ar type Ic [input|output] -Disables the specified type of encryption. If you -omit the input and output, both input and output -are disabled. To obtain a list of available -types, use the -.Ic encrypt disable \&? -command. -.It Ic enable Ar type Ic [input|output] -Enables the specified type of encryption. If you -omit input and output, both input and output are -enabled. To obtain a list of available types, use the -.Ic encrypt enable \&? -command. -.It Ic input -This is the same as the -.Ic encrypt start input -command. -.It Ic -input -This is the same as the -.Ic encrypt stop input -command. -.It Ic output -This is the same as the -.Ic encrypt start output -command. -.It Ic -output -This is the same as the -.Ic encrypt stop output -command. -.It Ic start Ic [input|output] -Attempts to start encryption. If you omit -.Ic input -and -.Ic output, -both input and output are enabled. To -obtain a list of available types, use the -.Ic encrypt enable \&? -command. -.It Ic status -Lists the current status of encryption. -.It Ic stop Ic [input|output] -Stops encryption. If you omit input and output, -encryption is on both input and output. -.It Ic type Ar type -Sets the default type of encryption to be used -with later -.Ic encrypt start -or -.Ic encrypt stop -commands. -.El -.It Ic environ Ar arguments... -The -.Ic environ -command is used to manipulate the -the variables that my be sent through the -.Dv TELNET ENVIRON -option. -The initial set of variables is taken from the users -environment, with only the -.Ev DISPLAY -and -.Ev PRINTER -variables being exported by default. -The -.Ev USER -variable is also exported if the -.Fl a -or -.Fl l -options are used. -.br -Valid arguments for the -.Ic environ -command are: -.Bl -tag -width Fl -.It Ic define Ar variable value -Define the variable -.Ar variable -to have a value of -.Ar value. -Any variables defined by this command are automatically exported. -The -.Ar value -may be enclosed in single or double quotes so -that tabs and spaces may be included. -.It Ic undefine Ar variable -Remove -.Ar variable -from the list of environment variables. -.It Ic export Ar variable -Mark the variable -.Ar variable -to be exported to the remote side. -.It Ic unexport Ar variable -Mark the variable -.Ar variable -to not be exported unless -explicitly asked for by the remote side. -.It Ic list -List the current set of environment variables. -Those marked with a -.Cm * -will be sent automatically, -other variables will only be sent if explicitly requested. -.It Ic \&? -Prints out help information for the -.Ic environ -command. -.El -.It Ic logout -Sends the -.Dv TELNET LOGOUT -option to the remote side. -This command is similar to a -.Ic close -command; however, if the remote side does not support the -.Dv LOGOUT -option, nothing happens. -If, however, the remote side does support the -.Dv LOGOUT -option, this command should cause the remote side to close the -.Tn TELNET -connection. -If the remote side also supports the concept of -suspending a user's session for later reattachment, -the logout argument indicates that you -should terminate the session immediately. -.It Ic mode Ar type -.Ar Type -is one of several options, depending on the state of the -.Tn TELNET -session. -The remote host is asked for permission to go into the requested mode. -If the remote host is capable of entering that mode, the requested -mode will be entered. -.Bl -tag -width Ar -.It Ic character -Disable the -.Dv TELNET LINEMODE -option, or, if the remote side does not understand the -.Dv LINEMODE -option, then enter \*(Lqcharacter at a time\*(Lq mode. -.It Ic line -Enable the -.Dv TELNET LINEMODE -option, or, if the remote side does not understand the -.Dv LINEMODE -option, then attempt to enter \*(Lqold-line-by-line\*(Lq mode. -.It Ic isig Pq Ic \-isig -Attempt to enable (disable) the -.Dv TRAPSIG -mode of the -.Dv LINEMODE -option. -This requires that the -.Dv LINEMODE -option be enabled. -.It Ic edit Pq Ic \-edit -Attempt to enable (disable) the -.Dv EDIT -mode of the -.Dv LINEMODE -option. -This requires that the -.Dv LINEMODE -option be enabled. -.It Ic softtabs Pq Ic \-softtabs -Attempt to enable (disable) the -.Dv SOFT_TAB -mode of the -.Dv LINEMODE -option. -This requires that the -.Dv LINEMODE -option be enabled. -.ne 1i -.It Ic litecho Pq Ic \-litecho -Attempt to enable (disable) the -.Dv LIT_ECHO -mode of the -.Dv LINEMODE -option. -This requires that the -.Dv LINEMODE -option be enabled. -.It Ic \&? -Prints out help information for the -.Ic mode -command. -.El -.It Xo -.Ic open Ar host -.Oo Op Fl l -.Ar user -.Oc Ns Oo Fl -.Ar port Oc -.Xc -Open a connection to the named host. -If no port number -is specified, -.Nm telnet -will attempt to contact a -.Tn TELNET -server at the default port. -The host specification may be either a host name (see -.Xr hosts 5 ) -or an Internet address specified in the \*(Lqdot notation\*(Rq (see -.Xr inet 3 ) . -The -.Op Fl l -option may be used to specify the user name -to be passed to the remote system via the -.Ev ENVIRON -option. -When connecting to a non-standard port, -.Nm telnet -omits any automatic initiation of -.Tn TELNET -options. When the port number is preceded by a minus sign, -the initial option negotiation is done. -After establishing a connection, the file -.Pa \&.telnetrc -in the -users home directory is opened. Lines beginning with a # are -comment lines. Blank lines are ignored. Lines that begin -without white space are the start of a machine entry. The -first thing on the line is the name of the machine that is -being connected to. The rest of the line, and successive -lines that begin with white space are assumed to be -.Nm telnet -commands and are processed as if they had been typed -in manually to the -.Nm telnet -command prompt. -.It Ic quit -Close any open -.Tn TELNET -session and exit -.Nm telnet . -An end of file (in command mode) will also close a session and exit. -.It Ic send Ar arguments -Sends one or more special character sequences to the remote host. -The following are the arguments which may be specified -(more than one argument may be specified at a time): -.Pp -.Bl -tag -width escape -.It Ic abort -Sends the -.Dv TELNET ABORT -(Abort -processes) -sequence. -.It Ic ao -Sends the -.Dv TELNET AO -(Abort Output) sequence, which should cause the remote system to flush -all output -.Em from -the remote system -.Em to -the user's terminal. -.It Ic ayt -Sends the -.Dv TELNET AYT -(Are You There) -sequence, to which the remote system may or may not choose to respond. -.It Ic brk -Sends the -.Dv TELNET BRK -(Break) sequence, which may have significance to the remote -system. -.It Ic ec -Sends the -.Dv TELNET EC -(Erase Character) -sequence, which should cause the remote system to erase the last character -entered. -.It Ic el -Sends the -.Dv TELNET EL -(Erase Line) -sequence, which should cause the remote system to erase the line currently -being entered. -.It Ic eof -Sends the -.Dv TELNET EOF -(End Of File) -sequence. -.It Ic eor -Sends the -.Dv TELNET EOR -(End of Record) -sequence. -.It Ic escape -Sends the current -.Nm telnet -escape character (initially \*(Lq^\*(Rq). -.It Ic ga -Sends the -.Dv TELNET GA -(Go Ahead) -sequence, which likely has no significance to the remote system. -.It Ic getstatus -If the remote side supports the -.Dv TELNET STATUS -command, -.Ic getstatus -will send the subnegotiation to request that the server send -its current option status. -.ne 1i -.It Ic ip -Sends the -.Dv TELNET IP -(Interrupt Process) sequence, which should cause the remote -system to abort the currently running process. -.It Ic nop -Sends the -.Dv TELNET NOP -(No OPeration) -sequence. -.It Ic susp -Sends the -.Dv TELNET SUSP -(SUSPend process) -sequence. -.It Ic synch -Sends the -.Dv TELNET SYNCH -sequence. -This sequence causes the remote system to discard all previously typed -(but not yet read) input. -This sequence is sent as -.Tn TCP -urgent -data (and may not work if the remote system is a -.Bx 4.2 -system -- if -it doesn't work, a lower case \*(Lqr\*(Rq may be echoed on the terminal). -.It Ic do Ar cmd -.It Ic dont Ar cmd -.It Ic will Ar cmd -.It Ic wont Ar cmd -Sends the -.Dv TELNET DO -.Ar cmd -sequence. -.Ar Cmd -can be either a decimal number between 0 and 255, -or a symbolic name for a specific -.Dv TELNET -command. -.Ar Cmd -can also be either -.Ic help -or -.Ic \&? -to print out help information, including -a list of known symbolic names. -.It Ic \&? -Prints out help information for the -.Ic send -command. -.El -.It Ic set Ar argument value -.It Ic unset Ar argument value -The -.Ic set -command will set any one of a number of -.Nm telnet -variables to a specific value or to -.Dv TRUE . -The special value -.Ic off -turns off the function associated with -the variable, this is equivalent to using the -.Ic unset -command. -The -.Ic unset -command will disable or set to -.Dv FALSE -any of the specified functions. -The values of variables may be interrogated with the -.Ic display -command. -The variables which may be set or unset, but not toggled, are -listed here. In addition, any of the variables for the -.Ic toggle -command may be explicitly set or unset using -the -.Ic set -and -.Ic unset -commands. -.Bl -tag -width escape -.It Ic ayt -If -.Tn TELNET -is in localchars mode, or -.Dv LINEMODE -is enabled, and the status character is typed, a -.Dv TELNET AYT -sequence (see -.Ic send ayt -preceding) is sent to the -remote host. The initial value for the "Are You There" -character is the terminal's status character. -.It Ic echo -This is the value (initially \*(Lq^E\*(Rq) which, when in -\*(Lqline by line\*(Rq mode, toggles between doing local echoing -of entered characters (for normal processing), and suppressing -echoing of entered characters (for entering, say, a password). -.It Ic eof -If -.Nm telnet -is operating in -.Dv LINEMODE -or \*(Lqold line by line\*(Rq mode, entering this character -as the first character on a line will cause this character to be -sent to the remote system. -The initial value of the eof character is taken to be the terminal's -.Ic eof -character. -.It Ic erase -If -.Nm telnet -is in -.Ic localchars -mode (see -.Ic toggle -.Ic localchars -below), -.Sy and -if -.Nm telnet -is operating in \*(Lqcharacter at a time\*(Rq mode, then when this -character is typed, a -.Dv TELNET EC -sequence (see -.Ic send -.Ic ec -above) -is sent to the remote system. -The initial value for the erase character is taken to be -the terminal's -.Ic erase -character. -.It Ic escape -This is the -.Nm telnet -escape character (initially \*(Lq^[\*(Rq) which causes entry -into -.Nm telnet -command mode (when connected to a remote system). -.It Ic flushoutput -If -.Nm telnet -is in -.Ic localchars -mode (see -.Ic toggle -.Ic localchars -below) -and the -.Ic flushoutput -character is typed, a -.Dv TELNET AO -sequence (see -.Ic send -.Ic ao -above) -is sent to the remote host. -The initial value for the flush character is taken to be -the terminal's -.Ic flush -character. -.It Ic forw1 -.It Ic forw2 -If -.Tn TELNET -is operating in -.Dv LINEMODE , -these are the -characters that, when typed, cause partial lines to be -forwarded to the remote system. The initial value for -the forwarding characters are taken from the terminal's -eol and eol2 characters. -.It Ic interrupt -If -.Nm telnet -is in -.Ic localchars -mode (see -.Ic toggle -.Ic localchars -below) -and the -.Ic interrupt -character is typed, a -.Dv TELNET IP -sequence (see -.Ic send -.Ic ip -above) -is sent to the remote host. -The initial value for the interrupt character is taken to be -the terminal's -.Ic intr -character. -.It Ic kill -If -.Nm telnet -is in -.Ic localchars -mode (see -.Ic toggle -.Ic localchars -below), -.Ic and -if -.Nm telnet -is operating in \*(Lqcharacter at a time\*(Rq mode, then when this -character is typed, a -.Dv TELNET EL -sequence (see -.Ic send -.Ic el -above) -is sent to the remote system. -The initial value for the kill character is taken to be -the terminal's -.Ic kill -character. -.It Ic lnext -If -.Nm telnet -is operating in -.Dv LINEMODE -or \*(Lqold line by line\*(Lq mode, then this character is taken to -be the terminal's -.Ic lnext -character. -The initial value for the lnext character is taken to be -the terminal's -.Ic lnext -character. -.It Ic quit -If -.Nm telnet -is in -.Ic localchars -mode (see -.Ic toggle -.Ic localchars -below) -and the -.Ic quit -character is typed, a -.Dv TELNET BRK -sequence (see -.Ic send -.Ic brk -above) -is sent to the remote host. -The initial value for the quit character is taken to be -the terminal's -.Ic quit -character. -.It Ic reprint -If -.Nm telnet -is operating in -.Dv LINEMODE -or \*(Lqold line by line\*(Lq mode, then this character is taken to -be the terminal's -.Ic reprint -character. -The initial value for the reprint character is taken to be -the terminal's -.Ic reprint -character. -.It Ic rlogin -This is the rlogin escape character. -If set, the normal -.Tn TELNET -escape character is ignored unless it is -preceded by this character at the beginning of a line. -This character, at the beginning of a line followed by -a "." closes the connection; when followed by a ^Z it -suspends the telnet command. The initial state is to -disable the rlogin escape character. -.It Ic start -If the -.Dv TELNET TOGGLE-FLOW-CONTROL -option has been enabled, -then this character is taken to -be the terminal's -.Ic start -character. -The initial value for the kill character is taken to be -the terminal's -.Ic start -character. -.It Ic stop -If the -.Dv TELNET TOGGLE-FLOW-CONTROL -option has been enabled, -then this character is taken to -be the terminal's -.Ic stop -character. -The initial value for the kill character is taken to be -the terminal's -.Ic stop -character. -.It Ic susp -If -.Nm telnet -is in -.Ic localchars -mode, or -.Dv LINEMODE -is enabled, and the -.Ic suspend -character is typed, a -.Dv TELNET SUSP -sequence (see -.Ic send -.Ic susp -above) -is sent to the remote host. -The initial value for the suspend character is taken to be -the terminal's -.Ic suspend -character. -.ne 1i -.It Ic tracefile -This is the file to which the output, caused by -.Ic netdata -or -.Ic option -tracing being -.Dv TRUE , -will be written. If it is set to -.Dq Fl , -then tracing information will be written to standard output (the default). -.It Ic worderase -If -.Nm telnet -is operating in -.Dv LINEMODE -or \*(Lqold line by line\*(Lq mode, then this character is taken to -be the terminal's -.Ic worderase -character. -The initial value for the worderase character is taken to be -the terminal's -.Ic worderase -character. -.It Ic \&? -Displays the legal -.Ic set -.Pq Ic unset -commands. -.El -.It Ic slc Ar state -The -.Ic slc -command (Set Local Characters) is used to set -or change the state of the the special -characters when the -.Dv TELNET LINEMODE -option has -been enabled. Special characters are characters that get -mapped to -.Tn TELNET -commands sequences (like -.Ic ip -or -.Ic quit ) -or line editing characters (like -.Ic erase -and -.Ic kill ) . -By default, the local special characters are exported. -.Bl -tag -width Fl -.It Ic check -Verify the current settings for the current special characters. -The remote side is requested to send all the current special -character settings, and if there are any discrepancies with -the local side, the local side will switch to the remote value. -.It Ic export -Switch to the local defaults for the special characters. The -local default characters are those of the local terminal at -the time when -.Nm telnet -was started. -.It Ic import -Switch to the remote defaults for the special characters. -The remote default characters are those of the remote system -at the time when the -.Tn TELNET -connection was established. -.It Ic \&? -Prints out help information for the -.Ic slc -command. -.El -.It Ic status -Show the current status of -.Nm telnet . -This includes the peer one is connected to, as well -as the current mode. -.It Ic toggle Ar arguments ... -Toggle (between -.Dv TRUE -and -.Dv FALSE ) -various flags that control how -.Nm telnet -responds to events. -These flags may be set explicitly to -.Dv TRUE -or -.Dv FALSE -using the -.Ic set -and -.Ic unset -commands listed above. -More than one argument may be specified. -The state of these flags may be interrogated with the -.Ic display -command. -Valid arguments are: -.Bl -tag -width Ar -.It Ic authdebug -Turns on debugging information for the authentication code. -.It Ic autoflush -If -.Ic autoflush -and -.Ic localchars -are both -.Dv TRUE , -then when the -.Ic ao , -or -.Ic quit -characters are recognized (and transformed into -.Tn TELNET -sequences; see -.Ic set -above for details), -.Nm telnet -refuses to display any data on the user's terminal -until the remote system acknowledges (via a -.Dv TELNET TIMING MARK -option) -that it has processed those -.Tn TELNET -sequences. -The initial value for this toggle is -.Dv TRUE -if the terminal user had not -done an "stty noflsh", otherwise -.Dv FALSE -(see -.Xr stty 1 ) . -.It Ic autodecrypt -When the -.Dv TELNET ENCRYPT -option is negotiated, by -default the actual encryption (decryption) of the data -stream does not start automatically. The autoencrypt -(autodecrypt) command states that encryption of the -output (input) stream should be enabled as soon as -possible. -.sp -.Pp -Note: Because of export controls, the -.Dv TELNET ENCRYPT -option is not supported outside the United States and Canada. -.It Ic autologin -If the remote side supports the -.Dv TELNET AUTHENTICATION -option -.Tn TELNET -attempts to use it to perform automatic authentication. If the -.Dv AUTHENTICATION -option is not supported, the user's login -name are propagated through the -.Dv TELNET ENVIRON -option. -This command is the same as specifying -.Ar a -option on the -.Ic open -command. -.It Ic autosynch -If -.Ic autosynch -and -.Ic localchars -are both -.Dv TRUE , -then when either the -.Ic intr -or -.Ic quit -characters is typed (see -.Ic set -above for descriptions of the -.Ic intr -and -.Ic quit -characters), the resulting -.Tn TELNET -sequence sent is followed by the -.Dv TELNET SYNCH -sequence. -This procedure -.Ic should -cause the remote system to begin throwing away all previously -typed input until both of the -.Tn TELNET -sequences have been read and acted upon. -The initial value of this toggle is -.Dv FALSE . -.It Ic binary -Enable or disable the -.Dv TELNET BINARY -option on both input and output. -.It Ic inbinary -Enable or disable the -.Dv TELNET BINARY -option on input. -.It Ic outbinary -Enable or disable the -.Dv TELNET BINARY -option on output. -.It Ic crlf -If this is -.Dv TRUE , -then carriage returns will be sent as -.Li . -If this is -.Dv FALSE , -then carriage returns will be send as -.Li . -The initial value for this toggle is -.Dv FALSE . -.It Ic crmod -Toggle carriage return mode. -When this mode is enabled, most carriage return characters received from -the remote host will be mapped into a carriage return followed by -a line feed. -This mode does not affect those characters typed by the user, only -those received from the remote host. -This mode is not very useful unless the remote host -only sends carriage return, but never line feed. -The initial value for this toggle is -.Dv FALSE . -.It Ic debug -Toggles socket level debugging (useful only to the -.Ic super user ) . -The initial value for this toggle is -.Dv FALSE . -.It Ic encdebug -Turns on debugging information for the encryption code. -.It Ic localchars -If this is -.Dv TRUE , -then the -.Ic flush , -.Ic interrupt , -.Ic quit , -.Ic erase , -and -.Ic kill -characters (see -.Ic set -above) are recognized locally, and transformed into (hopefully) appropriate -.Tn TELNET -control sequences -(respectively -.Ic ao , -.Ic ip , -.Ic brk , -.Ic ec , -and -.Ic el ; -see -.Ic send -above). -The initial value for this toggle is -.Dv TRUE -in \*(Lqold line by line\*(Rq mode, -and -.Dv FALSE -in \*(Lqcharacter at a time\*(Rq mode. -When the -.Dv LINEMODE -option is enabled, the value of -.Ic localchars -is ignored, and assumed to always be -.Dv TRUE . -If -.Dv LINEMODE -has ever been enabled, then -.Ic quit -is sent as -.Ic abort , -and -.Ic eof and -.B suspend -are sent as -.Ic eof and -.Ic susp , -see -.Ic send -above). -.It Ic netdata -Toggles the display of all network data (in hexadecimal format). -The initial value for this toggle is -.Dv FALSE . -.It Ic options -Toggles the display of some internal -.Nm telnet -protocol processing (having to do with -.Tn TELNET -options). -The initial value for this toggle is -.Dv FALSE . -.ne 1i -.It Ic prettydump -When the -.Ic netdata -toggle is enabled, if -.Ic prettydump -is enabled the output from the -.Ic netdata -command will be formatted in a more user readable format. -Spaces are put between each character in the output, and the -beginning of any -.Tn TELNET -escape sequence is preceded by a '*' to aid in locating them. -.It Ic skiprc -When the skiprc toggle is -.Dv TRUE , -.Tn TELNET -skips the reading of the -.Pa \&.telnetrc -file in the users home -directory when connections are opened. The initial -value for this toggle is -.Dv FALSE. -.It Ic termdata -Toggles the display of all terminal data (in hexadecimal format). -The initial value for this toggle is -.Dv FALSE . -.It Ic verbose_encrypt -When the -.Ic verbose_encrypt -toggle is -.Dv TRUE , -.Tn TELNET -prints out a message each time encryption is enabled or -disabled. The initial value for this toggle is -.Dv FALSE. -Note: Because of export controls, data encryption -is not supported outside of the United States and Canada. -.It Ic \&? -Displays the legal -.Ic toggle -commands. -.El -.It Ic z -Suspend -.Nm telnet . -This command only works when the user is using the -.Xr csh 1 . -.It Ic \&! Op Ar command -Execute a single command in a subshell on the local -system. If -.Ic command -is omitted, then an interactive -subshell is invoked. -.It Ic \&? Op Ar command -Get help. With no arguments, -.Nm telnet -prints a help summary. -If a command is specified, -.Nm telnet -will print the help information for just that command. -.El -.Sh ENVIRONMENT -.Nm Telnet -uses at least the -.Ev HOME , -.Ev SHELL , -.Ev DISPLAY , -and -.Ev TERM -environment variables. -Other environment variables may be propagated -to the other side via the -.Dv TELNET ENVIRON -option. -.Sh FILES -.Bl -tag -width ~/.telnetrc -compact -.It Pa ~/.telnetrc -user customized telnet startup values -.El -.Sh HISTORY -The -.Nm Telnet -command appeared in -.Bx 4.2 . -.Sh NOTES -.Pp -On some remote systems, echo has to be turned off manually when in -\*(Lqold line by line\*(Rq mode. -.Pp -In \*(Lqold line by line\*(Rq mode or -.Dv LINEMODE -the terminal's -.Ic eof -character is only recognized (and sent to the remote system) -when it is the first character on a line. diff --git a/secure/usr.bin/telnet/telnet.c b/secure/usr.bin/telnet/telnet.c deleted file mode 100644 index c025449dfbd92..0000000000000 --- a/secure/usr.bin/telnet/telnet.c +++ /dev/null @@ -1,2651 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include - -#if defined(unix) -#include -/* By the way, we need to include curses.h before telnet.h since, - * among other things, telnet.h #defines 'DO', which is a variable - * declared in curses.h. - */ -#endif /* defined(unix) */ - -#include - -#include - -#include "ring.h" - -#include "defines.h" -#include "externs.h" -#include "types.h" -#include "general.h" - - -#define strip(x) ((my_want_state_is_wont(TELOPT_BINARY)) ? ((x)&0x7f) : (x)) - -static unsigned char subbuffer[SUBBUFSIZE], - *subpointer, *subend; /* buffer for sub-options */ -#define SB_CLEAR() subpointer = subbuffer; -#define SB_TERM() { subend = subpointer; SB_CLEAR(); } -#define SB_ACCUM(c) if (subpointer < (subbuffer+sizeof subbuffer)) { \ - *subpointer++ = (c); \ - } - -#define SB_GET() ((*subpointer++)&0xff) -#define SB_PEEK() ((*subpointer)&0xff) -#define SB_EOF() (subpointer >= subend) -#define SB_LEN() (subend - subpointer) - -char options[256]; /* The combined options */ -char do_dont_resp[256]; -char will_wont_resp[256]; - -int - eight = 0, - autologin = 0, /* Autologin anyone? */ - skiprc = 0, - connected, - showoptions, - In3270, /* Are we in 3270 mode? */ - ISend, /* trying to send network data in */ - debug = 0, - crmod, - netdata, /* Print out network data flow */ - crlf, /* Should '\r' be mapped to (or )? */ -#if defined(TN3270) - noasynchtty = 0,/* User specified "-noasynch" on command line */ - noasynchnet = 0,/* User specified "-noasynch" on command line */ - askedSGA = 0, /* We have talked about suppress go ahead */ -#endif /* defined(TN3270) */ - telnetport, - SYNCHing, /* we are in TELNET SYNCH mode */ - flushout, /* flush output */ - autoflush = 0, /* flush output when interrupting? */ - autosynch, /* send interrupt characters with SYNCH? */ - localflow, /* we handle flow control locally */ - restartany, /* if flow control enabled, restart on any character */ - localchars, /* we recognize interrupt/quit */ - donelclchars, /* the user has set "localchars" */ - donebinarytoggle, /* the user has put us in binary */ - dontlecho, /* do we suppress local echoing right now? */ - globalmode, - clienteof = 0; - -char *prompt = 0; - -cc_t escape; -cc_t rlogin; -#ifdef KLUDGELINEMODE -cc_t echoc; -#endif - -/* - * Telnet receiver states for fsm - */ -#define TS_DATA 0 -#define TS_IAC 1 -#define TS_WILL 2 -#define TS_WONT 3 -#define TS_DO 4 -#define TS_DONT 5 -#define TS_CR 6 -#define TS_SB 7 /* sub-option collection */ -#define TS_SE 8 /* looking for sub-option end */ - -static int telrcv_state; -#ifdef OLD_ENVIRON -unsigned char telopt_environ = TELOPT_NEW_ENVIRON; -#else -# define telopt_environ TELOPT_NEW_ENVIRON -#endif - -jmp_buf toplevel = { 0 }; -jmp_buf peerdied; - -int flushline; -int linemode; - -#ifdef KLUDGELINEMODE -int kludgelinemode = 1; -#endif - -/* - * The following are some clocks used to decide how to interpret - * the relationship between various variables. - */ - -Clocks clocks; - -#ifdef notdef -Modelist modelist[] = { - { "telnet command mode", COMMAND_LINE }, - { "character-at-a-time mode", 0 }, - { "character-at-a-time mode (local echo)", LOCAL_ECHO|LOCAL_CHARS }, - { "line-by-line mode (remote echo)", LINE | LOCAL_CHARS }, - { "line-by-line mode", LINE | LOCAL_ECHO | LOCAL_CHARS }, - { "line-by-line mode (local echoing suppressed)", LINE | LOCAL_CHARS }, - { "3270 mode", 0 }, -}; -#endif - - -/* - * Initialize telnet environment. - */ - - void -init_telnet() -{ - env_init(); - - SB_CLEAR(); - ClearArray(options); - - connected = In3270 = ISend = localflow = donebinarytoggle = 0; -#if defined(AUTHENTICATION) || defined(ENCRYPTION) - auth_encrypt_connect(connected); -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ - restartany = -1; - - SYNCHing = 0; - - /* Don't change NetTrace */ - - escape = CONTROL(']'); - rlogin = _POSIX_VDISABLE; -#ifdef KLUDGELINEMODE - echoc = CONTROL('E'); -#endif - - flushline = 1; - telrcv_state = TS_DATA; -} - - -#ifdef notdef -#include - - /*VARARGS*/ - static void -printring(va_alist) - va_dcl -{ - va_list ap; - char buffer[100]; /* where things go */ - char *ptr; - char *format; - char *string; - Ring *ring; - int i; - - va_start(ap); - - ring = va_arg(ap, Ring *); - format = va_arg(ap, char *); - ptr = buffer; - - while ((i = *format++) != 0) { - if (i == '%') { - i = *format++; - switch (i) { - case 'c': - *ptr++ = va_arg(ap, int); - break; - case 's': - string = va_arg(ap, char *); - ring_supply_data(ring, buffer, ptr-buffer); - ring_supply_data(ring, string, strlen(string)); - ptr = buffer; - break; - case 0: - ExitString("printring: trailing %%.\n", 1); - /*NOTREACHED*/ - default: - ExitString("printring: unknown format character.\n", 1); - /*NOTREACHED*/ - } - } else { - *ptr++ = i; - } - } - ring_supply_data(ring, buffer, ptr-buffer); -} -#endif - -/* - * These routines are in charge of sending option negotiations - * to the other side. - * - * The basic idea is that we send the negotiation if either side - * is in disagreement as to what the current state should be. - */ - - void -send_do(c, init) - register int c, init; -{ - if (init) { - if (((do_dont_resp[c] == 0) && my_state_is_do(c)) || - my_want_state_is_do(c)) - return; - set_my_want_state_do(c); - do_dont_resp[c]++; - } - NET2ADD(IAC, DO); - NETADD(c); - printoption("SENT", DO, c); -} - - void -send_dont(c, init) - register int c, init; -{ - if (init) { - if (((do_dont_resp[c] == 0) && my_state_is_dont(c)) || - my_want_state_is_dont(c)) - return; - set_my_want_state_dont(c); - do_dont_resp[c]++; - } - NET2ADD(IAC, DONT); - NETADD(c); - printoption("SENT", DONT, c); -} - - void -send_will(c, init) - register int c, init; -{ - if (init) { - if (((will_wont_resp[c] == 0) && my_state_is_will(c)) || - my_want_state_is_will(c)) - return; - set_my_want_state_will(c); - will_wont_resp[c]++; - } - NET2ADD(IAC, WILL); - NETADD(c); - printoption("SENT", WILL, c); -} - - void -send_wont(c, init) - register int c, init; -{ - if (init) { - if (((will_wont_resp[c] == 0) && my_state_is_wont(c)) || - my_want_state_is_wont(c)) - return; - set_my_want_state_wont(c); - will_wont_resp[c]++; - } - NET2ADD(IAC, WONT); - NETADD(c); - printoption("SENT", WONT, c); -} - - - void -willoption(option) - int option; -{ - int new_state_ok = 0; - - if (do_dont_resp[option]) { - --do_dont_resp[option]; - if (do_dont_resp[option] && my_state_is_do(option)) - --do_dont_resp[option]; - } - - if ((do_dont_resp[option] == 0) && my_want_state_is_dont(option)) { - - switch (option) { - - case TELOPT_ECHO: -# if defined(TN3270) - /* - * The following is a pain in the rear-end. - * Various IBM servers (some versions of Wiscnet, - * possibly Fibronics/Spartacus, and who knows who - * else) will NOT allow us to send "DO SGA" too early - * in the setup proceedings. On the other hand, - * 4.2 servers (telnetd) won't set SGA correctly. - * So, we are stuck. Empirically (but, based on - * a VERY small sample), the IBM servers don't send - * out anything about ECHO, so we postpone our sending - * "DO SGA" until we see "WILL ECHO" (which 4.2 servers - * DO send). - */ - { - if (askedSGA == 0) { - askedSGA = 1; - if (my_want_state_is_dont(TELOPT_SGA)) - send_do(TELOPT_SGA, 1); - } - } - /* Fall through */ - case TELOPT_EOR: -#endif /* defined(TN3270) */ - case TELOPT_BINARY: - case TELOPT_SGA: - settimer(modenegotiated); - /* FALL THROUGH */ - case TELOPT_STATUS: -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: -#endif -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: -#endif /* ENCRYPTION */ - new_state_ok = 1; - break; - - case TELOPT_TM: - if (flushout) - flushout = 0; - /* - * Special case for TM. If we get back a WILL, - * pretend we got back a WONT. - */ - set_my_want_state_dont(option); - set_my_state_dont(option); - return; /* Never reply to TM will's/wont's */ - - case TELOPT_LINEMODE: - default: - break; - } - - if (new_state_ok) { - set_my_want_state_do(option); - send_do(option, 0); - setconnmode(0); /* possibly set new tty mode */ - } else { - do_dont_resp[option]++; - send_dont(option, 0); - } - } - set_my_state_do(option); -#ifdef ENCRYPTION - if (option == TELOPT_ENCRYPT) - encrypt_send_support(); -#endif /* ENCRYPTION */ -} - - void -wontoption(option) - int option; -{ - if (do_dont_resp[option]) { - --do_dont_resp[option]; - if (do_dont_resp[option] && my_state_is_dont(option)) - --do_dont_resp[option]; - } - - if ((do_dont_resp[option] == 0) && my_want_state_is_do(option)) { - - switch (option) { - -#ifdef KLUDGELINEMODE - case TELOPT_SGA: - if (!kludgelinemode) - break; - /* FALL THROUGH */ -#endif - case TELOPT_ECHO: - settimer(modenegotiated); - break; - - case TELOPT_TM: - if (flushout) - flushout = 0; - set_my_want_state_dont(option); - set_my_state_dont(option); - return; /* Never reply to TM will's/wont's */ - - default: - break; - } - set_my_want_state_dont(option); - if (my_state_is_do(option)) - send_dont(option, 0); - setconnmode(0); /* Set new tty mode */ - } else if (option == TELOPT_TM) { - /* - * Special case for TM. - */ - if (flushout) - flushout = 0; - set_my_want_state_dont(option); - } - set_my_state_dont(option); -} - - static void -dooption(option) - int option; -{ - int new_state_ok = 0; - - if (will_wont_resp[option]) { - --will_wont_resp[option]; - if (will_wont_resp[option] && my_state_is_will(option)) - --will_wont_resp[option]; - } - - if (will_wont_resp[option] == 0) { - if (my_want_state_is_wont(option)) { - - switch (option) { - - case TELOPT_TM: - /* - * Special case for TM. We send a WILL, but pretend - * we sent WONT. - */ - send_will(option, 0); - set_my_want_state_wont(TELOPT_TM); - set_my_state_wont(TELOPT_TM); - return; - -# if defined(TN3270) - case TELOPT_EOR: /* end of record */ -# endif /* defined(TN3270) */ - case TELOPT_BINARY: /* binary mode */ - case TELOPT_NAWS: /* window size */ - case TELOPT_TSPEED: /* terminal speed */ - case TELOPT_LFLOW: /* local flow control */ - case TELOPT_TTYPE: /* terminal type option */ - case TELOPT_SGA: /* no big deal */ -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: /* encryption variable option */ -#endif /* ENCRYPTION */ - new_state_ok = 1; - break; - - case TELOPT_NEW_ENVIRON: /* New environment variable option */ -#ifdef OLD_ENVIRON - if (my_state_is_will(TELOPT_OLD_ENVIRON)) - send_wont(TELOPT_OLD_ENVIRON, 1); /* turn off the old */ - goto env_common; - case TELOPT_OLD_ENVIRON: /* Old environment variable option */ - if (my_state_is_will(TELOPT_NEW_ENVIRON)) - break; /* Don't enable if new one is in use! */ - env_common: - telopt_environ = option; -#endif - new_state_ok = 1; - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - if (autologin) - new_state_ok = 1; - break; -#endif - - case TELOPT_XDISPLOC: /* X Display location */ - if (env_getvalue((unsigned char *)"DISPLAY")) - new_state_ok = 1; - break; - - case TELOPT_LINEMODE: -#ifdef KLUDGELINEMODE - kludgelinemode = 0; - send_do(TELOPT_SGA, 1); -#endif - set_my_want_state_will(TELOPT_LINEMODE); - send_will(option, 0); - set_my_state_will(TELOPT_LINEMODE); - slc_init(); - return; - - case TELOPT_ECHO: /* We're never going to echo... */ - default: - break; - } - - if (new_state_ok) { - set_my_want_state_will(option); - send_will(option, 0); - setconnmode(0); /* Set new tty mode */ - } else { - will_wont_resp[option]++; - send_wont(option, 0); - } - } else { - /* - * Handle options that need more things done after the - * other side has acknowledged the option. - */ - switch (option) { - case TELOPT_LINEMODE: -#ifdef KLUDGELINEMODE - kludgelinemode = 0; - send_do(TELOPT_SGA, 1); -#endif - set_my_state_will(option); - slc_init(); - send_do(TELOPT_SGA, 0); - return; - } - } - } - set_my_state_will(option); -} - - static void -dontoption(option) - int option; -{ - - if (will_wont_resp[option]) { - --will_wont_resp[option]; - if (will_wont_resp[option] && my_state_is_wont(option)) - --will_wont_resp[option]; - } - - if ((will_wont_resp[option] == 0) && my_want_state_is_will(option)) { - switch (option) { - case TELOPT_LINEMODE: - linemode = 0; /* put us back to the default state */ - break; -#ifdef OLD_ENVIRON - case TELOPT_NEW_ENVIRON: - /* - * The new environ option wasn't recognized, try - * the old one. - */ - send_will(TELOPT_OLD_ENVIRON, 1); - telopt_environ = TELOPT_OLD_ENVIRON; - break; -#endif - } - /* we always accept a DONT */ - set_my_want_state_wont(option); - if (my_state_is_will(option)) - send_wont(option, 0); - setconnmode(0); /* Set new tty mode */ - } - set_my_state_wont(option); -} - -/* - * Given a buffer returned by tgetent(), this routine will turn - * the pipe seperated list of names in the buffer into an array - * of pointers to null terminated names. We toss out any bad, - * duplicate, or verbose names (names with spaces). - */ - -static char *name_unknown = "UNKNOWN"; -static char *unknown[] = { 0, 0 }; - - char ** -mklist(buf, name) - char *buf, *name; -{ - register int n; - register char c, *cp, **argvp, *cp2, **argv, **avt; - - if (name) { - if ((int)strlen(name) > 40) { - name = 0; - unknown[0] = name_unknown; - } else { - unknown[0] = name; - upcase(name); - } - } else - unknown[0] = name_unknown; - /* - * Count up the number of names. - */ - for (n = 1, cp = buf; *cp && *cp != ':'; cp++) { - if (*cp == '|') - n++; - } - /* - * Allocate an array to put the name pointers into - */ - argv = (char **)malloc((n+3)*sizeof(char *)); - if (argv == 0) - return(unknown); - - /* - * Fill up the array of pointers to names. - */ - *argv = 0; - argvp = argv+1; - n = 0; - for (cp = cp2 = buf; (c = *cp); cp++) { - if (c == '|' || c == ':') { - *cp++ = '\0'; - /* - * Skip entries that have spaces or are over 40 - * characters long. If this is our environment - * name, then put it up front. Otherwise, as - * long as this is not a duplicate name (case - * insensitive) add it to the list. - */ - if (n || (cp - cp2 > 41)) - ; - else if (name && (strncasecmp(name, cp2, cp-cp2) == 0)) - *argv = cp2; - else if (is_unique(cp2, argv+1, argvp)) - *argvp++ = cp2; - if (c == ':') - break; - /* - * Skip multiple delimiters. Reset cp2 to - * the beginning of the next name. Reset n, - * the flag for names with spaces. - */ - while ((c = *cp) == '|') - cp++; - cp2 = cp; - n = 0; - } - /* - * Skip entries with spaces or non-ascii values. - * Convert lower case letters to upper case. - */ - if ((c == ' ') || !isascii(c)) - n = 1; - else if (islower(c)) - *cp = toupper(c); - } - - /* - * Check for an old V6 2 character name. If the second - * name points to the beginning of the buffer, and is - * only 2 characters long, move it to the end of the array. - */ - if ((argv[1] == buf) && (strlen(argv[1]) == 2)) { - --argvp; - for (avt = &argv[1]; avt < argvp; avt++) - *avt = *(avt+1); - *argvp++ = buf; - } - - /* - * Duplicate last name, for TTYPE option, and null - * terminate the array. If we didn't find a match on - * our terminal name, put that name at the beginning. - */ - cp = *(argvp-1); - *argvp++ = cp; - *argvp = 0; - - if (*argv == 0) { - if (name) - *argv = name; - else { - --argvp; - for (avt = argv; avt < argvp; avt++) - *avt = *(avt+1); - } - } - if (*argv) - return(argv); - else - return(unknown); -} - - int -is_unique(name, as, ae) - register char *name, **as, **ae; -{ - register char **ap; - register int n; - - n = strlen(name) + 1; - for (ap = as; ap < ae; ap++) - if (strncasecmp(*ap, name, n) == 0) - return(0); - return (1); -} - -#ifdef TERMCAP -char termbuf[1024]; - - /*ARGSUSED*/ - int -setupterm(tname, fd, errp) - char *tname; - int fd, *errp; -{ - if (tgetent(termbuf, tname) == 1) { - termbuf[1023] = '\0'; - if (errp) - *errp = 1; - return(0); - } - if (errp) - *errp = 0; - return(-1); -} -#else -#define termbuf ttytype -extern char ttytype[]; -#endif - -int resettermname = 1; - - char * -gettermname() -{ - char *tname; - static char **tnamep = 0; - static char **next; - int err; - - if (resettermname) { - resettermname = 0; - if (tnamep && tnamep != unknown) - free(tnamep); - if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) && - (setupterm(tname, 1, &err) == 0)) { - tnamep = mklist(termbuf, tname); - } else { - if (tname && ((int)strlen(tname) <= 40)) { - unknown[0] = tname; - upcase(tname); - } else - unknown[0] = name_unknown; - tnamep = unknown; - } - next = tnamep; - } - if (*next == 0) - next = tnamep; - return(*next++); -} -/* - * suboption() - * - * Look at the sub-option buffer, and try to be helpful to the other - * side. - * - * Currently we recognize: - * - * Terminal type, send request. - * Terminal speed (send request). - * Local flow control (is request). - * Linemode - */ - - static void -suboption() -{ - unsigned char subchar; - - printsub('<', subbuffer, SB_LEN()+2); - switch (subchar = SB_GET()) { - case TELOPT_TTYPE: - if (my_want_state_is_wont(TELOPT_TTYPE)) - return; - if (SB_EOF() || SB_GET() != TELQUAL_SEND) { - return; - } else { - char *name; - unsigned char temp[50]; - int len; - -#if defined(TN3270) - if (tn3270_ttype()) { - return; - } -#endif /* defined(TN3270) */ - name = gettermname(); - len = strlen(name) + 4 + 2; - if (len < NETROOM()) { - sprintf((char *)temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE, - TELQUAL_IS, name, IAC, SE); - ring_supply_data(&netoring, temp, len); - printsub('>', &temp[2], len-2); - } else { - ExitString("No room in buffer for terminal type.\n", 1); - /*NOTREACHED*/ - } - } - break; - case TELOPT_TSPEED: - if (my_want_state_is_wont(TELOPT_TSPEED)) - return; - if (SB_EOF()) - return; - if (SB_GET() == TELQUAL_SEND) { - long ospeed, ispeed; - unsigned char temp[50]; - int len; - - TerminalSpeeds(&ispeed, &ospeed); - - sprintf((char *)temp, "%c%c%c%c%d,%d%c%c", IAC, SB, TELOPT_TSPEED, - TELQUAL_IS, ospeed, ispeed, IAC, SE); - len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */ - - if (len < NETROOM()) { - ring_supply_data(&netoring, temp, len); - printsub('>', temp+2, len - 2); - } -/*@*/ else printf("lm_will: not enough room in buffer\n"); - } - break; - case TELOPT_LFLOW: - if (my_want_state_is_wont(TELOPT_LFLOW)) - return; - if (SB_EOF()) - return; - switch(SB_GET()) { - case LFLOW_RESTART_ANY: - restartany = 1; - break; - case LFLOW_RESTART_XON: - restartany = 0; - break; - case LFLOW_ON: - localflow = 1; - break; - case LFLOW_OFF: - localflow = 0; - break; - default: - return; - } - setcommandmode(); - setconnmode(0); - break; - - case TELOPT_LINEMODE: - if (my_want_state_is_wont(TELOPT_LINEMODE)) - return; - if (SB_EOF()) - return; - switch (SB_GET()) { - case WILL: - lm_will(subpointer, SB_LEN()); - break; - case WONT: - lm_wont(subpointer, SB_LEN()); - break; - case DO: - lm_do(subpointer, SB_LEN()); - break; - case DONT: - lm_dont(subpointer, SB_LEN()); - break; - case LM_SLC: - slc(subpointer, SB_LEN()); - break; - case LM_MODE: - lm_mode(subpointer, SB_LEN(), 0); - break; - default: - break; - } - break; - -#ifdef OLD_ENVIRON - case TELOPT_OLD_ENVIRON: -#endif - case TELOPT_NEW_ENVIRON: - if (SB_EOF()) - return; - switch(SB_PEEK()) { - case TELQUAL_IS: - case TELQUAL_INFO: - if (my_want_state_is_dont(subchar)) - return; - break; - case TELQUAL_SEND: - if (my_want_state_is_wont(subchar)) { - return; - } - break; - default: - return; - } - env_opt(subpointer, SB_LEN()); - break; - - case TELOPT_XDISPLOC: - if (my_want_state_is_wont(TELOPT_XDISPLOC)) - return; - if (SB_EOF()) - return; - if (SB_GET() == TELQUAL_SEND) { - unsigned char temp[50], *dp; - int len; - - if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) { - /* - * Something happened, we no longer have a DISPLAY - * variable. So, turn off the option. - */ - send_wont(TELOPT_XDISPLOC, 1); - break; - } - sprintf((char *)temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC, - TELQUAL_IS, dp, IAC, SE); - len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */ - - if (len < NETROOM()) { - ring_supply_data(&netoring, temp, len); - printsub('>', temp+2, len - 2); - } -/*@*/ else printf("lm_will: not enough room in buffer\n"); - } - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: { - if (!autologin) - break; - if (SB_EOF()) - return; - switch(SB_GET()) { - case TELQUAL_IS: - if (my_want_state_is_dont(TELOPT_AUTHENTICATION)) - return; - auth_is(subpointer, SB_LEN()); - break; - case TELQUAL_SEND: - if (my_want_state_is_wont(TELOPT_AUTHENTICATION)) - return; - auth_send(subpointer, SB_LEN()); - break; - case TELQUAL_REPLY: - if (my_want_state_is_wont(TELOPT_AUTHENTICATION)) - return; - auth_reply(subpointer, SB_LEN()); - break; - case TELQUAL_NAME: - if (my_want_state_is_dont(TELOPT_AUTHENTICATION)) - return; - auth_name(subpointer, SB_LEN()); - break; - } - } - break; -#endif -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - if (SB_EOF()) - return; - switch(SB_GET()) { - case ENCRYPT_START: - if (my_want_state_is_dont(TELOPT_ENCRYPT)) - return; - encrypt_start(subpointer, SB_LEN()); - break; - case ENCRYPT_END: - if (my_want_state_is_dont(TELOPT_ENCRYPT)) - return; - encrypt_end(); - break; - case ENCRYPT_SUPPORT: - if (my_want_state_is_wont(TELOPT_ENCRYPT)) - return; - encrypt_support(subpointer, SB_LEN()); - break; - case ENCRYPT_REQSTART: - if (my_want_state_is_wont(TELOPT_ENCRYPT)) - return; - encrypt_request_start(subpointer, SB_LEN()); - break; - case ENCRYPT_REQEND: - if (my_want_state_is_wont(TELOPT_ENCRYPT)) - return; - /* - * We can always send an REQEND so that we cannot - * get stuck encrypting. We should only get this - * if we have been able to get in the correct mode - * anyhow. - */ - encrypt_request_end(); - break; - case ENCRYPT_IS: - if (my_want_state_is_dont(TELOPT_ENCRYPT)) - return; - encrypt_is(subpointer, SB_LEN()); - break; - case ENCRYPT_REPLY: - if (my_want_state_is_wont(TELOPT_ENCRYPT)) - return; - encrypt_reply(subpointer, SB_LEN()); - break; - case ENCRYPT_ENC_KEYID: - if (my_want_state_is_dont(TELOPT_ENCRYPT)) - return; - encrypt_enc_keyid(subpointer, SB_LEN()); - break; - case ENCRYPT_DEC_KEYID: - if (my_want_state_is_wont(TELOPT_ENCRYPT)) - return; - encrypt_dec_keyid(subpointer, SB_LEN()); - break; - default: - break; - } - break; -#endif /* ENCRYPTION */ - default: - break; - } -} - -static unsigned char str_lm[] = { IAC, SB, TELOPT_LINEMODE, 0, 0, IAC, SE }; - - void -lm_will(cmd, len) - unsigned char *cmd; - int len; -{ - if (len < 1) { -/*@*/ printf("lm_will: no command!!!\n"); /* Should not happen... */ - return; - } - switch(cmd[0]) { - case LM_FORWARDMASK: /* We shouldn't ever get this... */ - default: - str_lm[3] = DONT; - str_lm[4] = cmd[0]; - if (NETROOM() > sizeof(str_lm)) { - ring_supply_data(&netoring, str_lm, sizeof(str_lm)); - printsub('>', &str_lm[2], sizeof(str_lm)-2); - } -/*@*/ else printf("lm_will: not enough room in buffer\n"); - break; - } -} - - void -lm_wont(cmd, len) - unsigned char *cmd; - int len; -{ - if (len < 1) { -/*@*/ printf("lm_wont: no command!!!\n"); /* Should not happen... */ - return; - } - switch(cmd[0]) { - case LM_FORWARDMASK: /* We shouldn't ever get this... */ - default: - /* We are always DONT, so don't respond */ - return; - } -} - - void -lm_do(cmd, len) - unsigned char *cmd; - int len; -{ - if (len < 1) { -/*@*/ printf("lm_do: no command!!!\n"); /* Should not happen... */ - return; - } - switch(cmd[0]) { - case LM_FORWARDMASK: - default: - str_lm[3] = WONT; - str_lm[4] = cmd[0]; - if (NETROOM() > sizeof(str_lm)) { - ring_supply_data(&netoring, str_lm, sizeof(str_lm)); - printsub('>', &str_lm[2], sizeof(str_lm)-2); - } -/*@*/ else printf("lm_do: not enough room in buffer\n"); - break; - } -} - - void -lm_dont(cmd, len) - unsigned char *cmd; - int len; -{ - if (len < 1) { -/*@*/ printf("lm_dont: no command!!!\n"); /* Should not happen... */ - return; - } - switch(cmd[0]) { - case LM_FORWARDMASK: - default: - /* we are always WONT, so don't respond */ - break; - } -} - -static unsigned char str_lm_mode[] = { - IAC, SB, TELOPT_LINEMODE, LM_MODE, 0, IAC, SE -}; - - void -lm_mode(cmd, len, init) - unsigned char *cmd; - int len, init; -{ - if (len != 1) - return; - if ((linemode&MODE_MASK&~MODE_ACK) == *cmd) - return; - if (*cmd&MODE_ACK) - return; - linemode = *cmd&(MODE_MASK&~MODE_ACK); - str_lm_mode[4] = linemode; - if (!init) - str_lm_mode[4] |= MODE_ACK; - if (NETROOM() > sizeof(str_lm_mode)) { - ring_supply_data(&netoring, str_lm_mode, sizeof(str_lm_mode)); - printsub('>', &str_lm_mode[2], sizeof(str_lm_mode)-2); - } -/*@*/ else printf("lm_mode: not enough room in buffer\n"); - setconnmode(0); /* set changed mode */ -} - - - -/* - * slc() - * Handle special character suboption of LINEMODE. - */ - -struct spc { - cc_t val; - cc_t *valp; - char flags; /* Current flags & level */ - char mylevel; /* Maximum level & flags */ -} spc_data[NSLC+1]; - -#define SLC_IMPORT 0 -#define SLC_EXPORT 1 -#define SLC_RVALUE 2 -static int slc_mode = SLC_EXPORT; - - void -slc_init() -{ - register struct spc *spcp; - - localchars = 1; - for (spcp = spc_data; spcp < &spc_data[NSLC+1]; spcp++) { - spcp->val = 0; - spcp->valp = 0; - spcp->flags = spcp->mylevel = SLC_NOSUPPORT; - } - -#define initfunc(func, flags) { \ - spcp = &spc_data[func]; \ - if (spcp->valp = tcval(func)) { \ - spcp->val = *spcp->valp; \ - spcp->mylevel = SLC_VARIABLE|flags; \ - } else { \ - spcp->val = 0; \ - spcp->mylevel = SLC_DEFAULT; \ - } \ - } - - initfunc(SLC_SYNCH, 0); - /* No BRK */ - initfunc(SLC_AO, 0); - initfunc(SLC_AYT, 0); - /* No EOR */ - initfunc(SLC_ABORT, SLC_FLUSHIN|SLC_FLUSHOUT); - initfunc(SLC_EOF, 0); -#ifndef SYSV_TERMIO - initfunc(SLC_SUSP, SLC_FLUSHIN); -#endif - initfunc(SLC_EC, 0); - initfunc(SLC_EL, 0); -#ifndef SYSV_TERMIO - initfunc(SLC_EW, 0); - initfunc(SLC_RP, 0); - initfunc(SLC_LNEXT, 0); -#endif - initfunc(SLC_XON, 0); - initfunc(SLC_XOFF, 0); -#ifdef SYSV_TERMIO - spc_data[SLC_XON].mylevel = SLC_CANTCHANGE; - spc_data[SLC_XOFF].mylevel = SLC_CANTCHANGE; -#endif - initfunc(SLC_FORW1, 0); -#ifdef USE_TERMIO - initfunc(SLC_FORW2, 0); - /* No FORW2 */ -#endif - - initfunc(SLC_IP, SLC_FLUSHIN|SLC_FLUSHOUT); -#undef initfunc - - if (slc_mode == SLC_EXPORT) - slc_export(); - else - slc_import(1); - -} - - void -slcstate() -{ - printf("Special characters are %s values\n", - slc_mode == SLC_IMPORT ? "remote default" : - slc_mode == SLC_EXPORT ? "local" : - "remote"); -} - - void -slc_mode_export() -{ - slc_mode = SLC_EXPORT; - if (my_state_is_will(TELOPT_LINEMODE)) - slc_export(); -} - - void -slc_mode_import(def) - int def; -{ - slc_mode = def ? SLC_IMPORT : SLC_RVALUE; - if (my_state_is_will(TELOPT_LINEMODE)) - slc_import(def); -} - -unsigned char slc_import_val[] = { - IAC, SB, TELOPT_LINEMODE, LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE -}; -unsigned char slc_import_def[] = { - IAC, SB, TELOPT_LINEMODE, LM_SLC, 0, SLC_DEFAULT, 0, IAC, SE -}; - - void -slc_import(def) - int def; -{ - if (NETROOM() > sizeof(slc_import_val)) { - if (def) { - ring_supply_data(&netoring, slc_import_def, sizeof(slc_import_def)); - printsub('>', &slc_import_def[2], sizeof(slc_import_def)-2); - } else { - ring_supply_data(&netoring, slc_import_val, sizeof(slc_import_val)); - printsub('>', &slc_import_val[2], sizeof(slc_import_val)-2); - } - } -/*@*/ else printf("slc_import: not enough room\n"); -} - - void -slc_export() -{ - register struct spc *spcp; - - TerminalDefaultChars(); - - slc_start_reply(); - for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) { - if (spcp->mylevel != SLC_NOSUPPORT) { - if (spcp->val == (cc_t)(_POSIX_VDISABLE)) - spcp->flags = SLC_NOSUPPORT; - else - spcp->flags = spcp->mylevel; - if (spcp->valp) - spcp->val = *spcp->valp; - slc_add_reply(spcp - spc_data, spcp->flags, spcp->val); - } - } - slc_end_reply(); - (void)slc_update(); - setconnmode(1); /* Make sure the character values are set */ -} - - void -slc(cp, len) - register unsigned char *cp; - int len; -{ - register struct spc *spcp; - register int func,level; - - slc_start_reply(); - - for (; len >= 3; len -=3, cp +=3) { - - func = cp[SLC_FUNC]; - - if (func == 0) { - /* - * Client side: always ignore 0 function. - */ - continue; - } - if (func > NSLC) { - if ((cp[SLC_FLAGS] & SLC_LEVELBITS) != SLC_NOSUPPORT) - slc_add_reply(func, SLC_NOSUPPORT, 0); - continue; - } - - spcp = &spc_data[func]; - - level = cp[SLC_FLAGS]&(SLC_LEVELBITS|SLC_ACK); - - if ((cp[SLC_VALUE] == (unsigned char)spcp->val) && - ((level&SLC_LEVELBITS) == (spcp->flags&SLC_LEVELBITS))) { - continue; - } - - if (level == (SLC_DEFAULT|SLC_ACK)) { - /* - * This is an error condition, the SLC_ACK - * bit should never be set for the SLC_DEFAULT - * level. Our best guess to recover is to - * ignore the SLC_ACK bit. - */ - cp[SLC_FLAGS] &= ~SLC_ACK; - } - - if (level == ((spcp->flags&SLC_LEVELBITS)|SLC_ACK)) { - spcp->val = (cc_t)cp[SLC_VALUE]; - spcp->flags = cp[SLC_FLAGS]; /* include SLC_ACK */ - continue; - } - - level &= ~SLC_ACK; - - if (level <= (spcp->mylevel&SLC_LEVELBITS)) { - spcp->flags = cp[SLC_FLAGS]|SLC_ACK; - spcp->val = (cc_t)cp[SLC_VALUE]; - } - if (level == SLC_DEFAULT) { - if ((spcp->mylevel&SLC_LEVELBITS) != SLC_DEFAULT) - spcp->flags = spcp->mylevel; - else - spcp->flags = SLC_NOSUPPORT; - } - slc_add_reply(func, spcp->flags, spcp->val); - } - slc_end_reply(); - if (slc_update()) - setconnmode(1); /* set the new character values */ -} - - void -slc_check() -{ - register struct spc *spcp; - - slc_start_reply(); - for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) { - if (spcp->valp && spcp->val != *spcp->valp) { - spcp->val = *spcp->valp; - if (spcp->val == (cc_t)(_POSIX_VDISABLE)) - spcp->flags = SLC_NOSUPPORT; - else - spcp->flags = spcp->mylevel; - slc_add_reply(spcp - spc_data, spcp->flags, spcp->val); - } - } - slc_end_reply(); - setconnmode(1); -} - - -unsigned char slc_reply[128]; -unsigned char *slc_replyp; - - void -slc_start_reply() -{ - slc_replyp = slc_reply; - *slc_replyp++ = IAC; - *slc_replyp++ = SB; - *slc_replyp++ = TELOPT_LINEMODE; - *slc_replyp++ = LM_SLC; -} - - void -slc_add_reply(func, flags, value) - unsigned char func; - unsigned char flags; - cc_t value; -{ - if ((*slc_replyp++ = func) == IAC) - *slc_replyp++ = IAC; - if ((*slc_replyp++ = flags) == IAC) - *slc_replyp++ = IAC; - if ((*slc_replyp++ = (unsigned char)value) == IAC) - *slc_replyp++ = IAC; -} - - void -slc_end_reply() -{ - register int len; - - *slc_replyp++ = IAC; - *slc_replyp++ = SE; - len = slc_replyp - slc_reply; - if (len <= 6) - return; - if (NETROOM() > len) { - ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply); - printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2); - } -/*@*/else printf("slc_end_reply: not enough room\n"); -} - - int -slc_update() -{ - register struct spc *spcp; - int need_update = 0; - - for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) { - if (!(spcp->flags&SLC_ACK)) - continue; - spcp->flags &= ~SLC_ACK; - if (spcp->valp && (*spcp->valp != spcp->val)) { - *spcp->valp = spcp->val; - need_update = 1; - } - } - return(need_update); -} - -#ifdef OLD_ENVIRON -# ifdef ENV_HACK -/* - * Earlier version of telnet/telnetd from the BSD code had - * the definitions of VALUE and VAR reversed. To ensure - * maximum interoperability, we assume that the server is - * an older BSD server, until proven otherwise. The newer - * BSD servers should be able to handle either definition, - * so it is better to use the wrong values if we don't - * know what type of server it is. - */ -int env_auto = 1; -int old_env_var = OLD_ENV_VAR; -int old_env_value = OLD_ENV_VALUE; -# else -# define old_env_var OLD_ENV_VAR -# define old_env_value OLD_ENV_VALUE -# endif -#endif - - void -env_opt(buf, len) - register unsigned char *buf; - register int len; -{ - register unsigned char *ep = 0, *epc = 0; - register int i; - - switch(buf[0]&0xff) { - case TELQUAL_SEND: - env_opt_start(); - if (len == 1) { - env_opt_add(NULL); - } else for (i = 1; i < len; i++) { - switch (buf[i]&0xff) { -#ifdef OLD_ENVIRON - case OLD_ENV_VAR: -# ifdef ENV_HACK - if (telopt_environ == TELOPT_OLD_ENVIRON - && env_auto) { - /* Server has the same definitions */ - old_env_var = OLD_ENV_VAR; - old_env_value = OLD_ENV_VALUE; - } - /* FALL THROUGH */ -# endif - case OLD_ENV_VALUE: - /* - * Although OLD_ENV_VALUE is not legal, we will - * still recognize it, just in case it is an - * old server that has VAR & VALUE mixed up... - */ - /* FALL THROUGH */ -#else - case NEW_ENV_VAR: -#endif - case ENV_USERVAR: - if (ep) { - *epc = 0; - env_opt_add(ep); - } - ep = epc = &buf[i+1]; - break; - case ENV_ESC: - i++; - /*FALL THROUGH*/ - default: - if (epc) - *epc++ = buf[i]; - break; - } - } - if (ep) { - *epc = 0; - env_opt_add(ep); - } - env_opt_end(1); - break; - - case TELQUAL_IS: - case TELQUAL_INFO: - /* Ignore for now. We shouldn't get it anyway. */ - break; - - default: - break; - } -} - -#define OPT_REPLY_SIZE 256 -unsigned char *opt_reply; -unsigned char *opt_replyp; -unsigned char *opt_replyend; - - void -env_opt_start() -{ - if (opt_reply) - opt_reply = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE); - else - opt_reply = (unsigned char *)malloc(OPT_REPLY_SIZE); - if (opt_reply == NULL) { -/*@*/ printf("env_opt_start: malloc()/realloc() failed!!!\n"); - opt_reply = opt_replyp = opt_replyend = NULL; - return; - } - opt_replyp = opt_reply; - opt_replyend = opt_reply + OPT_REPLY_SIZE; - *opt_replyp++ = IAC; - *opt_replyp++ = SB; - *opt_replyp++ = telopt_environ; - *opt_replyp++ = TELQUAL_IS; -} - - void -env_opt_start_info() -{ - env_opt_start(); - if (opt_replyp) - opt_replyp[-1] = TELQUAL_INFO; -} - - void -env_opt_add(ep) - register unsigned char *ep; -{ - register unsigned char *vp, c; - - if (opt_reply == NULL) /*XXX*/ - return; /*XXX*/ - - if (ep == NULL || *ep == '\0') { - /* Send user defined variables first. */ - env_default(1, 0); - while (ep = env_default(0, 0)) - env_opt_add(ep); - - /* Now add the list of well know variables. */ - env_default(1, 1); - while (ep = env_default(0, 1)) - env_opt_add(ep); - return; - } - vp = env_getvalue(ep); - if (opt_replyp + (vp ? strlen((char *)vp) : 0) + - strlen((char *)ep) + 6 > opt_replyend) - { - register int len; - opt_replyend += OPT_REPLY_SIZE; - len = opt_replyend - opt_reply; - opt_reply = (unsigned char *)realloc(opt_reply, len); - if (opt_reply == NULL) { -/*@*/ printf("env_opt_add: realloc() failed!!!\n"); - opt_reply = opt_replyp = opt_replyend = NULL; - return; - } - opt_replyp = opt_reply + len - (opt_replyend - opt_replyp); - opt_replyend = opt_reply + len; - } - if (opt_welldefined(ep)) -#ifdef OLD_ENVIRON - if (telopt_environ == TELOPT_OLD_ENVIRON) - *opt_replyp++ = old_env_var; - else -#endif - *opt_replyp++ = NEW_ENV_VAR; - else - *opt_replyp++ = ENV_USERVAR; - for (;;) { - while (c = *ep++) { - switch(c&0xff) { - case IAC: - *opt_replyp++ = IAC; - break; - case NEW_ENV_VAR: - case NEW_ENV_VALUE: - case ENV_ESC: - case ENV_USERVAR: - *opt_replyp++ = ENV_ESC; - break; - } - *opt_replyp++ = c; - } - if (ep = vp) { -#ifdef OLD_ENVIRON - if (telopt_environ == TELOPT_OLD_ENVIRON) - *opt_replyp++ = old_env_value; - else -#endif - *opt_replyp++ = NEW_ENV_VALUE; - vp = NULL; - } else - break; - } -} - - int -opt_welldefined(ep) - char *ep; -{ - if ((strcmp(ep, "USER") == 0) || - (strcmp(ep, "DISPLAY") == 0) || - (strcmp(ep, "PRINTER") == 0) || - (strcmp(ep, "SYSTEMTYPE") == 0) || - (strcmp(ep, "JOB") == 0) || - (strcmp(ep, "ACCT") == 0)) - return(1); - return(0); -} - void -env_opt_end(emptyok) - register int emptyok; -{ - register int len; - - len = opt_replyp - opt_reply + 2; - if (emptyok || len > 6) { - *opt_replyp++ = IAC; - *opt_replyp++ = SE; - if (NETROOM() > len) { - ring_supply_data(&netoring, opt_reply, len); - printsub('>', &opt_reply[2], len - 2); - } -/*@*/ else printf("slc_end_reply: not enough room\n"); - } - if (opt_reply) { - free(opt_reply); - opt_reply = opt_replyp = opt_replyend = NULL; - } -} - - - - int -telrcv() -{ - register int c; - register int scc; - register unsigned char *sbp; - int count; - int returnValue = 0; - - scc = 0; - count = 0; - while (TTYROOM() > 2) { - if (scc == 0) { - if (count) { - ring_consumed(&netiring, count); - returnValue = 1; - count = 0; - } - sbp = netiring.consume; - scc = ring_full_consecutive(&netiring); - if (scc == 0) { - /* No more data coming in */ - break; - } - } - - c = *sbp++ & 0xff, scc--; count++; -#ifdef ENCRYPTION - if (decrypt_input) - c = (*decrypt_input)(c); -#endif /* ENCRYPTION */ - - switch (telrcv_state) { - - case TS_CR: - telrcv_state = TS_DATA; - if (c == '\0') { - break; /* Ignore \0 after CR */ - } - else if ((c == '\n') && my_want_state_is_dont(TELOPT_ECHO) && !crmod) { - TTYADD(c); - break; - } - /* Else, fall through */ - - case TS_DATA: - if (c == IAC) { - telrcv_state = TS_IAC; - break; - } -# if defined(TN3270) - if (In3270) { - *Ifrontp++ = c; - while (scc > 0) { - c = *sbp++ & 0377, scc--; count++; -#ifdef ENCRYPTION - if (decrypt_input) - c = (*decrypt_input)(c); -#endif /* ENCRYPTION */ - if (c == IAC) { - telrcv_state = TS_IAC; - break; - } - *Ifrontp++ = c; - } - } else -# endif /* defined(TN3270) */ - /* - * The 'crmod' hack (see following) is needed - * since we can't * set CRMOD on output only. - * Machines like MULTICS like to send \r without - * \n; since we must turn off CRMOD to get proper - * input, the mapping is done here (sigh). - */ - if ((c == '\r') && my_want_state_is_dont(TELOPT_BINARY)) { - if (scc > 0) { - c = *sbp&0xff; -#ifdef ENCRYPTION - if (decrypt_input) - c = (*decrypt_input)(c); -#endif /* ENCRYPTION */ - if (c == 0) { - sbp++, scc--; count++; - /* a "true" CR */ - TTYADD('\r'); - } else if (my_want_state_is_dont(TELOPT_ECHO) && - (c == '\n')) { - sbp++, scc--; count++; - TTYADD('\n'); - } else { -#ifdef ENCRYPTION - if (decrypt_input) - (*decrypt_input)(-1); -#endif /* ENCRYPTION */ - - TTYADD('\r'); - if (crmod) { - TTYADD('\n'); - } - } - } else { - telrcv_state = TS_CR; - TTYADD('\r'); - if (crmod) { - TTYADD('\n'); - } - } - } else { - TTYADD(c); - } - continue; - - case TS_IAC: -process_iac: - switch (c) { - - case WILL: - telrcv_state = TS_WILL; - continue; - - case WONT: - telrcv_state = TS_WONT; - continue; - - case DO: - telrcv_state = TS_DO; - continue; - - case DONT: - telrcv_state = TS_DONT; - continue; - - case DM: - /* - * We may have missed an urgent notification, - * so make sure we flush whatever is in the - * buffer currently. - */ - printoption("RCVD", IAC, DM); - SYNCHing = 1; - (void) ttyflush(1); - SYNCHing = stilloob(); - settimer(gotDM); - break; - - case SB: - SB_CLEAR(); - telrcv_state = TS_SB; - continue; - -# if defined(TN3270) - case EOR: - if (In3270) { - if (Ibackp == Ifrontp) { - Ibackp = Ifrontp = Ibuf; - ISend = 0; /* should have been! */ - } else { - Ibackp += DataFromNetwork(Ibackp, Ifrontp-Ibackp, 1); - ISend = 1; - } - } - printoption("RCVD", IAC, EOR); - break; -# endif /* defined(TN3270) */ - - case IAC: -# if !defined(TN3270) - TTYADD(IAC); -# else /* !defined(TN3270) */ - if (In3270) { - *Ifrontp++ = IAC; - } else { - TTYADD(IAC); - } -# endif /* !defined(TN3270) */ - break; - - case NOP: - case GA: - default: - printoption("RCVD", IAC, c); - break; - } - telrcv_state = TS_DATA; - continue; - - case TS_WILL: - printoption("RCVD", WILL, c); - willoption(c); - SetIn3270(); - telrcv_state = TS_DATA; - continue; - - case TS_WONT: - printoption("RCVD", WONT, c); - wontoption(c); - SetIn3270(); - telrcv_state = TS_DATA; - continue; - - case TS_DO: - printoption("RCVD", DO, c); - dooption(c); - SetIn3270(); - if (c == TELOPT_NAWS) { - sendnaws(); - } else if (c == TELOPT_LFLOW) { - localflow = 1; - setcommandmode(); - setconnmode(0); - } - telrcv_state = TS_DATA; - continue; - - case TS_DONT: - printoption("RCVD", DONT, c); - dontoption(c); - flushline = 1; - setconnmode(0); /* set new tty mode (maybe) */ - SetIn3270(); - telrcv_state = TS_DATA; - continue; - - case TS_SB: - if (c == IAC) { - telrcv_state = TS_SE; - } else { - SB_ACCUM(c); - } - continue; - - case TS_SE: - if (c != SE) { - if (c != IAC) { - /* - * This is an error. We only expect to get - * "IAC IAC" or "IAC SE". Several things may - * have happend. An IAC was not doubled, the - * IAC SE was left off, or another option got - * inserted into the suboption are all possibilities. - * If we assume that the IAC was not doubled, - * and really the IAC SE was left off, we could - * get into an infinate loop here. So, instead, - * we terminate the suboption, and process the - * partial suboption if we can. - */ - SB_ACCUM(IAC); - SB_ACCUM(c); - subpointer -= 2; - SB_TERM(); - - printoption("In SUBOPTION processing, RCVD", IAC, c); - suboption(); /* handle sub-option */ - SetIn3270(); - telrcv_state = TS_IAC; - goto process_iac; - } - SB_ACCUM(c); - telrcv_state = TS_SB; - } else { - SB_ACCUM(IAC); - SB_ACCUM(SE); - subpointer -= 2; - SB_TERM(); - suboption(); /* handle sub-option */ - SetIn3270(); - telrcv_state = TS_DATA; - } - } - } - if (count) - ring_consumed(&netiring, count); - return returnValue||count; -} - -static int bol = 1, local = 0; - - int -rlogin_susp() -{ - if (local) { - local = 0; - bol = 1; - command(0, "z\n", 2); - return(1); - } - return(0); -} - - static int -telsnd() -{ - int tcc; - int count; - int returnValue = 0; - unsigned char *tbp; - - tcc = 0; - count = 0; - while (NETROOM() > 2) { - register int sc; - register int c; - - if (tcc == 0) { - if (count) { - ring_consumed(&ttyiring, count); - returnValue = 1; - count = 0; - } - tbp = ttyiring.consume; - tcc = ring_full_consecutive(&ttyiring); - if (tcc == 0) { - break; - } - } - c = *tbp++ & 0xff, sc = strip(c), tcc--; count++; - if (rlogin != _POSIX_VDISABLE) { - if (bol) { - bol = 0; - if (sc == rlogin) { - local = 1; - continue; - } - } else if (local) { - local = 0; - if (sc == '.' || c == termEofChar) { - bol = 1; - command(0, "close\n", 6); - continue; - } - if (sc == termSuspChar) { - bol = 1; - command(0, "z\n", 2); - continue; - } - if (sc == escape) { - command(0, (char *)tbp, tcc); - bol = 1; - count += tcc; - tcc = 0; - flushline = 1; - break; - } - if (sc != rlogin) { - ++tcc; - --tbp; - --count; - c = sc = rlogin; - } - } - if ((sc == '\n') || (sc == '\r')) - bol = 1; - } else if (sc == escape) { - /* - * Double escape is a pass through of a single escape character. - */ - if (tcc && strip(*tbp) == escape) { - tbp++; - tcc--; - count++; - bol = 0; - } else { - command(0, (char *)tbp, tcc); - bol = 1; - count += tcc; - tcc = 0; - flushline = 1; - break; - } - } else - bol = 0; -#ifdef KLUDGELINEMODE - if (kludgelinemode && (globalmode&MODE_EDIT) && (sc == echoc)) { - if (tcc > 0 && strip(*tbp) == echoc) { - tcc--; tbp++; count++; - } else { - dontlecho = !dontlecho; - settimer(echotoggle); - setconnmode(0); - flushline = 1; - break; - } - } -#endif - if (MODE_LOCAL_CHARS(globalmode)) { - if (TerminalSpecialChars(sc) == 0) { - bol = 1; - break; - } - } - if (my_want_state_is_wont(TELOPT_BINARY)) { - switch (c) { - case '\n': - /* - * If we are in CRMOD mode (\r ==> \n) - * on our local machine, then probably - * a newline (unix) is CRLF (TELNET). - */ - if (MODE_LOCAL_CHARS(globalmode)) { - NETADD('\r'); - } - NETADD('\n'); - bol = flushline = 1; - break; - case '\r': - if (!crlf) { - NET2ADD('\r', '\0'); - } else { - NET2ADD('\r', '\n'); - } - bol = flushline = 1; - break; - case IAC: - NET2ADD(IAC, IAC); - break; - default: - NETADD(c); - break; - } - } else if (c == IAC) { - NET2ADD(IAC, IAC); - } else { - NETADD(c); - } - } - if (count) - ring_consumed(&ttyiring, count); - return returnValue||count; /* Non-zero if we did anything */ -} - -/* - * Scheduler() - * - * Try to do something. - * - * If we do something useful, return 1; else return 0. - * - */ - - - int -Scheduler(block) - int block; /* should we block in the select ? */ -{ - /* One wants to be a bit careful about setting returnValue - * to one, since a one implies we did some useful work, - * and therefore probably won't be called to block next - * time (TN3270 mode only). - */ - int returnValue; - int netin, netout, netex, ttyin, ttyout; - - /* Decide which rings should be processed */ - - netout = ring_full_count(&netoring) && - (flushline || - (my_want_state_is_wont(TELOPT_LINEMODE) -#ifdef KLUDGELINEMODE - && (!kludgelinemode || my_want_state_is_do(TELOPT_SGA)) -#endif - ) || - my_want_state_is_will(TELOPT_BINARY)); - ttyout = ring_full_count(&ttyoring); - -#if defined(TN3270) - ttyin = ring_empty_count(&ttyiring) && (clienteof == 0) && (shell_active == 0); -#else /* defined(TN3270) */ - ttyin = ring_empty_count(&ttyiring) && (clienteof == 0); -#endif /* defined(TN3270) */ - -#if defined(TN3270) - netin = ring_empty_count(&netiring); -# else /* !defined(TN3270) */ - netin = !ISend && ring_empty_count(&netiring); -# endif /* !defined(TN3270) */ - - netex = !SYNCHing; - - /* If we have seen a signal recently, reset things */ -# if defined(TN3270) && defined(unix) - if (HaveInput) { - HaveInput = 0; - (void) signal(SIGIO, inputAvailable); - } -#endif /* defined(TN3270) && defined(unix) */ - - /* Call to system code to process rings */ - - returnValue = process_rings(netin, netout, netex, ttyin, ttyout, !block); - - /* Now, look at the input rings, looking for work to do. */ - - if (ring_full_count(&ttyiring)) { -# if defined(TN3270) - if (In3270) { - int c; - - c = DataFromTerminal(ttyiring.consume, - ring_full_consecutive(&ttyiring)); - if (c) { - returnValue = 1; - ring_consumed(&ttyiring, c); - } - } else { -# endif /* defined(TN3270) */ - returnValue |= telsnd(); -# if defined(TN3270) - } -# endif /* defined(TN3270) */ - } - - if (ring_full_count(&netiring)) { -# if !defined(TN3270) - returnValue |= telrcv(); -# else /* !defined(TN3270) */ - returnValue = Push3270(); -# endif /* !defined(TN3270) */ - } - return returnValue; -} - -/* - * Select from tty and network... - */ - void -telnet(user) - char *user; -{ - sys_telnet_init(); - -#if defined(AUTHENTICATION) || defined(ENCRYPTION) - { - static char local_host[256] = { 0 }; - - if (!local_host[0]) { - gethostname(local_host, sizeof(local_host)); - local_host[sizeof(local_host)-1] = 0; - } - auth_encrypt_init(local_host, hostname, "TELNET", 0); - auth_encrypt_user(user); - } -#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ -# if !defined(TN3270) - if (telnetport) { -#if defined(AUTHENTICATION) - if (autologin) - send_will(TELOPT_AUTHENTICATION, 1); -#endif -#ifdef ENCRYPTION - send_do(TELOPT_ENCRYPT, 1); - send_will(TELOPT_ENCRYPT, 1); -#endif /* ENCRYPTION */ - send_do(TELOPT_SGA, 1); - send_will(TELOPT_TTYPE, 1); - send_will(TELOPT_NAWS, 1); - send_will(TELOPT_TSPEED, 1); - send_will(TELOPT_LFLOW, 1); - send_will(TELOPT_LINEMODE, 1); - send_will(TELOPT_NEW_ENVIRON, 1); - send_do(TELOPT_STATUS, 1); - if (env_getvalue((unsigned char *)"DISPLAY")) - send_will(TELOPT_XDISPLOC, 1); - if (eight) - tel_enter_binary(eight); - } -# endif /* !defined(TN3270) */ - -# if !defined(TN3270) - for (;;) { - int schedValue; - - while ((schedValue = Scheduler(0)) != 0) { - if (schedValue == -1) { - setcommandmode(); - return; - } - } - - if (Scheduler(1) == -1) { - setcommandmode(); - return; - } - } -# else /* !defined(TN3270) */ - for (;;) { - int schedValue; - - while (!In3270 && !shell_active) { - if (Scheduler(1) == -1) { - setcommandmode(); - return; - } - } - - while ((schedValue = Scheduler(0)) != 0) { - if (schedValue == -1) { - setcommandmode(); - return; - } - } - /* If there is data waiting to go out to terminal, don't - * schedule any more data for the terminal. - */ - if (ring_full_count(&ttyoring)) { - schedValue = 1; - } else { - if (shell_active) { - if (shell_continue() == 0) { - ConnectScreen(); - } - } else if (In3270) { - schedValue = DoTerminalOutput(); - } - } - if (schedValue && (shell_active == 0)) { - if (Scheduler(1) == -1) { - setcommandmode(); - return; - } - } - } -# endif /* !defined(TN3270) */ -} - -#if 0 /* XXX - this not being in is a bug */ -/* - * nextitem() - * - * Return the address of the next "item" in the TELNET data - * stream. This will be the address of the next character if - * the current address is a user data character, or it will - * be the address of the character following the TELNET command - * if the current address is a TELNET IAC ("I Am a Command") - * character. - */ - - static char * -nextitem(current) - char *current; -{ - if ((*current&0xff) != IAC) { - return current+1; - } - switch (*(current+1)&0xff) { - case DO: - case DONT: - case WILL: - case WONT: - return current+3; - case SB: /* loop forever looking for the SE */ - { - register char *look = current+2; - - for (;;) { - if ((*look++&0xff) == IAC) { - if ((*look++&0xff) == SE) { - return look; - } - } - } - } - default: - return current+2; - } -} -#endif /* 0 */ - -/* - * netclear() - * - * We are about to do a TELNET SYNCH operation. Clear - * the path to the network. - * - * Things are a bit tricky since we may have sent the first - * byte or so of a previous TELNET command into the network. - * So, we have to scan the network buffer from the beginning - * until we are up to where we want to be. - * - * A side effect of what we do, just to keep things - * simple, is to clear the urgent data pointer. The principal - * caller should be setting the urgent data pointer AFTER calling - * us in any case. - */ - - static void -netclear() -{ -#if 0 /* XXX */ - register char *thisitem, *next; - char *good; -#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \ - ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL)) - - thisitem = netobuf; - - while ((next = nextitem(thisitem)) <= netobuf.send) { - thisitem = next; - } - - /* Now, thisitem is first before/at boundary. */ - - good = netobuf; /* where the good bytes go */ - - while (netoring.add > thisitem) { - if (wewant(thisitem)) { - int length; - - next = thisitem; - do { - next = nextitem(next); - } while (wewant(next) && (nfrontp > next)); - length = next-thisitem; - memmove(good, thisitem, length); - good += length; - thisitem = next; - } else { - thisitem = nextitem(thisitem); - } - } - -#endif /* 0 */ -} - -/* - * These routines add various telnet commands to the data stream. - */ - - static void -doflush() -{ - NET2ADD(IAC, DO); - NETADD(TELOPT_TM); - flushline = 1; - flushout = 1; - (void) ttyflush(1); /* Flush/drop output */ - /* do printoption AFTER flush, otherwise the output gets tossed... */ - printoption("SENT", DO, TELOPT_TM); -} - - void -xmitAO() -{ - NET2ADD(IAC, AO); - printoption("SENT", IAC, AO); - if (autoflush) { - doflush(); - } -} - - - void -xmitEL() -{ - NET2ADD(IAC, EL); - printoption("SENT", IAC, EL); -} - - void -xmitEC() -{ - NET2ADD(IAC, EC); - printoption("SENT", IAC, EC); -} - - - int -dosynch() -{ - netclear(); /* clear the path to the network */ - NETADD(IAC); - setneturg(); - NETADD(DM); - printoption("SENT", IAC, DM); - return 1; -} - -int want_status_response = 0; - - int -get_status() -{ - unsigned char tmp[16]; - register unsigned char *cp; - - if (my_want_state_is_dont(TELOPT_STATUS)) { - printf("Remote side does not support STATUS option\n"); - return 0; - } - cp = tmp; - - *cp++ = IAC; - *cp++ = SB; - *cp++ = TELOPT_STATUS; - *cp++ = TELQUAL_SEND; - *cp++ = IAC; - *cp++ = SE; - if (NETROOM() >= cp - tmp) { - ring_supply_data(&netoring, tmp, cp-tmp); - printsub('>', tmp+2, cp - tmp - 2); - } - ++want_status_response; - return 1; -} - - void -intp() -{ - NET2ADD(IAC, IP); - printoption("SENT", IAC, IP); - flushline = 1; - if (autoflush) { - doflush(); - } - if (autosynch) { - dosynch(); - } -} - - void -sendbrk() -{ - NET2ADD(IAC, BREAK); - printoption("SENT", IAC, BREAK); - flushline = 1; - if (autoflush) { - doflush(); - } - if (autosynch) { - dosynch(); - } -} - - void -sendabort() -{ - NET2ADD(IAC, ABORT); - printoption("SENT", IAC, ABORT); - flushline = 1; - if (autoflush) { - doflush(); - } - if (autosynch) { - dosynch(); - } -} - - void -sendsusp() -{ - NET2ADD(IAC, SUSP); - printoption("SENT", IAC, SUSP); - flushline = 1; - if (autoflush) { - doflush(); - } - if (autosynch) { - dosynch(); - } -} - - void -sendeof() -{ - NET2ADD(IAC, xEOF); - printoption("SENT", IAC, xEOF); -} - - void -sendayt() -{ - NET2ADD(IAC, AYT); - printoption("SENT", IAC, AYT); -} - -/* - * Send a window size update to the remote system. - */ - - void -sendnaws() -{ - long rows, cols; - unsigned char tmp[16]; - register unsigned char *cp; - - if (my_state_is_wont(TELOPT_NAWS)) - return; - -#define PUTSHORT(cp, x) { if ((*cp++ = ((x)>>8)&0xff) == IAC) *cp++ = IAC; \ - if ((*cp++ = ((x))&0xff) == IAC) *cp++ = IAC; } - - if (TerminalWindowSize(&rows, &cols) == 0) { /* Failed */ - return; - } - - cp = tmp; - - *cp++ = IAC; - *cp++ = SB; - *cp++ = TELOPT_NAWS; - PUTSHORT(cp, cols); - PUTSHORT(cp, rows); - *cp++ = IAC; - *cp++ = SE; - if (NETROOM() >= cp - tmp) { - ring_supply_data(&netoring, tmp, cp-tmp); - printsub('>', tmp+2, cp - tmp - 2); - } -} - - void -tel_enter_binary(rw) - int rw; -{ - if (rw&1) - send_do(TELOPT_BINARY, 1); - if (rw&2) - send_will(TELOPT_BINARY, 1); -} - - void -tel_leave_binary(rw) - int rw; -{ - if (rw&1) - send_dont(TELOPT_BINARY, 1); - if (rw&2) - send_wont(TELOPT_BINARY, 1); -} diff --git a/secure/usr.bin/telnet/terminal.c b/secure/usr.bin/telnet/terminal.c deleted file mode 100644 index b5ceeda2b5255..0000000000000 --- a/secure/usr.bin/telnet/terminal.c +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; -#endif /* not lint */ - -#include -#include - -#include "ring.h" - -#include "externs.h" -#include "types.h" - -Ring ttyoring, ttyiring; -unsigned char ttyobuf[2*BUFSIZ], ttyibuf[BUFSIZ]; - -int termdata; /* Debugging flag */ - -#ifdef USE_TERMIO -# ifndef VDISCARD -cc_t termFlushChar; -# endif -# ifndef VLNEXT -cc_t termLiteralNextChar; -# endif -# ifndef VSUSP -cc_t termSuspChar; -# endif -# ifndef VWERASE -cc_t termWerasChar; -# endif -# ifndef VREPRINT -cc_t termRprntChar; -# endif -# ifndef VSTART -cc_t termStartChar; -# endif -# ifndef VSTOP -cc_t termStopChar; -# endif -# ifndef VEOL -cc_t termForw1Char; -# endif -# ifndef VEOL2 -cc_t termForw2Char; -# endif -# ifndef VSTATUS -cc_t termAytChar; -# endif -#else -cc_t termForw2Char; -cc_t termAytChar; -#endif - -/* - * initialize the terminal data structures. - */ - - void -init_terminal() -{ - if (ring_init(&ttyoring, ttyobuf, sizeof ttyobuf) != 1) { - exit(1); - } - if (ring_init(&ttyiring, ttyibuf, sizeof ttyibuf) != 1) { - exit(1); - } - autoflush = TerminalAutoFlush(); -} - - -/* - * Send as much data as possible to the terminal. - * - * Return value: - * -1: No useful work done, data waiting to go out. - * 0: No data was waiting, so nothing was done. - * 1: All waiting data was written out. - * n: All data - n was written out. - */ - - - int -ttyflush(drop) - int drop; -{ - register int n, n0, n1; - - n0 = ring_full_count(&ttyoring); - if ((n1 = n = ring_full_consecutive(&ttyoring)) > 0) { - if (drop) { - TerminalFlushOutput(); - /* we leave 'n' alone! */ - } else { - n = TerminalWrite(ttyoring.consume, n); - } - } - if (n > 0) { - if (termdata && n) { - Dump('>', ttyoring.consume, n); - } - /* - * If we wrote everything, and the full count is - * larger than what we wrote, then write the - * rest of the buffer. - */ - if (n1 == n && n0 > n) { - n1 = n0 - n; - if (!drop) - n1 = TerminalWrite(ttyoring.bottom, n1); - if (n1 > 0) - n += n1; - } - ring_consumed(&ttyoring, n); - } - if (n < 0) - return -1; - if (n == n0) { - if (n0) - return -1; - return 0; - } - return n0 - n + 1; -} - - -/* - * These routines decides on what the mode should be (based on the values - * of various global variables). - */ - - - int -getconnmode() -{ - extern int linemode; - int mode = 0; -#ifdef KLUDGELINEMODE - extern int kludgelinemode; -#endif - - if (In3270) - return(MODE_FLOW); - - if (my_want_state_is_dont(TELOPT_ECHO)) - mode |= MODE_ECHO; - - if (localflow) - mode |= MODE_FLOW; - - if (my_want_state_is_will(TELOPT_BINARY)) - mode |= MODE_INBIN; - - if (his_want_state_is_will(TELOPT_BINARY)) - mode |= MODE_OUTBIN; - -#ifdef KLUDGELINEMODE - if (kludgelinemode) { - if (my_want_state_is_dont(TELOPT_SGA)) { - mode |= (MODE_TRAPSIG|MODE_EDIT); - if (dontlecho && (clocks.echotoggle > clocks.modenegotiated)) { - mode &= ~MODE_ECHO; - } - } - return(mode); - } -#endif - if (my_want_state_is_will(TELOPT_LINEMODE)) - mode |= linemode; - return(mode); -} - - void -setconnmode(force) - int force; -{ -#ifdef ENCRYPTION - static int enc_passwd = 0; -#endif /* ENCRYPTION */ - register int newmode; - - newmode = getconnmode()|(force?MODE_FORCE:0); - - TerminalNewMode(newmode); - -#ifdef ENCRYPTION - if ((newmode & (MODE_ECHO|MODE_EDIT)) == MODE_EDIT) { - if (my_want_state_is_will(TELOPT_ENCRYPT) - && (enc_passwd == 0) && !encrypt_output) { - encrypt_request_start(0, 0); - enc_passwd = 1; - } - } else { - if (enc_passwd) { - encrypt_request_end(); - enc_passwd = 0; - } - } -#endif /* ENCRYPTION */ - -} - - - void -setcommandmode() -{ - TerminalNewMode(-1); -} diff --git a/secure/usr.bin/telnet/tn3270.c b/secure/usr.bin/telnet/tn3270.c deleted file mode 100644 index a75cd1ecb5a92..0000000000000 --- a/secure/usr.bin/telnet/tn3270.c +++ /dev/null @@ -1,411 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)tn3270.c 8.2 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#include -#include - -#include "general.h" - -#include "defines.h" -#include "ring.h" -#include "externs.h" -#include "fdset.h" - -#if defined(TN3270) - -#include "../ctlr/screen.h" -#include "../general/globals.h" - -#include "../sys_curses/telextrn.h" -#include "../ctlr/externs.h" - -#if defined(unix) -int - HaveInput, /* There is input available to scan */ - cursesdata, /* Do we dump curses data? */ - sigiocount; /* Number of times we got a SIGIO */ - -char tline[200]; -char *transcom = 0; /* transparent mode command (default: none) */ -#endif /* defined(unix) */ - -char Ibuf[8*BUFSIZ], *Ifrontp, *Ibackp; - -static char sb_terminal[] = { IAC, SB, - TELOPT_TTYPE, TELQUAL_IS, - 'I', 'B', 'M', '-', '3', '2', '7', '8', '-', '2', - IAC, SE }; -#define SBTERMMODEL 13 - -static int - Sent3270TerminalType; /* Have we said we are a 3270? */ - -#endif /* defined(TN3270) */ - - - void -init_3270() -{ -#if defined(TN3270) -#if defined(unix) - HaveInput = 0; - sigiocount = 0; -#endif /* defined(unix) */ - Sent3270TerminalType = 0; - Ifrontp = Ibackp = Ibuf; - init_ctlr(); /* Initialize some things */ - init_keyboard(); - init_screen(); - init_system(); -#endif /* defined(TN3270) */ -} - - -#if defined(TN3270) - -/* - * DataToNetwork - queue up some data to go to network. If "done" is set, - * then when last byte is queued, we add on an IAC EOR sequence (so, - * don't call us with "done" until you want that done...) - * - * We actually do send all the data to the network buffer, since our - * only client needs for us to do that. - */ - - int -DataToNetwork(buffer, count, done) - register char *buffer; /* where the data is */ - register int count; /* how much to send */ - int done; /* is this the last of a logical block */ -{ - register int loop, c; - int origCount; - - origCount = count; - - while (count) { - /* If not enough room for EORs, IACs, etc., wait */ - if (NETROOM() < 6) { - fd_set o; - - FD_ZERO(&o); - netflush(); - while (NETROOM() < 6) { - FD_SET(net, &o); - (void) select(net+1, (fd_set *) 0, &o, (fd_set *) 0, - (struct timeval *) 0); - netflush(); - } - } - c = ring_empty_count(&netoring); - if (c > count) { - c = count; - } - loop = c; - while (loop) { - if (((unsigned char)*buffer) == IAC) { - break; - } - buffer++; - loop--; - } - if ((c = c-loop)) { - ring_supply_data(&netoring, buffer-c, c); - count -= c; - } - if (loop) { - NET2ADD(IAC, IAC); - count--; - buffer++; - } - } - - if (done) { - NET2ADD(IAC, EOR); - netflush(); /* try to move along as quickly as ... */ - } - return(origCount - count); -} - - -#if defined(unix) - void -inputAvailable(signo) - int signo; -{ - HaveInput = 1; - sigiocount++; -} -#endif /* defined(unix) */ - - void -outputPurge() -{ - (void) ttyflush(1); -} - - -/* - * The following routines are places where the various tn3270 - * routines make calls into telnet.c. - */ - -/* - * DataToTerminal - queue up some data to go to terminal. - * - * Note: there are people who call us and depend on our processing - * *all* the data at one time (thus the select). - */ - - int -DataToTerminal(buffer, count) - register char *buffer; /* where the data is */ - register int count; /* how much to send */ -{ - register int c; - int origCount; - - origCount = count; - - while (count) { - if (TTYROOM() == 0) { -#if defined(unix) - fd_set o; - - FD_ZERO(&o); -#endif /* defined(unix) */ - (void) ttyflush(0); - while (TTYROOM() == 0) { -#if defined(unix) - FD_SET(tout, &o); - (void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0, - (struct timeval *) 0); -#endif /* defined(unix) */ - (void) ttyflush(0); - } - } - c = TTYROOM(); - if (c > count) { - c = count; - } - ring_supply_data(&ttyoring, buffer, c); - count -= c; - buffer += c; - } - return(origCount); -} - - -/* - * Push3270 - Try to send data along the 3270 output (to screen) direction. - */ - - int -Push3270() -{ - int save = ring_full_count(&netiring); - - if (save) { - if (Ifrontp+save > Ibuf+sizeof Ibuf) { - if (Ibackp != Ibuf) { - memmove(Ibuf, Ibackp, Ifrontp-Ibackp); - Ifrontp -= (Ibackp-Ibuf); - Ibackp = Ibuf; - } - } - if (Ifrontp+save < Ibuf+sizeof Ibuf) { - (void)telrcv(); - } - } - return save != ring_full_count(&netiring); -} - - -/* - * Finish3270 - get the last dregs of 3270 data out to the terminal - * before quitting. - */ - - void -Finish3270() -{ - while (Push3270() || !DoTerminalOutput()) { -#if defined(unix) - HaveInput = 0; -#endif /* defined(unix) */ - ; - } -} - - -/* StringToTerminal - output a null terminated string to the terminal */ - - void -StringToTerminal(s) - char *s; -{ - int count; - - count = strlen(s); - if (count) { - (void) DataToTerminal(s, count); /* we know it always goes... */ - } -} - - -#if ((!defined(NOT43)) || defined(PUTCHAR)) -/* _putchar - output a single character to the terminal. This name is so that - * curses(3x) can call us to send out data. - */ - - void -_putchar(c) - char c; -{ -#if defined(sun) /* SunOS 4.0 bug */ - c &= 0x7f; -#endif /* defined(sun) */ - if (cursesdata) { - Dump('>', &c, 1); - } - if (!TTYROOM()) { - (void) DataToTerminal(&c, 1); - } else { - TTYADD(c); - } -} -#endif /* ((!defined(NOT43)) || defined(PUTCHAR)) */ - - void -SetIn3270() -{ - if (Sent3270TerminalType && my_want_state_is_will(TELOPT_BINARY) - && my_want_state_is_do(TELOPT_BINARY) && !donebinarytoggle) { - if (!In3270) { - In3270 = 1; - Init3270(); /* Initialize 3270 functions */ - /* initialize terminal key mapping */ - InitTerminal(); /* Start terminal going */ - setconnmode(0); - } - } else { - if (In3270) { - StopScreen(1); - In3270 = 0; - Stop3270(); /* Tell 3270 we aren't here anymore */ - setconnmode(0); - } - } -} - -/* - * tn3270_ttype() - * - * Send a response to a terminal type negotiation. - * - * Return '0' if no more responses to send; '1' if a response sent. - */ - - int -tn3270_ttype() -{ - /* - * Try to send a 3270 type terminal name. Decide which one based - * on the format of our screen, and (in the future) color - * capaiblities. - */ - InitTerminal(); /* Sets MaxNumberColumns, MaxNumberLines */ - if ((MaxNumberLines >= 24) && (MaxNumberColumns >= 80)) { - Sent3270TerminalType = 1; - if ((MaxNumberLines >= 27) && (MaxNumberColumns >= 132)) { - MaxNumberLines = 27; - MaxNumberColumns = 132; - sb_terminal[SBTERMMODEL] = '5'; - } else if (MaxNumberLines >= 43) { - MaxNumberLines = 43; - MaxNumberColumns = 80; - sb_terminal[SBTERMMODEL] = '4'; - } else if (MaxNumberLines >= 32) { - MaxNumberLines = 32; - MaxNumberColumns = 80; - sb_terminal[SBTERMMODEL] = '3'; - } else { - MaxNumberLines = 24; - MaxNumberColumns = 80; - sb_terminal[SBTERMMODEL] = '2'; - } - NumberLines = 24; /* before we start out... */ - NumberColumns = 80; - ScreenSize = NumberLines*NumberColumns; - if ((MaxNumberLines*MaxNumberColumns) > MAXSCREENSIZE) { - ExitString("Programming error: MAXSCREENSIZE too small.\n", - 1); - /*NOTREACHED*/ - } - printsub('>', sb_terminal+2, sizeof sb_terminal-2); - ring_supply_data(&netoring, sb_terminal, sizeof sb_terminal); - return 1; - } else { - return 0; - } -} - -#if defined(unix) - int -settranscom(argc, argv) - int argc; - char *argv[]; -{ - int i; - - if (argc == 1 && transcom) { - transcom = 0; - } - if (argc == 1) { - return 1; - } - transcom = tline; - (void) strcpy(transcom, argv[1]); - for (i = 2; i < argc; ++i) { - (void) strcat(transcom, " "); - (void) strcat(transcom, argv[i]); - } - return 1; -} -#endif /* defined(unix) */ - -#endif /* defined(TN3270) */ diff --git a/secure/usr.bin/telnet/types.h b/secure/usr.bin/telnet/types.h deleted file mode 100644 index 191d311fd154f..0000000000000 --- a/secure/usr.bin/telnet/types.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)types.h 8.1 (Berkeley) 6/6/93 - */ - -typedef struct { - char *modedescriptions; - char modetype; -} Modelist; - -extern Modelist modelist[]; - -typedef struct { - int - system, /* what the current time is */ - echotoggle, /* last time user entered echo character */ - modenegotiated, /* last time operating mode negotiated */ - didnetreceive, /* last time we read data from network */ - gotDM; /* when did we last see a data mark */ -} Clocks; - -extern Clocks clocks; diff --git a/secure/usr.bin/telnet/utilities.c b/secure/usr.bin/telnet/utilities.c deleted file mode 100644 index 06d08a45120c6..0000000000000 --- a/secure/usr.bin/telnet/utilities.c +++ /dev/null @@ -1,939 +0,0 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; -#endif /* not lint */ - -#define TELOPTS -#define TELCMDS -#define SLC_NAMES -#include -#include -#include - -#include - -#include "general.h" - -#include "fdset.h" - -#include "ring.h" - -#include "defines.h" - -#include "externs.h" - -FILE *NetTrace = 0; /* Not in bss, since needs to stay */ -int prettydump; - -/* - * upcase() - * - * Upcase (in place) the argument. - */ - - void -upcase(argument) - register char *argument; -{ - register int c; - - while ((c = *argument) != 0) { - if (islower(c)) { - *argument = toupper(c); - } - argument++; - } -} - -/* - * SetSockOpt() - * - * Compensate for differences in 4.2 and 4.3 systems. - */ - - int -SetSockOpt(fd, level, option, yesno) - int fd, level, option, yesno; -{ -#ifndef NOT43 - return setsockopt(fd, level, option, - (char *)&yesno, sizeof yesno); -#else /* NOT43 */ - if (yesno == 0) { /* Can't do that in 4.2! */ - fprintf(stderr, "Error: attempt to turn off an option 0x%x.\n", - option); - return -1; - } - return setsockopt(fd, level, option, 0, 0); -#endif /* NOT43 */ -} - -/* - * The following are routines used to print out debugging information. - */ - -unsigned char NetTraceFile[256] = "(standard output)"; - - void -SetNetTrace(file) - register char *file; -{ - if (NetTrace && NetTrace != stdout) - fclose(NetTrace); - if (file && (strcmp(file, "-") != 0)) { - NetTrace = fopen(file, "w"); - if (NetTrace) { - strcpy((char *)NetTraceFile, file); - return; - } - fprintf(stderr, "Cannot open %s.\n", file); - } - NetTrace = stdout; - strcpy((char *)NetTraceFile, "(standard output)"); -} - - void -Dump(direction, buffer, length) - char direction; - unsigned char *buffer; - int length; -{ -# define BYTES_PER_LINE 32 -# define min(x,y) ((x' */ - unsigned char *pointer; /* where suboption data sits */ - int length; /* length of suboption data */ -{ - register int i; - char buf[512]; - extern int want_status_response; - - if (showoptions || direction == 0 || - (want_status_response && (pointer[0] == TELOPT_STATUS))) { - if (direction) { - fprintf(NetTrace, "%s IAC SB ", - (direction == '<')? "RCVD":"SENT"); - if (length >= 3) { - register int j; - - i = pointer[length-2]; - j = pointer[length-1]; - - if (i != IAC || j != SE) { - fprintf(NetTrace, "(terminated by "); - if (TELOPT_OK(i)) - fprintf(NetTrace, "%s ", TELOPT(i)); - else if (TELCMD_OK(i)) - fprintf(NetTrace, "%s ", TELCMD(i)); - else - fprintf(NetTrace, "%d ", i); - if (TELOPT_OK(j)) - fprintf(NetTrace, "%s", TELOPT(j)); - else if (TELCMD_OK(j)) - fprintf(NetTrace, "%s", TELCMD(j)); - else - fprintf(NetTrace, "%d", j); - fprintf(NetTrace, ", not IAC SE!) "); - } - } - length -= 2; - } - if (length < 1) { - fprintf(NetTrace, "(Empty suboption??\?)"); - if (NetTrace == stdout) - fflush(NetTrace); - return; - } - switch (pointer[0]) { - case TELOPT_TTYPE: - fprintf(NetTrace, "TERMINAL-TYPE "); - switch (pointer[1]) { - case TELQUAL_IS: - fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2); - break; - case TELQUAL_SEND: - fprintf(NetTrace, "SEND"); - break; - default: - fprintf(NetTrace, - "- unknown qualifier %d (0x%x).", - pointer[1], pointer[1]); - } - break; - case TELOPT_TSPEED: - fprintf(NetTrace, "TERMINAL-SPEED"); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - switch (pointer[1]) { - case TELQUAL_IS: - fprintf(NetTrace, " IS "); - fprintf(NetTrace, "%.*s", length-2, (char *)pointer+2); - break; - default: - if (pointer[1] == 1) - fprintf(NetTrace, " SEND"); - else - fprintf(NetTrace, " %d (unknown)", pointer[1]); - for (i = 2; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - } - break; - - case TELOPT_LFLOW: - fprintf(NetTrace, "TOGGLE-FLOW-CONTROL"); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - switch (pointer[1]) { - case LFLOW_OFF: - fprintf(NetTrace, " OFF"); break; - case LFLOW_ON: - fprintf(NetTrace, " ON"); break; - case LFLOW_RESTART_ANY: - fprintf(NetTrace, " RESTART-ANY"); break; - case LFLOW_RESTART_XON: - fprintf(NetTrace, " RESTART-XON"); break; - default: - fprintf(NetTrace, " %d (unknown)", pointer[1]); - } - for (i = 2; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - - case TELOPT_NAWS: - fprintf(NetTrace, "NAWS"); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - if (length == 2) { - fprintf(NetTrace, " ?%d?", pointer[1]); - break; - } - fprintf(NetTrace, " %d %d (%d)", - pointer[1], pointer[2], - (int)((((unsigned int)pointer[1])<<8)|((unsigned int)pointer[2]))); - if (length == 4) { - fprintf(NetTrace, " ?%d?", pointer[3]); - break; - } - fprintf(NetTrace, " %d %d (%d)", - pointer[3], pointer[4], - (int)((((unsigned int)pointer[3])<<8)|((unsigned int)pointer[4]))); - for (i = 5; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - -#if defined(AUTHENTICATION) - case TELOPT_AUTHENTICATION: - fprintf(NetTrace, "AUTHENTICATION"); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - switch (pointer[1]) { - case TELQUAL_REPLY: - case TELQUAL_IS: - fprintf(NetTrace, " %s ", (pointer[1] == TELQUAL_IS) ? - "IS" : "REPLY"); - if (AUTHTYPE_NAME_OK(pointer[2])) - fprintf(NetTrace, "%s ", AUTHTYPE_NAME(pointer[2])); - else - fprintf(NetTrace, "%d ", pointer[2]); - if (length < 3) { - fprintf(NetTrace, "(partial suboption??\?)"); - break; - } - fprintf(NetTrace, "%s|%s", - ((pointer[3] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ? - "CLIENT" : "SERVER", - ((pointer[3] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ? - "MUTUAL" : "ONE-WAY"); - - auth_printsub(&pointer[1], length - 1, buf, sizeof(buf)); - fprintf(NetTrace, "%s", buf); - break; - - case TELQUAL_SEND: - i = 2; - fprintf(NetTrace, " SEND "); - while (i < length) { - if (AUTHTYPE_NAME_OK(pointer[i])) - fprintf(NetTrace, "%s ", AUTHTYPE_NAME(pointer[i])); - else - fprintf(NetTrace, "%d ", pointer[i]); - if (++i >= length) { - fprintf(NetTrace, "(partial suboption??\?)"); - break; - } - fprintf(NetTrace, "%s|%s ", - ((pointer[i] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ? - "CLIENT" : "SERVER", - ((pointer[i] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ? - "MUTUAL" : "ONE-WAY"); - ++i; - } - break; - - case TELQUAL_NAME: - i = 2; - fprintf(NetTrace, " NAME \""); - while (i < length) - putc(pointer[i++], NetTrace); - putc('"', NetTrace); - break; - - default: - for (i = 2; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - } - break; -#endif - -#ifdef ENCRYPTION - case TELOPT_ENCRYPT: - fprintf(NetTrace, "ENCRYPT"); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - switch (pointer[1]) { - case ENCRYPT_START: - fprintf(NetTrace, " START"); - break; - - case ENCRYPT_END: - fprintf(NetTrace, " END"); - break; - - case ENCRYPT_REQSTART: - fprintf(NetTrace, " REQUEST-START"); - break; - - case ENCRYPT_REQEND: - fprintf(NetTrace, " REQUEST-END"); - break; - - case ENCRYPT_IS: - case ENCRYPT_REPLY: - fprintf(NetTrace, " %s ", (pointer[1] == ENCRYPT_IS) ? - "IS" : "REPLY"); - if (length < 3) { - fprintf(NetTrace, " (partial suboption??\?)"); - break; - } - if (ENCTYPE_NAME_OK(pointer[2])) - fprintf(NetTrace, "%s ", ENCTYPE_NAME(pointer[2])); - else - fprintf(NetTrace, " %d (unknown)", pointer[2]); - - encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf)); - fprintf(NetTrace, "%s", buf); - break; - - case ENCRYPT_SUPPORT: - i = 2; - fprintf(NetTrace, " SUPPORT "); - while (i < length) { - if (ENCTYPE_NAME_OK(pointer[i])) - fprintf(NetTrace, "%s ", ENCTYPE_NAME(pointer[i])); - else - fprintf(NetTrace, "%d ", pointer[i]); - i++; - } - break; - - case ENCRYPT_ENC_KEYID: - fprintf(NetTrace, " ENC_KEYID "); - goto encommon; - - case ENCRYPT_DEC_KEYID: - fprintf(NetTrace, " DEC_KEYID "); - goto encommon; - - default: - fprintf(NetTrace, " %d (unknown)", pointer[1]); - encommon: - for (i = 2; i < length; i++) - fprintf(NetTrace, " %d", pointer[i]); - break; - } - break; -#endif /* ENCRYPTION */ - - case TELOPT_LINEMODE: - fprintf(NetTrace, "LINEMODE "); - if (length < 2) { - fprintf(NetTrace, " (empty suboption??\?)"); - break; - } - switch (pointer[1]) { - case WILL: - fprintf(NetTrace, "WILL "); - goto common; - case WONT: - fprintf(NetTrace, "WONT "); - goto common; - case DO: - fprintf(NetTrace, "DO "); - goto common; - case DONT: - fprintf(NetTrace, "DONT "); - common: - if (length < 3) { - fprintf(NetTrace, "(no option??\?)"); - break; - } - switch (pointer[2]) { - case LM_FORWARDMASK: - fprintf(NetTrace, "Forward Mask"); - for (i = 3; i < length; i++) - fprintf(NetTrace, " %x", pointer[i]); - break; - default: - fprintf(NetTrace, "%d (unknown)", pointer[2]); - for (i = 3; i < length; i++) - fprintf(NetTrace, " %d", pointer[i]); - break; - } - break; - - case LM_SLC: - fprintf(NetTrace, "SLC"); - for (i = 2; i < length - 2; i += 3) { - if (SLC_NAME_OK(pointer[i+SLC_FUNC])) - fprintf(NetTrace, " %s", SLC_NAME(pointer[i+SLC_FUNC])); - else - fprintf(NetTrace, " %d", pointer[i+SLC_FUNC]); - switch (pointer[i+SLC_FLAGS]&SLC_LEVELBITS) { - case SLC_NOSUPPORT: - fprintf(NetTrace, " NOSUPPORT"); break; - case SLC_CANTCHANGE: - fprintf(NetTrace, " CANTCHANGE"); break; - case SLC_VARIABLE: - fprintf(NetTrace, " VARIABLE"); break; - case SLC_DEFAULT: - fprintf(NetTrace, " DEFAULT"); break; - } - fprintf(NetTrace, "%s%s%s", - pointer[i+SLC_FLAGS]&SLC_ACK ? "|ACK" : "", - pointer[i+SLC_FLAGS]&SLC_FLUSHIN ? "|FLUSHIN" : "", - pointer[i+SLC_FLAGS]&SLC_FLUSHOUT ? "|FLUSHOUT" : ""); - if (pointer[i+SLC_FLAGS]& ~(SLC_ACK|SLC_FLUSHIN| - SLC_FLUSHOUT| SLC_LEVELBITS)) - fprintf(NetTrace, "(0x%x)", pointer[i+SLC_FLAGS]); - fprintf(NetTrace, " %d;", pointer[i+SLC_VALUE]); - if ((pointer[i+SLC_VALUE] == IAC) && - (pointer[i+SLC_VALUE+1] == IAC)) - i++; - } - for (; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - - case LM_MODE: - fprintf(NetTrace, "MODE "); - if (length < 3) { - fprintf(NetTrace, "(no mode??\?)"); - break; - } - { - char tbuf[64]; - sprintf(tbuf, "%s%s%s%s%s", - pointer[2]&MODE_EDIT ? "|EDIT" : "", - pointer[2]&MODE_TRAPSIG ? "|TRAPSIG" : "", - pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "", - pointer[2]&MODE_LIT_ECHO ? "|LIT_ECHO" : "", - pointer[2]&MODE_ACK ? "|ACK" : ""); - fprintf(NetTrace, "%s", tbuf[1] ? &tbuf[1] : "0"); - } - if (pointer[2]&~(MODE_MASK)) - fprintf(NetTrace, " (0x%x)", pointer[2]); - for (i = 3; i < length; i++) - fprintf(NetTrace, " ?0x%x?", pointer[i]); - break; - default: - fprintf(NetTrace, "%d (unknown)", pointer[1]); - for (i = 2; i < length; i++) - fprintf(NetTrace, " %d", pointer[i]); - } - break; - - case TELOPT_STATUS: { - register char *cp; - register int j, k; - - fprintf(NetTrace, "STATUS"); - - switch (pointer[1]) { - default: - if (pointer[1] == TELQUAL_SEND) - fprintf(NetTrace, " SEND"); - else - fprintf(NetTrace, " %d (unknown)", pointer[1]); - for (i = 2; i < length; i++) - fprintf(NetTrace, " ?%d?", pointer[i]); - break; - case TELQUAL_IS: - if (--want_status_response < 0) - want_status_response = 0; - if (NetTrace == stdout) - fprintf(NetTrace, " IS\r\n"); - else - fprintf(NetTrace, " IS\n"); - - for (i = 2; i < length; i++) { - switch(pointer[i]) { - case DO: cp = "DO"; goto common2; - case DONT: cp = "DONT"; goto common2; - case WILL: cp = "WILL"; goto common2; - case WONT: cp = "WONT"; goto common2; - common2: - i++; - if (TELOPT_OK((int)pointer[i])) - fprintf(NetTrace, " %s %s", cp, TELOPT(pointer[i])); - else - fprintf(NetTrace, " %s %d", cp, pointer[i]); - - if (NetTrace == stdout) - fprintf(NetTrace, "\r\n"); - else - fprintf(NetTrace, "\n"); - break; - - case SB: - fprintf(NetTrace, " SB "); - i++; - j = k = i; - while (j < length) { - if (pointer[j] == SE) { - if (j+1 == length) - break; - if (pointer[j+1] == SE) - j++; - else - break; - } - pointer[k++] = pointer[j++]; - } - printsub(0, &pointer[i], k - i); - if (i < length) { - fprintf(NetTrace, " SE"); - i = j; - } else - i = j - 1; - - if (NetTrace == stdout) - fprintf(NetTrace, "\r\n"); - else - fprintf(NetTrace, "\n"); - - break; - - default: - fprintf(NetTrace, " %d", pointer[i]); - break; - } - } - break; - } - break; - } - - case TELOPT_XDISPLOC: - fprintf(NetTrace, "X-DISPLAY-LOCATION "); - switch (pointer[1]) { - case TELQUAL_IS: - fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2); - break; - case TELQUAL_SEND: - fprintf(NetTrace, "SEND"); - break; - default: - fprintf(NetTrace, "- unknown qualifier %d (0x%x).", - pointer[1], pointer[1]); - } - break; - - case TELOPT_NEW_ENVIRON: - fprintf(NetTrace, "NEW-ENVIRON "); -#ifdef OLD_ENVIRON - goto env_common1; - case TELOPT_OLD_ENVIRON: - fprintf(NetTrace, "OLD-ENVIRON"); - env_common1: -#endif - switch (pointer[1]) { - case TELQUAL_IS: - fprintf(NetTrace, "IS "); - goto env_common; - case TELQUAL_SEND: - fprintf(NetTrace, "SEND "); - goto env_common; - case TELQUAL_INFO: - fprintf(NetTrace, "INFO "); - env_common: - { - register int noquote = 2; -#if defined(ENV_HACK) && defined(OLD_ENVIRON) - extern int old_env_var, old_env_value; -#endif - for (i = 2; i < length; i++ ) { - switch (pointer[i]) { - case NEW_ENV_VALUE: -#ifdef OLD_ENVIRON - /* case NEW_ENV_OVAR: */ - if (pointer[0] == TELOPT_OLD_ENVIRON) { -# ifdef ENV_HACK - if (old_env_var == OLD_ENV_VALUE) - fprintf(NetTrace, "\" (VALUE) " + noquote); - else -# endif - fprintf(NetTrace, "\" VAR " + noquote); - } else -#endif /* OLD_ENVIRON */ - fprintf(NetTrace, "\" VALUE " + noquote); - noquote = 2; - break; - - case NEW_ENV_VAR: -#ifdef OLD_ENVIRON - /* case OLD_ENV_VALUE: */ - if (pointer[0] == TELOPT_OLD_ENVIRON) { -# ifdef ENV_HACK - if (old_env_value == OLD_ENV_VAR) - fprintf(NetTrace, "\" (VAR) " + noquote); - else -# endif - fprintf(NetTrace, "\" VALUE " + noquote); - } else -#endif /* OLD_ENVIRON */ - fprintf(NetTrace, "\" VAR " + noquote); - noquote = 2; - break; - - case ENV_ESC: - fprintf(NetTrace, "\" ESC " + noquote); - noquote = 2; - break; - - case ENV_USERVAR: - fprintf(NetTrace, "\" USERVAR " + noquote); - noquote = 2; - break; - - default: - def_case: - if (isprint(pointer[i]) && pointer[i] != '"') { - if (noquote) { - putc('"', NetTrace); - noquote = 0; - } - putc(pointer[i], NetTrace); - } else { - fprintf(NetTrace, "\" %03o " + noquote, - pointer[i]); - noquote = 2; - } - break; - } - } - if (!noquote) - putc('"', NetTrace); - break; - } - } - break; - - default: - if (TELOPT_OK(pointer[0])) - fprintf(NetTrace, "%s (unknown)", TELOPT(pointer[0])); - else - fprintf(NetTrace, "%d (unknown)", pointer[0]); - for (i = 1; i < length; i++) - fprintf(NetTrace, " %d", pointer[i]); - break; - } - if (direction) { - if (NetTrace == stdout) - fprintf(NetTrace, "\r\n"); - else - fprintf(NetTrace, "\n"); - } - if (NetTrace == stdout) - fflush(NetTrace); - } -} - -/* EmptyTerminal - called to make sure that the terminal buffer is empty. - * Note that we consider the buffer to run all the - * way to the kernel (thus the select). - */ - - void -EmptyTerminal() -{ -#if defined(unix) - fd_set o; - - FD_ZERO(&o); -#endif /* defined(unix) */ - - if (TTYBYTES() == 0) { -#if defined(unix) - FD_SET(tout, &o); - (void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0, - (struct timeval *) 0); /* wait for TTLOWAT */ -#endif /* defined(unix) */ - } else { - while (TTYBYTES()) { - (void) ttyflush(0); -#if defined(unix) - FD_SET(tout, &o); - (void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0, - (struct timeval *) 0); /* wait for TTLOWAT */ -#endif /* defined(unix) */ - } - } -} - - void -SetForExit() -{ - setconnmode(0); -#if defined(TN3270) - if (In3270) { - Finish3270(); - } -#else /* defined(TN3270) */ - do { - (void)telrcv(); /* Process any incoming data */ - EmptyTerminal(); - } while (ring_full_count(&netiring)); /* While there is any */ -#endif /* defined(TN3270) */ - setcommandmode(); - fflush(stdout); - fflush(stderr); -#if defined(TN3270) - if (In3270) { - StopScreen(1); - } -#endif /* defined(TN3270) */ - setconnmode(0); - EmptyTerminal(); /* Flush the path to the tty */ - setcommandmode(); -} - - void -Exit(returnCode) - int returnCode; -{ - SetForExit(); - exit(returnCode); -} - - void -ExitString(string, returnCode) - char *string; - int returnCode; -{ - SetForExit(); - fwrite(string, 1, strlen(string), stderr); - exit(returnCode); -} diff --git a/secure/usr.sbin/xntpd/lib/authdes.c b/secure/usr.sbin/xntpd/lib/authdes.c deleted file mode 100644 index d6d8d1bb6622b..0000000000000 --- a/secure/usr.sbin/xntpd/lib/authdes.c +++ /dev/null @@ -1,869 +0,0 @@ -/* - * authdes.c - an implementation of the DES cipher algorithm for NTP - */ -#include - -#include - -#if BYTE_ORDER == BIG_ENDIAN -#define XNTP_BIG_ENDIAN -#endif -#if BYTE_ORDER == LITTLE_ENDIAN -#define XNTP_LITTLE_ENDIAN -#endif - -/* - * There are two entries in here. auth_subkeys() called to - * compute the encryption and decryption key schedules, while - * auth_des() is called to do the actual encryption/decryption - */ - -/* - * Byte order woes. The DES code is sensitive to byte order. This - * used to be resolved by calling ntohl() and htonl() to swap things - * around, but this turned out to be quite costly on Vaxes where those - * things are actual functions. The code now straightens out byte - * order troubles on its own, with no performance penalty for little - * end first machines, but at great expense to cleanliness. - */ -#if !defined(XNTP_BIG_ENDIAN) && !defined(XNTP_LITTLE_ENDIAN) - /* - * Pick one or the other. - */ - BYTE_ORDER_NOT_DEFINED_FOR_AUTHENTICATION -#endif - -/* - * Key setup. Here we entirely permute a key, saving the results - * for both the encryption and decryption. Note that while the - * decryption subkeys are simply the encryption keys reordered, - * we save both so that a common cipher routine may be used. - */ - -/* - * Permuted choice 1 tables. These are used to extract bits - * from the left and right parts of the key to form Ci and Di. - * The code that uses these tables knows which bits from which - * part of each key are used to form Ci and Di. - */ -static u_long PC1_CL[8] = { - 0x00000000, 0x00000010, 0x00001000, 0x00001010, - 0x00100000, 0x00100010, 0x00101000, 0x00101010 -}; - -static u_long PC1_DL[16] = { - 0x00000000, 0x00100000, 0x00001000, 0x00101000, - 0x00000010, 0x00100010, 0x00001010, 0x00101010, - 0x00000001, 0x00100001, 0x00001001, 0x00101001, - 0x00000011, 0x00100011, 0x00001011, 0x00101011 -}; - -static u_long PC1_CR[16] = { - 0x00000000, 0x00000001, 0x00000100, 0x00000101, - 0x00010000, 0x00010001, 0x00010100, 0x00010101, - 0x01000000, 0x01000001, 0x01000100, 0x01000101, - 0x01010000, 0x01010001, 0x01010100, 0x01010101 -}; - -static u_long PC1_DR[8] = { - 0x00000000, 0x01000000, 0x00010000, 0x01010000, - 0x00000100, 0x01000100, 0x00010100, 0x01010100 -}; - - -/* - * At the start of some iterations of the key schedule we do - * a circular left shift by one place, while for others we do a shift by - * two places. This has bits set for the iterations where we do 2 bit - * shifts, starting at the low order bit. - */ -#define TWO_BIT_SHIFTS 0x7efc - -/* - * Permuted choice 2 tables. The first actually produces the low order - * 24 bits of the subkey Ki from the 28 bit value of Ci. The second produces - * the high order 24 bits from Di. The tables are indexed by six bit - * segments of Ci and Di respectively. The code is handcrafted to compute - * the appropriate 6 bit chunks. - * - * Note that for ease of computation, the 24 bit values are produced with - * six bits going into each byte. - */ -static u_long PC2_C[4][64] = { - 0x00000000, 0x00040000, 0x01000000, 0x01040000, - 0x00000400, 0x00040400, 0x01000400, 0x01040400, - 0x00200000, 0x00240000, 0x01200000, 0x01240000, - 0x00200400, 0x00240400, 0x01200400, 0x01240400, - 0x00000001, 0x00040001, 0x01000001, 0x01040001, - 0x00000401, 0x00040401, 0x01000401, 0x01040401, - 0x00200001, 0x00240001, 0x01200001, 0x01240001, - 0x00200401, 0x00240401, 0x01200401, 0x01240401, - 0x02000000, 0x02040000, 0x03000000, 0x03040000, - 0x02000400, 0x02040400, 0x03000400, 0x03040400, - 0x02200000, 0x02240000, 0x03200000, 0x03240000, - 0x02200400, 0x02240400, 0x03200400, 0x03240400, - 0x02000001, 0x02040001, 0x03000001, 0x03040001, - 0x02000401, 0x02040401, 0x03000401, 0x03040401, - 0x02200001, 0x02240001, 0x03200001, 0x03240001, - 0x02200401, 0x02240401, 0x03200401, 0x03240401, - - 0x00000000, 0x00000002, 0x00000800, 0x00000802, - 0x08000000, 0x08000002, 0x08000800, 0x08000802, - 0x00010000, 0x00010002, 0x00010800, 0x00010802, - 0x08010000, 0x08010002, 0x08010800, 0x08010802, - 0x00000100, 0x00000102, 0x00000900, 0x00000902, - 0x08000100, 0x08000102, 0x08000900, 0x08000902, - 0x00010100, 0x00010102, 0x00010900, 0x00010902, - 0x08010100, 0x08010102, 0x08010900, 0x08010902, - 0x00000010, 0x00000012, 0x00000810, 0x00000812, - 0x08000010, 0x08000012, 0x08000810, 0x08000812, - 0x00010010, 0x00010012, 0x00010810, 0x00010812, - 0x08010010, 0x08010012, 0x08010810, 0x08010812, - 0x00000110, 0x00000112, 0x00000910, 0x00000912, - 0x08000110, 0x08000112, 0x08000910, 0x08000912, - 0x00010110, 0x00010112, 0x00010910, 0x00010912, - 0x08010110, 0x08010112, 0x08010910, 0x08010912, - - 0x00000000, 0x04000000, 0x00002000, 0x04002000, - 0x10000000, 0x14000000, 0x10002000, 0x14002000, - 0x00000020, 0x04000020, 0x00002020, 0x04002020, - 0x10000020, 0x14000020, 0x10002020, 0x14002020, - 0x00080000, 0x04080000, 0x00082000, 0x04082000, - 0x10080000, 0x14080000, 0x10082000, 0x14082000, - 0x00080020, 0x04080020, 0x00082020, 0x04082020, - 0x10080020, 0x14080020, 0x10082020, 0x14082020, - 0x20000000, 0x24000000, 0x20002000, 0x24002000, - 0x30000000, 0x34000000, 0x30002000, 0x34002000, - 0x20000020, 0x24000020, 0x20002020, 0x24002020, - 0x30000020, 0x34000020, 0x30002020, 0x34002020, - 0x20080000, 0x24080000, 0x20082000, 0x24082000, - 0x30080000, 0x34080000, 0x30082000, 0x34082000, - 0x20080020, 0x24080020, 0x20082020, 0x24082020, - 0x30080020, 0x34080020, 0x30082020, 0x34082020, - - 0x00000000, 0x00100000, 0x00000008, 0x00100008, - 0x00000200, 0x00100200, 0x00000208, 0x00100208, - 0x00020000, 0x00120000, 0x00020008, 0x00120008, - 0x00020200, 0x00120200, 0x00020208, 0x00120208, - 0x00000004, 0x00100004, 0x0000000c, 0x0010000c, - 0x00000204, 0x00100204, 0x0000020c, 0x0010020c, - 0x00020004, 0x00120004, 0x0002000c, 0x0012000c, - 0x00020204, 0x00120204, 0x0002020c, 0x0012020c, - 0x00001000, 0x00101000, 0x00001008, 0x00101008, - 0x00001200, 0x00101200, 0x00001208, 0x00101208, - 0x00021000, 0x00121000, 0x00021008, 0x00121008, - 0x00021200, 0x00121200, 0x00021208, 0x00121208, - 0x00001004, 0x00101004, 0x0000100c, 0x0010100c, - 0x00001204, 0x00101204, 0x0000120c, 0x0010120c, - 0x00021004, 0x00121004, 0x0002100c, 0x0012100c, - 0x00021204, 0x00121204, 0x0002120c, 0x0012120c -}; - -static u_long PC2_D[4][64] = { - 0x00000000, 0x00000200, 0x00020000, 0x00020200, - 0x00000001, 0x00000201, 0x00020001, 0x00020201, - 0x08000000, 0x08000200, 0x08020000, 0x08020200, - 0x08000001, 0x08000201, 0x08020001, 0x08020201, - 0x00200000, 0x00200200, 0x00220000, 0x00220200, - 0x00200001, 0x00200201, 0x00220001, 0x00220201, - 0x08200000, 0x08200200, 0x08220000, 0x08220200, - 0x08200001, 0x08200201, 0x08220001, 0x08220201, - 0x00000002, 0x00000202, 0x00020002, 0x00020202, - 0x00000003, 0x00000203, 0x00020003, 0x00020203, - 0x08000002, 0x08000202, 0x08020002, 0x08020202, - 0x08000003, 0x08000203, 0x08020003, 0x08020203, - 0x00200002, 0x00200202, 0x00220002, 0x00220202, - 0x00200003, 0x00200203, 0x00220003, 0x00220203, - 0x08200002, 0x08200202, 0x08220002, 0x08220202, - 0x08200003, 0x08200203, 0x08220003, 0x08220203, - - 0x00000000, 0x00000010, 0x20000000, 0x20000010, - 0x00100000, 0x00100010, 0x20100000, 0x20100010, - 0x00000800, 0x00000810, 0x20000800, 0x20000810, - 0x00100800, 0x00100810, 0x20100800, 0x20100810, - 0x04000000, 0x04000010, 0x24000000, 0x24000010, - 0x04100000, 0x04100010, 0x24100000, 0x24100010, - 0x04000800, 0x04000810, 0x24000800, 0x24000810, - 0x04100800, 0x04100810, 0x24100800, 0x24100810, - 0x00000004, 0x00000014, 0x20000004, 0x20000014, - 0x00100004, 0x00100014, 0x20100004, 0x20100014, - 0x00000804, 0x00000814, 0x20000804, 0x20000814, - 0x00100804, 0x00100814, 0x20100804, 0x20100814, - 0x04000004, 0x04000014, 0x24000004, 0x24000014, - 0x04100004, 0x04100014, 0x24100004, 0x24100014, - 0x04000804, 0x04000814, 0x24000804, 0x24000814, - 0x04100804, 0x04100814, 0x24100804, 0x24100814, - - 0x00000000, 0x00001000, 0x00010000, 0x00011000, - 0x02000000, 0x02001000, 0x02010000, 0x02011000, - 0x00000020, 0x00001020, 0x00010020, 0x00011020, - 0x02000020, 0x02001020, 0x02010020, 0x02011020, - 0x00040000, 0x00041000, 0x00050000, 0x00051000, - 0x02040000, 0x02041000, 0x02050000, 0x02051000, - 0x00040020, 0x00041020, 0x00050020, 0x00051020, - 0x02040020, 0x02041020, 0x02050020, 0x02051020, - 0x00002000, 0x00003000, 0x00012000, 0x00013000, - 0x02002000, 0x02003000, 0x02012000, 0x02013000, - 0x00002020, 0x00003020, 0x00012020, 0x00013020, - 0x02002020, 0x02003020, 0x02012020, 0x02013020, - 0x00042000, 0x00043000, 0x00052000, 0x00053000, - 0x02042000, 0x02043000, 0x02052000, 0x02053000, - 0x00042020, 0x00043020, 0x00052020, 0x00053020, - 0x02042020, 0x02043020, 0x02052020, 0x02053020, - - 0x00000000, 0x00000400, 0x01000000, 0x01000400, - 0x00000100, 0x00000500, 0x01000100, 0x01000500, - 0x10000000, 0x10000400, 0x11000000, 0x11000400, - 0x10000100, 0x10000500, 0x11000100, 0x11000500, - 0x00080000, 0x00080400, 0x01080000, 0x01080400, - 0x00080100, 0x00080500, 0x01080100, 0x01080500, - 0x10080000, 0x10080400, 0x11080000, 0x11080400, - 0x10080100, 0x10080500, 0x11080100, 0x11080500, - 0x00000008, 0x00000408, 0x01000008, 0x01000408, - 0x00000108, 0x00000508, 0x01000108, 0x01000508, - 0x10000008, 0x10000408, 0x11000008, 0x11000408, - 0x10000108, 0x10000508, 0x11000108, 0x11000508, - 0x00080008, 0x00080408, 0x01080008, 0x01080408, - 0x00080108, 0x00080508, 0x01080108, 0x01080508, - 0x10080008, 0x10080408, 0x11080008, 0x11080408, - 0x10080108, 0x10080508, 0x11080108, 0x11080508 -}; - - - -/* - * Permute the key to give us our key schedule. - */ -void -DESauth_subkeys(key, encryptkeys, decryptkeys) - u_long *key; - u_char *encryptkeys; - u_char *decryptkeys; -{ - register u_long tmp; - register u_long c, d; - register u_char *ek, *dk; - register int two_bit_shifts; - register int i; - - /* - * The first permutted choice gives us the 28 bits for C0 and - * 28 for D0. C0 gets 12 bits from the left key and 16 from - * the right, while D0 gets 16 from the left and 12 from the - * right. The code knows which bits go where. - */ - tmp = *key; /* left part of key */ - c = PC1_CL[(tmp >> 29) & 0x7] - | (PC1_CL[(tmp >> 21) & 0x7] << 1) - | (PC1_CL[(tmp >> 13) & 0x7] << 2) - | (PC1_CL[(tmp >> 5) & 0x7] << 3); - d = PC1_DL[(tmp >> 25) & 0xf] - | (PC1_DL[(tmp >> 17) & 0xf] << 1) - | (PC1_DL[(tmp >> 9) & 0xf] << 2) - | (PC1_DL[(tmp >> 1) & 0xf] << 3); - - tmp = *(key+1); /* right part of key */ - c |= PC1_CR[(tmp >> 28) & 0xf] - | (PC1_CR[(tmp >> 20) & 0xf] << 1) - | (PC1_CR[(tmp >> 12) & 0xf] << 2) - | (PC1_CR[(tmp >> 4) & 0xf] << 3); - d |= PC1_DR[(tmp >> 25) & 0x7] - | (PC1_DR[(tmp >> 17) & 0x7] << 1) - | (PC1_DR[(tmp >> 9) & 0x7] << 2) - | (PC1_DR[(tmp >> 1) & 0x7] << 3); - - /* - * Now iterate to compute the key schedule. Note that we - * record the entire set of subkeys in 6 bit chunks since - * they are used that way. At 6 bits/char, we need - * 48/6 char's/subkey * 16 subkeys/encryption == 128 chars. - * encryptkeys and decryptkeys must be this big. - */ - ek = encryptkeys; - dk = decryptkeys + (8 * 15); - two_bit_shifts = TWO_BIT_SHIFTS; - for (i = 16; i > 0; i--) { - /* - * Do the rotation. One bit and two bit rotations - * are done separately. Note C and D are 28 bits. - */ - if (two_bit_shifts & 0x1) { - c = ((c << 2) & 0xffffffc) | (c >> 26); - d = ((d << 2) & 0xffffffc) | (d >> 26); - } else { - c = ((c << 1) & 0xffffffe) | (c >> 27); - d = ((d << 1) & 0xffffffe) | (d >> 27); - } - two_bit_shifts >>= 1; - - /* - * Apply permutted choice 2 to C to get the first - * 24 bits worth of keys. Note that bits 9, 18, 22 - * and 25 (using DES numbering) in C are unused. The - * shift-mask stuff is done to delete these bits from - * the indices, since this cuts the table size in half. - */ - tmp = PC2_C[0][((c >> 22) & 0x3f)] - | PC2_C[1][((c >> 15) & 0xf) | ((c >> 16) & 0x30)] - | PC2_C[2][((c >> 4) & 0x3) | ((c >> 9) & 0x3c)] - | PC2_C[3][((c ) & 0x7) | ((c >> 4) & 0x38)]; - *ek++ = *dk++ = (u_char)(tmp >> 24); - *ek++ = *dk++ = (u_char)(tmp >> 16); - *ek++ = *dk++ = (u_char)(tmp >> 8); - *ek++ = *dk++ = (u_char)tmp; - - /* - * Apply permutted choice 2 to D to get the other half. - * Here, bits 7, 10, 15 and 26 go unused. The sqeezing - * actually turns out to be cheaper here. - */ - tmp = PC2_D[0][((d >> 22) & 0x3f)] - | PC2_D[1][((d >> 14) & 0xf) | ((d >> 15) & 0x30)] - | PC2_D[2][((d >> 7) & 0x3f)] - | PC2_D[3][((d ) & 0x3) | ((d >> 1) & 0x3c)]; - *ek++ = *dk++ = (u_char)(tmp >> 24); - *ek++ = *dk++ = (u_char)(tmp >> 16); - *ek++ = *dk++ = (u_char)(tmp >> 8); - *ek++ = *dk++ = (u_char)tmp; - - /* - * We are filling in the decryption subkeys from the end. - * Space it back 16 elements to get to the start of the - * next set. - */ - dk -= 16; - } -} - -/* - * The DES algorithm. This is intended to be fairly speedy at the - * expense of some memory. - * - * This uses all the standard hacks. The S boxes and the P permutation - * are precomputed into one table. The E box never actually appears - * explicitly since it is easy to apply this algorithmically. The - * initial permutation and final (inverse initial) permuation are - * computed from tables designed to permute four bits at a time. This - * should run pretty fast on machines with 32 bit words and - * bit field/multiple bit shift instructions which are fast. - */ - -/* - * The initial permutation array. This is used to compute both the - * left and the right halves of the initial permutation using bytes - * from words made from the following operations: - * - * ((left & 0x55555555) << 1) | (right & 0x55555555) for left half - * (left & 0xaaaaaaaa) | ((right & 0xaaaaaaaa) >> 1) for right half - * - * The scheme is that we index into the table using each byte. The - * result from the high order byte is or'd with the result from the - * next byte shifted left once is or'd with the result from the next - * byte shifted left twice if or'd with the result from the low order - * byte shifted left by three. Clear? - */ -static u_long IP[256] = { - 0x00000000, 0x00000010, 0x00000001, 0x00000011, - 0x00001000, 0x00001010, 0x00001001, 0x00001011, - 0x00000100, 0x00000110, 0x00000101, 0x00000111, - 0x00001100, 0x00001110, 0x00001101, 0x00001111, - 0x00100000, 0x00100010, 0x00100001, 0x00100011, - 0x00101000, 0x00101010, 0x00101001, 0x00101011, - 0x00100100, 0x00100110, 0x00100101, 0x00100111, - 0x00101100, 0x00101110, 0x00101101, 0x00101111, - 0x00010000, 0x00010010, 0x00010001, 0x00010011, - 0x00011000, 0x00011010, 0x00011001, 0x00011011, - 0x00010100, 0x00010110, 0x00010101, 0x00010111, - 0x00011100, 0x00011110, 0x00011101, 0x00011111, - 0x00110000, 0x00110010, 0x00110001, 0x00110011, - 0x00111000, 0x00111010, 0x00111001, 0x00111011, - 0x00110100, 0x00110110, 0x00110101, 0x00110111, - 0x00111100, 0x00111110, 0x00111101, 0x00111111, - 0x10000000, 0x10000010, 0x10000001, 0x10000011, - 0x10001000, 0x10001010, 0x10001001, 0x10001011, - 0x10000100, 0x10000110, 0x10000101, 0x10000111, - 0x10001100, 0x10001110, 0x10001101, 0x10001111, - 0x10100000, 0x10100010, 0x10100001, 0x10100011, - 0x10101000, 0x10101010, 0x10101001, 0x10101011, - 0x10100100, 0x10100110, 0x10100101, 0x10100111, - 0x10101100, 0x10101110, 0x10101101, 0x10101111, - 0x10010000, 0x10010010, 0x10010001, 0x10010011, - 0x10011000, 0x10011010, 0x10011001, 0x10011011, - 0x10010100, 0x10010110, 0x10010101, 0x10010111, - 0x10011100, 0x10011110, 0x10011101, 0x10011111, - 0x10110000, 0x10110010, 0x10110001, 0x10110011, - 0x10111000, 0x10111010, 0x10111001, 0x10111011, - 0x10110100, 0x10110110, 0x10110101, 0x10110111, - 0x10111100, 0x10111110, 0x10111101, 0x10111111, - 0x01000000, 0x01000010, 0x01000001, 0x01000011, - 0x01001000, 0x01001010, 0x01001001, 0x01001011, - 0x01000100, 0x01000110, 0x01000101, 0x01000111, - 0x01001100, 0x01001110, 0x01001101, 0x01001111, - 0x01100000, 0x01100010, 0x01100001, 0x01100011, - 0x01101000, 0x01101010, 0x01101001, 0x01101011, - 0x01100100, 0x01100110, 0x01100101, 0x01100111, - 0x01101100, 0x01101110, 0x01101101, 0x01101111, - 0x01010000, 0x01010010, 0x01010001, 0x01010011, - 0x01011000, 0x01011010, 0x01011001, 0x01011011, - 0x01010100, 0x01010110, 0x01010101, 0x01010111, - 0x01011100, 0x01011110, 0x01011101, 0x01011111, - 0x01110000, 0x01110010, 0x01110001, 0x01110011, - 0x01111000, 0x01111010, 0x01111001, 0x01111011, - 0x01110100, 0x01110110, 0x01110101, 0x01110111, - 0x01111100, 0x01111110, 0x01111101, 0x01111111, - 0x11000000, 0x11000010, 0x11000001, 0x11000011, - 0x11001000, 0x11001010, 0x11001001, 0x11001011, - 0x11000100, 0x11000110, 0x11000101, 0x11000111, - 0x11001100, 0x11001110, 0x11001101, 0x11001111, - 0x11100000, 0x11100010, 0x11100001, 0x11100011, - 0x11101000, 0x11101010, 0x11101001, 0x11101011, - 0x11100100, 0x11100110, 0x11100101, 0x11100111, - 0x11101100, 0x11101110, 0x11101101, 0x11101111, - 0x11010000, 0x11010010, 0x11010001, 0x11010011, - 0x11011000, 0x11011010, 0x11011001, 0x11011011, - 0x11010100, 0x11010110, 0x11010101, 0x11010111, - 0x11011100, 0x11011110, 0x11011101, 0x11011111, - 0x11110000, 0x11110010, 0x11110001, 0x11110011, - 0x11111000, 0x11111010, 0x11111001, 0x11111011, - 0x11110100, 0x11110110, 0x11110101, 0x11110111, - 0x11111100, 0x11111110, 0x11111101, 0x11111111 -}; - -/* - * The final permutation array. Like the IP array, used - * to compute both the left and right results from the nibbles - * of words computed from: - * - * ((left & 0x0f0f0f0f) << 4) | (right & 0x0f0f0f0f) for left result - * (left & 0xf0f0f0f0) | ((right & 0xf0f0f0f0) >> 4) for right result - * - * The result from the high order byte is shifted left 6 bits and - * or'd with the result from the next byte shifted left 4 bits, which - * is or'd with the result from the next byte shifted left 2 bits, - * which is or'd with the result from the low byte. - * - * There is one of these for big end machines (the natural order for - * DES) and a second for little end machines. One is a byte swapped - * version of the other. - */ -#ifndef XNTP_LITTLE_ENDIAN - /* - * Big end version - */ -static u_long FP[256] = { - 0x00000000, 0x02000000, 0x00020000, 0x02020000, - 0x00000200, 0x02000200, 0x00020200, 0x02020200, - 0x00000002, 0x02000002, 0x00020002, 0x02020002, - 0x00000202, 0x02000202, 0x00020202, 0x02020202, - 0x01000000, 0x03000000, 0x01020000, 0x03020000, - 0x01000200, 0x03000200, 0x01020200, 0x03020200, - 0x01000002, 0x03000002, 0x01020002, 0x03020002, - 0x01000202, 0x03000202, 0x01020202, 0x03020202, - 0x00010000, 0x02010000, 0x00030000, 0x02030000, - 0x00010200, 0x02010200, 0x00030200, 0x02030200, - 0x00010002, 0x02010002, 0x00030002, 0x02030002, - 0x00010202, 0x02010202, 0x00030202, 0x02030202, - 0x01010000, 0x03010000, 0x01030000, 0x03030000, - 0x01010200, 0x03010200, 0x01030200, 0x03030200, - 0x01010002, 0x03010002, 0x01030002, 0x03030002, - 0x01010202, 0x03010202, 0x01030202, 0x03030202, - 0x00000100, 0x02000100, 0x00020100, 0x02020100, - 0x00000300, 0x02000300, 0x00020300, 0x02020300, - 0x00000102, 0x02000102, 0x00020102, 0x02020102, - 0x00000302, 0x02000302, 0x00020302, 0x02020302, - 0x01000100, 0x03000100, 0x01020100, 0x03020100, - 0x01000300, 0x03000300, 0x01020300, 0x03020300, - 0x01000102, 0x03000102, 0x01020102, 0x03020102, - 0x01000302, 0x03000302, 0x01020302, 0x03020302, - 0x00010100, 0x02010100, 0x00030100, 0x02030100, - 0x00010300, 0x02010300, 0x00030300, 0x02030300, - 0x00010102, 0x02010102, 0x00030102, 0x02030102, - 0x00010302, 0x02010302, 0x00030302, 0x02030302, - 0x01010100, 0x03010100, 0x01030100, 0x03030100, - 0x01010300, 0x03010300, 0x01030300, 0x03030300, - 0x01010102, 0x03010102, 0x01030102, 0x03030102, - 0x01010302, 0x03010302, 0x01030302, 0x03030302, - 0x00000001, 0x02000001, 0x00020001, 0x02020001, - 0x00000201, 0x02000201, 0x00020201, 0x02020201, - 0x00000003, 0x02000003, 0x00020003, 0x02020003, - 0x00000203, 0x02000203, 0x00020203, 0x02020203, - 0x01000001, 0x03000001, 0x01020001, 0x03020001, - 0x01000201, 0x03000201, 0x01020201, 0x03020201, - 0x01000003, 0x03000003, 0x01020003, 0x03020003, - 0x01000203, 0x03000203, 0x01020203, 0x03020203, - 0x00010001, 0x02010001, 0x00030001, 0x02030001, - 0x00010201, 0x02010201, 0x00030201, 0x02030201, - 0x00010003, 0x02010003, 0x00030003, 0x02030003, - 0x00010203, 0x02010203, 0x00030203, 0x02030203, - 0x01010001, 0x03010001, 0x01030001, 0x03030001, - 0x01010201, 0x03010201, 0x01030201, 0x03030201, - 0x01010003, 0x03010003, 0x01030003, 0x03030003, - 0x01010203, 0x03010203, 0x01030203, 0x03030203, - 0x00000101, 0x02000101, 0x00020101, 0x02020101, - 0x00000301, 0x02000301, 0x00020301, 0x02020301, - 0x00000103, 0x02000103, 0x00020103, 0x02020103, - 0x00000303, 0x02000303, 0x00020303, 0x02020303, - 0x01000101, 0x03000101, 0x01020101, 0x03020101, - 0x01000301, 0x03000301, 0x01020301, 0x03020301, - 0x01000103, 0x03000103, 0x01020103, 0x03020103, - 0x01000303, 0x03000303, 0x01020303, 0x03020303, - 0x00010101, 0x02010101, 0x00030101, 0x02030101, - 0x00010301, 0x02010301, 0x00030301, 0x02030301, - 0x00010103, 0x02010103, 0x00030103, 0x02030103, - 0x00010303, 0x02010303, 0x00030303, 0x02030303, - 0x01010101, 0x03010101, 0x01030101, 0x03030101, - 0x01010301, 0x03010301, 0x01030301, 0x03030301, - 0x01010103, 0x03010103, 0x01030103, 0x03030103, - 0x01010303, 0x03010303, 0x01030303, 0x03030303 -}; -#else - /* - * Byte swapped for little end machines. - */ -static u_long FP[256] = { - 0x00000000, 0x00000002, 0x00000200, 0x00000202, - 0x00020000, 0x00020002, 0x00020200, 0x00020202, - 0x02000000, 0x02000002, 0x02000200, 0x02000202, - 0x02020000, 0x02020002, 0x02020200, 0x02020202, - 0x00000001, 0x00000003, 0x00000201, 0x00000203, - 0x00020001, 0x00020003, 0x00020201, 0x00020203, - 0x02000001, 0x02000003, 0x02000201, 0x02000203, - 0x02020001, 0x02020003, 0x02020201, 0x02020203, - 0x00000100, 0x00000102, 0x00000300, 0x00000302, - 0x00020100, 0x00020102, 0x00020300, 0x00020302, - 0x02000100, 0x02000102, 0x02000300, 0x02000302, - 0x02020100, 0x02020102, 0x02020300, 0x02020302, - 0x00000101, 0x00000103, 0x00000301, 0x00000303, - 0x00020101, 0x00020103, 0x00020301, 0x00020303, - 0x02000101, 0x02000103, 0x02000301, 0x02000303, - 0x02020101, 0x02020103, 0x02020301, 0x02020303, - 0x00010000, 0x00010002, 0x00010200, 0x00010202, - 0x00030000, 0x00030002, 0x00030200, 0x00030202, - 0x02010000, 0x02010002, 0x02010200, 0x02010202, - 0x02030000, 0x02030002, 0x02030200, 0x02030202, - 0x00010001, 0x00010003, 0x00010201, 0x00010203, - 0x00030001, 0x00030003, 0x00030201, 0x00030203, - 0x02010001, 0x02010003, 0x02010201, 0x02010203, - 0x02030001, 0x02030003, 0x02030201, 0x02030203, - 0x00010100, 0x00010102, 0x00010300, 0x00010302, - 0x00030100, 0x00030102, 0x00030300, 0x00030302, - 0x02010100, 0x02010102, 0x02010300, 0x02010302, - 0x02030100, 0x02030102, 0x02030300, 0x02030302, - 0x00010101, 0x00010103, 0x00010301, 0x00010303, - 0x00030101, 0x00030103, 0x00030301, 0x00030303, - 0x02010101, 0x02010103, 0x02010301, 0x02010303, - 0x02030101, 0x02030103, 0x02030301, 0x02030303, - 0x01000000, 0x01000002, 0x01000200, 0x01000202, - 0x01020000, 0x01020002, 0x01020200, 0x01020202, - 0x03000000, 0x03000002, 0x03000200, 0x03000202, - 0x03020000, 0x03020002, 0x03020200, 0x03020202, - 0x01000001, 0x01000003, 0x01000201, 0x01000203, - 0x01020001, 0x01020003, 0x01020201, 0x01020203, - 0x03000001, 0x03000003, 0x03000201, 0x03000203, - 0x03020001, 0x03020003, 0x03020201, 0x03020203, - 0x01000100, 0x01000102, 0x01000300, 0x01000302, - 0x01020100, 0x01020102, 0x01020300, 0x01020302, - 0x03000100, 0x03000102, 0x03000300, 0x03000302, - 0x03020100, 0x03020102, 0x03020300, 0x03020302, - 0x01000101, 0x01000103, 0x01000301, 0x01000303, - 0x01020101, 0x01020103, 0x01020301, 0x01020303, - 0x03000101, 0x03000103, 0x03000301, 0x03000303, - 0x03020101, 0x03020103, 0x03020301, 0x03020303, - 0x01010000, 0x01010002, 0x01010200, 0x01010202, - 0x01030000, 0x01030002, 0x01030200, 0x01030202, - 0x03010000, 0x03010002, 0x03010200, 0x03010202, - 0x03030000, 0x03030002, 0x03030200, 0x03030202, - 0x01010001, 0x01010003, 0x01010201, 0x01010203, - 0x01030001, 0x01030003, 0x01030201, 0x01030203, - 0x03010001, 0x03010003, 0x03010201, 0x03010203, - 0x03030001, 0x03030003, 0x03030201, 0x03030203, - 0x01010100, 0x01010102, 0x01010300, 0x01010302, - 0x01030100, 0x01030102, 0x01030300, 0x01030302, - 0x03010100, 0x03010102, 0x03010300, 0x03010302, - 0x03030100, 0x03030102, 0x03030300, 0x03030302, - 0x01010101, 0x01010103, 0x01010301, 0x01010303, - 0x01030101, 0x01030103, 0x01030301, 0x01030303, - 0x03010101, 0x03010103, 0x03010301, 0x03010303, - 0x03030101, 0x03030103, 0x03030301, 0x03030303 -}; -#endif - - -/* - * The SP table is actually the S boxes and the P permutation - * table combined. - */ -static u_long SP[8][64] = { - 0x00808200, 0x00000000, 0x00008000, 0x00808202, - 0x00808002, 0x00008202, 0x00000002, 0x00008000, - 0x00000200, 0x00808200, 0x00808202, 0x00000200, - 0x00800202, 0x00808002, 0x00800000, 0x00000002, - 0x00000202, 0x00800200, 0x00800200, 0x00008200, - 0x00008200, 0x00808000, 0x00808000, 0x00800202, - 0x00008002, 0x00800002, 0x00800002, 0x00008002, - 0x00000000, 0x00000202, 0x00008202, 0x00800000, - 0x00008000, 0x00808202, 0x00000002, 0x00808000, - 0x00808200, 0x00800000, 0x00800000, 0x00000200, - 0x00808002, 0x00008000, 0x00008200, 0x00800002, - 0x00000200, 0x00000002, 0x00800202, 0x00008202, - 0x00808202, 0x00008002, 0x00808000, 0x00800202, - 0x00800002, 0x00000202, 0x00008202, 0x00808200, - 0x00000202, 0x00800200, 0x00800200, 0x00000000, - 0x00008002, 0x00008200, 0x00000000, 0x00808002, - - 0x40084010, 0x40004000, 0x00004000, 0x00084010, - 0x00080000, 0x00000010, 0x40080010, 0x40004010, - 0x40000010, 0x40084010, 0x40084000, 0x40000000, - 0x40004000, 0x00080000, 0x00000010, 0x40080010, - 0x00084000, 0x00080010, 0x40004010, 0x00000000, - 0x40000000, 0x00004000, 0x00084010, 0x40080000, - 0x00080010, 0x40000010, 0x00000000, 0x00084000, - 0x00004010, 0x40084000, 0x40080000, 0x00004010, - 0x00000000, 0x00084010, 0x40080010, 0x00080000, - 0x40004010, 0x40080000, 0x40084000, 0x00004000, - 0x40080000, 0x40004000, 0x00000010, 0x40084010, - 0x00084010, 0x00000010, 0x00004000, 0x40000000, - 0x00004010, 0x40084000, 0x00080000, 0x40000010, - 0x00080010, 0x40004010, 0x40000010, 0x00080010, - 0x00084000, 0x00000000, 0x40004000, 0x00004010, - 0x40000000, 0x40080010, 0x40084010, 0x00084000, - - 0x00000104, 0x04010100, 0x00000000, 0x04010004, - 0x04000100, 0x00000000, 0x00010104, 0x04000100, - 0x00010004, 0x04000004, 0x04000004, 0x00010000, - 0x04010104, 0x00010004, 0x04010000, 0x00000104, - 0x04000000, 0x00000004, 0x04010100, 0x00000100, - 0x00010100, 0x04010000, 0x04010004, 0x00010104, - 0x04000104, 0x00010100, 0x00010000, 0x04000104, - 0x00000004, 0x04010104, 0x00000100, 0x04000000, - 0x04010100, 0x04000000, 0x00010004, 0x00000104, - 0x00010000, 0x04010100, 0x04000100, 0x00000000, - 0x00000100, 0x00010004, 0x04010104, 0x04000100, - 0x04000004, 0x00000100, 0x00000000, 0x04010004, - 0x04000104, 0x00010000, 0x04000000, 0x04010104, - 0x00000004, 0x00010104, 0x00010100, 0x04000004, - 0x04010000, 0x04000104, 0x00000104, 0x04010000, - 0x00010104, 0x00000004, 0x04010004, 0x00010100, - - 0x80401000, 0x80001040, 0x80001040, 0x00000040, - 0x00401040, 0x80400040, 0x80400000, 0x80001000, - 0x00000000, 0x00401000, 0x00401000, 0x80401040, - 0x80000040, 0x00000000, 0x00400040, 0x80400000, - 0x80000000, 0x00001000, 0x00400000, 0x80401000, - 0x00000040, 0x00400000, 0x80001000, 0x00001040, - 0x80400040, 0x80000000, 0x00001040, 0x00400040, - 0x00001000, 0x00401040, 0x80401040, 0x80000040, - 0x00400040, 0x80400000, 0x00401000, 0x80401040, - 0x80000040, 0x00000000, 0x00000000, 0x00401000, - 0x00001040, 0x00400040, 0x80400040, 0x80000000, - 0x80401000, 0x80001040, 0x80001040, 0x00000040, - 0x80401040, 0x80000040, 0x80000000, 0x00001000, - 0x80400000, 0x80001000, 0x00401040, 0x80400040, - 0x80001000, 0x00001040, 0x00400000, 0x80401000, - 0x00000040, 0x00400000, 0x00001000, 0x00401040, - - 0x00000080, 0x01040080, 0x01040000, 0x21000080, - 0x00040000, 0x00000080, 0x20000000, 0x01040000, - 0x20040080, 0x00040000, 0x01000080, 0x20040080, - 0x21000080, 0x21040000, 0x00040080, 0x20000000, - 0x01000000, 0x20040000, 0x20040000, 0x00000000, - 0x20000080, 0x21040080, 0x21040080, 0x01000080, - 0x21040000, 0x20000080, 0x00000000, 0x21000000, - 0x01040080, 0x01000000, 0x21000000, 0x00040080, - 0x00040000, 0x21000080, 0x00000080, 0x01000000, - 0x20000000, 0x01040000, 0x21000080, 0x20040080, - 0x01000080, 0x20000000, 0x21040000, 0x01040080, - 0x20040080, 0x00000080, 0x01000000, 0x21040000, - 0x21040080, 0x00040080, 0x21000000, 0x21040080, - 0x01040000, 0x00000000, 0x20040000, 0x21000000, - 0x00040080, 0x01000080, 0x20000080, 0x00040000, - 0x00000000, 0x20040000, 0x01040080, 0x20000080, - - 0x10000008, 0x10200000, 0x00002000, 0x10202008, - 0x10200000, 0x00000008, 0x10202008, 0x00200000, - 0x10002000, 0x00202008, 0x00200000, 0x10000008, - 0x00200008, 0x10002000, 0x10000000, 0x00002008, - 0x00000000, 0x00200008, 0x10002008, 0x00002000, - 0x00202000, 0x10002008, 0x00000008, 0x10200008, - 0x10200008, 0x00000000, 0x00202008, 0x10202000, - 0x00002008, 0x00202000, 0x10202000, 0x10000000, - 0x10002000, 0x00000008, 0x10200008, 0x00202000, - 0x10202008, 0x00200000, 0x00002008, 0x10000008, - 0x00200000, 0x10002000, 0x10000000, 0x00002008, - 0x10000008, 0x10202008, 0x00202000, 0x10200000, - 0x00202008, 0x10202000, 0x00000000, 0x10200008, - 0x00000008, 0x00002000, 0x10200000, 0x00202008, - 0x00002000, 0x00200008, 0x10002008, 0x00000000, - 0x10202000, 0x10000000, 0x00200008, 0x10002008, - - 0x00100000, 0x02100001, 0x02000401, 0x00000000, - 0x00000400, 0x02000401, 0x00100401, 0x02100400, - 0x02100401, 0x00100000, 0x00000000, 0x02000001, - 0x00000001, 0x02000000, 0x02100001, 0x00000401, - 0x02000400, 0x00100401, 0x00100001, 0x02000400, - 0x02000001, 0x02100000, 0x02100400, 0x00100001, - 0x02100000, 0x00000400, 0x00000401, 0x02100401, - 0x00100400, 0x00000001, 0x02000000, 0x00100400, - 0x02000000, 0x00100400, 0x00100000, 0x02000401, - 0x02000401, 0x02100001, 0x02100001, 0x00000001, - 0x00100001, 0x02000000, 0x02000400, 0x00100000, - 0x02100400, 0x00000401, 0x00100401, 0x02100400, - 0x00000401, 0x02000001, 0x02100401, 0x02100000, - 0x00100400, 0x00000000, 0x00000001, 0x02100401, - 0x00000000, 0x00100401, 0x02100000, 0x00000400, - 0x02000001, 0x02000400, 0x00000400, 0x00100001, - - 0x08000820, 0x00000800, 0x00020000, 0x08020820, - 0x08000000, 0x08000820, 0x00000020, 0x08000000, - 0x00020020, 0x08020000, 0x08020820, 0x00020800, - 0x08020800, 0x00020820, 0x00000800, 0x00000020, - 0x08020000, 0x08000020, 0x08000800, 0x00000820, - 0x00020800, 0x00020020, 0x08020020, 0x08020800, - 0x00000820, 0x00000000, 0x00000000, 0x08020020, - 0x08000020, 0x08000800, 0x00020820, 0x00020000, - 0x00020820, 0x00020000, 0x08020800, 0x00000800, - 0x00000020, 0x08020020, 0x00000800, 0x00020820, - 0x08000800, 0x00000020, 0x08000020, 0x08020000, - 0x08020020, 0x08000000, 0x00020000, 0x08000820, - 0x00000000, 0x08020820, 0x00020020, 0x08000020, - 0x08020000, 0x08000800, 0x08000820, 0x00000000, - 0x08020820, 0x00020800, 0x00020800, 0x00000820, - 0x00000820, 0x00020020, 0x08000000, 0x08020800 -}; - - - -/* - * DESauth_des - perform an in place DES encryption on 64 bits - * - * Note that the `data' argument is always in big-end-first - * byte order, i.e. *(char *)data is the high order byte of - * the 8 byte data word. We modify the initial and final - * permutation computations for little-end-first machines to - * swap bytes into the natural host order at the beginning and - * back to big-end order at the end. This is unclean but avoids - * a byte swapping performance penalty on Vaxes (which are slow already). - */ -void -DESauth_des(data, subkeys) - u_long *data; - u_char *subkeys; -{ - register u_long left, right; - register u_long temp; - register u_char *kp; - register int i; - - /* - * Do the initial permutation. The first operation gets - * all the bits which are used to form the left half of the - * permutted result in one word, which is then used to - * index the appropriate table a byte at a time. - */ - temp = ((*data & 0x55555555) << 1) | (*(data+1) & 0x55555555); -#ifdef XNTP_LITTLE_ENDIAN - /* - * Modify the computation to use the opposite set of bytes. - */ - left = (IP[(temp >> 24) & 0xff] << 3) - | (IP[(temp >> 16) & 0xff] << 2) - | (IP[(temp >> 8) & 0xff] << 1) - | IP[temp & 0xff]; -#else - left = IP[(temp >> 24) & 0xff] - | (IP[(temp >> 16) & 0xff] << 1) - | (IP[(temp >> 8) & 0xff] << 2) - | (IP[temp & 0xff] << 3); -#endif - - /* - * Same thing again except for the right half. - */ - temp = (*data & 0xaaaaaaaa) | ((*(data+1) & 0xaaaaaaaa) >> 1); -#ifdef XNTP_LITTLE_ENDIAN - right = (IP[(temp >> 24) & 0xff] << 3) - | (IP[(temp >> 16) & 0xff] << 2) - | (IP[(temp >> 8) & 0xff] << 1) - | IP[temp & 0xff]; -#else - right = IP[(temp >> 24) & 0xff] - | (IP[(temp >> 16) & 0xff] << 1) - | (IP[(temp >> 8) & 0xff] << 2) - | (IP[temp & 0xff] << 3); -#endif - - /* - * Do the 16 rounds through the cipher function. We actually - * do two at a time, one on the left half and one on the right - * half. - */ - kp = subkeys; - for (i = 0; i < 8; i++) { - /* - * The E expansion is easy to compute algorithmically. - * Take a look at its form and compare it to - * everything involving temp below. Note that - * since SP[0-7] don't have any bits in common set - * it is okay to do the successive xor's. - */ - temp = (right >> 1) | ((right & 1) ? 0x80000000 : 0); - left ^= SP[0][((temp >> 26) & 0x3f) ^ *kp++]; - left ^= SP[1][((temp >> 22) & 0x3f) ^ *kp++]; - left ^= SP[2][((temp >> 18) & 0x3f) ^ *kp++]; - left ^= SP[3][((temp >> 14) & 0x3f) ^ *kp++]; - left ^= SP[4][((temp >> 10) & 0x3f) ^ *kp++]; - left ^= SP[5][((temp >> 6) & 0x3f) ^ *kp++]; - left ^= SP[6][((temp >> 2) & 0x3f) ^ *kp++]; - left ^= SP[7][(((right << 1) | ((right & 0x80000000)?1:0)) - & 0x3f) ^ *kp++]; - - /* - * Careful here. Right now `right' is actually the - * left side and `left' is the right side. Do the - * same thing again, except swap `left' and `right' - */ - temp = (left >> 1) | ((left & 1) ? 0x80000000 : 0); - right ^= SP[0][((temp >> 26) & 0x3f) ^ *kp++]; - right ^= SP[1][((temp >> 22) & 0x3f) ^ *kp++]; - right ^= SP[2][((temp >> 18) & 0x3f) ^ *kp++]; - right ^= SP[3][((temp >> 14) & 0x3f) ^ *kp++]; - right ^= SP[4][((temp >> 10) & 0x3f) ^ *kp++]; - right ^= SP[5][((temp >> 6) & 0x3f) ^ *kp++]; - right ^= SP[6][((temp >> 2) & 0x3f) ^ *kp++]; - right ^= SP[7][(((left << 1) | ((left & 0x80000000)?1:0)) - & 0x3f) ^ *kp++]; - - /* - * By the time we get here, all is straightened out - * again. `left' is left and `right' is right. - */ - } - - /* - * Now the final permutation. Note this is like the IP above - * except that the data is computed from - * - * ((left & 0x0f0f0f0f) << 4) | (right & 0x0f0f0f0f) for left result - * (left & 0xf0f0f0f0) | ((right & 0xf0f0f0f0) >> 4) for right result - * - * Just to confuse things more, we're supposed to swap the right - * and the left halves before doing this. Instead, we'll just - * switch which goes where when computing the temporary. - * - * This operation also byte swaps stuff back into big end byte - * order. This is accomplished by modifying the FP table for - * little end machines, however, so we don't have to worry about - * it here. - */ - temp = ((right & 0x0f0f0f0f) << 4) | (left & 0x0f0f0f0f); - *data = (FP[(temp >> 24) & 0xff] << 6) - | (FP[(temp >> 16) & 0xff] << 4) - | (FP[(temp >> 8) & 0xff] << 2) - | FP[temp & 0xff]; - - temp = (right & 0xf0f0f0f0) | ((left & 0xf0f0f0f0) >> 4); - *(data+1) = (FP[(temp >> 24) & 0xff] << 6) - | (FP[(temp >> 16) & 0xff] << 4) - | (FP[(temp >> 8) & 0xff] << 2) - | FP[temp & 0xff]; -}; diff --git a/share/doc/FAQ/Makefile b/share/doc/FAQ/Makefile index 40ecc8aa77906..dce0bd70c52e1 100644 --- a/share/doc/FAQ/Makefile +++ b/share/doc/FAQ/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/09/08 19:40:04 jfieber Exp $ DOC= freebsd-faq SRCS= freebsd-faq.sgml diff --git a/share/doc/FAQ/freebsd-faq.sgml b/share/doc/FAQ/freebsd-faq.sgml index e1555e3baa3e8..0fbc6a6c57a14 100644 --- a/share/doc/FAQ/freebsd-faq.sgml +++ b/share/doc/FAQ/freebsd-faq.sgml @@ -4,7 +4,7 @@ Frequently Asked Questions for FreeBSD 2.X <author>The FreeBSD FAQ Team, <tt/FAQ@FreeBSD.ORG/ -<date> $Id: freebsd-faq.sgml,v 1.4.4.8 1996/07/09 02:41:35 jkh Exp $ +<date> $Id: freebsd-faq.sgml,v 1.4.4.9 1996/07/12 16:35:29 jkh Exp $ <abstract> This is the FAQ for FreeBSD systems version 2.X All entries are assumed to be relevant to FreeBSD 2.0.5+, unless otherwise noted. diff --git a/share/doc/Makefile b/share/doc/Makefile index 170aaf64254fa..b33ef09bbb498 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $Id: Makefile,v 1.7 1995/10/18 05:07:43 jfieber Exp $ +# $Id: Makefile,v 1.4.4.3 1995/10/18 05:08:52 jfieber Exp $ SUBDIR= FAQ handbook psd smm usd papers diff --git a/share/doc/handbook/Makefile b/share/doc/handbook/Makefile index e9a0a6d5e9893..f2c38944c221f 100644 --- a/share/doc/handbook/Makefile +++ b/share/doc/handbook/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.2.2 1995/10/14 21:55:29 jfieber Exp $ +# $Id: Makefile,v 1.1.2.3 1996/07/03 01:39:21 jkh Exp $ SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml diff --git a/share/doc/handbook/authors.sgml b/share/doc/handbook/authors.sgml index 22c280ebbc3c8..d701fc8e55d17 100644 --- a/share/doc/handbook/authors.sgml +++ b/share/doc/handbook/authors.sgml @@ -1,4 +1,4 @@ -<!-- $Id: authors.sgml,v 1.3.4.5 1996/06/26 09:23:54 jkh Exp $ --> +<!-- $Id: authors.sgml,v 1.3.4.6 1996/07/03 01:39:22 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/basics.sgml b/share/doc/handbook/basics.sgml index c956b3e17d171..f0986a5f72b0d 100644 --- a/share/doc/handbook/basics.sgml +++ b/share/doc/handbook/basics.sgml @@ -1,4 +1,4 @@ -<!-- $Id: basics.sgml,v 1.1.1.1.4.3 1995/10/22 00:50:23 jfieber Exp $ --> +<!-- $Id: basics.sgml,v 1.1.1.1.4.4 1996/06/19 20:27:25 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Unix Basics<label id="basics"></heading> diff --git a/share/doc/handbook/bibliography.sgml b/share/doc/handbook/bibliography.sgml index 3e593056320ab..d0b8dee794e82 100644 --- a/share/doc/handbook/bibliography.sgml +++ b/share/doc/handbook/bibliography.sgml @@ -1,4 +1,4 @@ -<!-- $Id: bibliography.sgml,v 1.1.1.1.4.2 1995/10/12 03:15:45 jfieber Exp $ --> +<!-- $Id: bibliography.sgml,v 1.1.1.1.4.3 1996/06/19 20:27:26 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt> diff --git a/share/doc/handbook/boothelp.sgml b/share/doc/handbook/boothelp.sgml index 37944b0a6eb25..551691dcf4cae 100644 --- a/share/doc/handbook/boothelp.sgml +++ b/share/doc/handbook/boothelp.sgml @@ -1,4 +1,4 @@ -<!-- $Id: boothelp.sgml,v 1.1 1995/09/03 21:12:24 jfieber Exp $ --> +<!-- $Id: boothelp.sgml,v 1.1.2.1 1996/06/19 20:27:27 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [ diff --git a/share/doc/handbook/booting.sgml b/share/doc/handbook/booting.sgml index 9de2386c70323..844d9550336c3 100644 --- a/share/doc/handbook/booting.sgml +++ b/share/doc/handbook/booting.sgml @@ -3,7 +3,7 @@ This conversion has been made by Ollivier Robert. - $Id: booting.sgml,v 1.2.4.4 1996/01/31 14:32:10 mpp Exp $ + $Id: booting.sgml,v 1.2.4.5 1996/06/19 20:27:30 jkh Exp $ <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN"> diff --git a/share/doc/handbook/contrib.sgml b/share/doc/handbook/contrib.sgml index 2f3af7e595ce6..4863912844860 100644 --- a/share/doc/handbook/contrib.sgml +++ b/share/doc/handbook/contrib.sgml @@ -1,4 +1,4 @@ -<!-- $Id: contrib.sgml,v 1.15.2.10 1996/07/03 01:39:23 jkh Exp $ --> +<!-- $Id: contrib.sgml,v 1.15.2.11 1996/07/12 16:33:20 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>FreeBSD contributor list<label id="contrib"></heading> diff --git a/share/doc/handbook/crypt.sgml b/share/doc/handbook/crypt.sgml index 2efe3504cdaa0..2c0818b289c02 100644 --- a/share/doc/handbook/crypt.sgml +++ b/share/doc/handbook/crypt.sgml @@ -1,4 +1,4 @@ -<!-- $Id$ --> +<!-- $Id: crypt.sgml,v 1.1 1995/09/25 04:53:28 jfieber Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>DES, MD5, and Crypt<label id="crypt"></heading> diff --git a/share/doc/handbook/ctm.sgml b/share/doc/handbook/ctm.sgml index ea061f3010b07..137cbdb9ffb85 100644 --- a/share/doc/handbook/ctm.sgml +++ b/share/doc/handbook/ctm.sgml @@ -3,7 +3,7 @@ # # Converted by Ollivier Robert <roberto@FreeBSD.ORG> # -# $Id: ctm.sgml,v 1.1.1.1.4.4 1996/01/31 14:32:13 mpp Exp $ +# $Id: ctm.sgml,v 1.1.1.1.4.5 1996/06/19 20:27:32 jkh Exp $ # # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): diff --git a/share/doc/handbook/current.sgml b/share/doc/handbook/current.sgml index 829090860af58..a3a083a92c9b7 100644 --- a/share/doc/handbook/current.sgml +++ b/share/doc/handbook/current.sgml @@ -1,4 +1,4 @@ -<!-- $Id: current.sgml,v 1.2.4.5 1996/07/05 11:30:15 jkh Exp $ --> +<!-- $Id: current.sgml,v 1.2.4.6 1996/07/12 16:33:21 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> @@ -10,7 +10,7 @@ THE FREEBSD CURRENT POLICY -Last updated: $Date: 1996/07/05 11:30:15 $ +Last updated: $Date: 1996/07/12 16:33:21 $ This document attempts to explain the rationale behind FreeBSD-current, what you should expect should you decide to run it, diff --git a/share/doc/handbook/cyclades.sgml b/share/doc/handbook/cyclades.sgml index 728461e1005ec..41d8f050543fe 100644 --- a/share/doc/handbook/cyclades.sgml +++ b/share/doc/handbook/cyclades.sgml @@ -1,4 +1,4 @@ -<!-- $Id: cyclades.sgml,v 1.2 1996/03/26 23:22:03 mpp Exp $ --> +<!-- $Id: cyclades.sgml,v 1.1 1996/06/07 15:56:35 alex Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/dialup.sgml b/share/doc/handbook/dialup.sgml index ba5aef4ec695b..6c8bd14540cb9 100644 --- a/share/doc/handbook/dialup.sgml +++ b/share/doc/handbook/dialup.sgml @@ -1,6 +1,6 @@ <!-- This is an SGML document in the linuxdoc DTD of the Tutorial for Configuring a FreeBSD for Dialup Services by Guy Helmer. - $Id: dialup.sgml,v 1.1.1.1.4.3 1996/01/31 14:32:14 mpp Exp $ + $Id: dialup.sgml,v 1.1.1.1.4.4 1996/06/19 20:27:35 jkh Exp $ <!DOCTYPE linuxdoc PUBLIC "-//Linux//DTD linuxdoc//EN"> diff --git a/share/doc/handbook/diskless.sgml b/share/doc/handbook/diskless.sgml index ba79883514070..a6adcb2c15920 100644 --- a/share/doc/handbook/diskless.sgml +++ b/share/doc/handbook/diskless.sgml @@ -1,4 +1,4 @@ -<!-- $Id: diskless.sgml,v 1.1.1.1.4.4 1996/06/19 20:27:36 jkh Exp $ --> +<!-- $Id: diskless.sgml,v 1.1.1.1.4.5 1996/07/07 23:26:42 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>Diskless operation<label id="diskless"></heading> diff --git a/share/doc/handbook/dma.sgml b/share/doc/handbook/dma.sgml index af43cf7911474..4b2d13b4d056b 100644 --- a/share/doc/handbook/dma.sgml +++ b/share/doc/handbook/dma.sgml @@ -1,4 +1,4 @@ -<!-- $Id: dma.sgml,v 1.1.2.3 1996/01/31 14:32:16 mpp Exp $ --> +<!-- $Id: dma.sgml,v 1.1.2.4 1996/06/19 20:27:38 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/eresources.sgml b/share/doc/handbook/eresources.sgml index ecad83d80b43f..50ff84f04e5d1 100644 --- a/share/doc/handbook/eresources.sgml +++ b/share/doc/handbook/eresources.sgml @@ -1,4 +1,4 @@ -<!-- $Id: eresources.sgml,v 1.2.4.5 1996/06/19 20:27:40 jkh Exp $ --> +<!-- $Id: eresources.sgml,v 1.2.4.6 1996/07/12 16:33:22 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt> diff --git a/share/doc/handbook/esdi.sgml b/share/doc/handbook/esdi.sgml index aeca3409b4919..afeed7cbfe22d 100644 --- a/share/doc/handbook/esdi.sgml +++ b/share/doc/handbook/esdi.sgml @@ -1,4 +1,4 @@ -<!-- $Id: esdi.sgml,v 1.2.2.1 1996/01/31 14:32:18 mpp Exp $ --> +<!-- $Id: esdi.sgml,v 1.2.2.2 1996/06/19 20:27:42 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/firewalls.sgml b/share/doc/handbook/firewalls.sgml index a66a2df05b911..0f68ff1e79bca 100644 --- a/share/doc/handbook/firewalls.sgml +++ b/share/doc/handbook/firewalls.sgml @@ -1,4 +1,4 @@ -<!-- $Id: firewalls.sgml,v 1.1.2.5 1996/06/30 02:59:16 alex Exp $ --> +<!-- $Id: firewalls.sgml,v 1.1.2.6 1996/07/05 11:30:16 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>Firewalls<label id="firewalls"></heading> diff --git a/share/doc/handbook/glossary.sgml b/share/doc/handbook/glossary.sgml index 99c1a205d40d5..ad18d17426f16 100644 --- a/share/doc/handbook/glossary.sgml +++ b/share/doc/handbook/glossary.sgml @@ -1,4 +1,4 @@ -<!-- $Id: glossary.sgml,v 1.3 1995/06/30 17:37:37 jfieber Exp $ --> +<!-- $Id: glossary.sgml,v 1.1.1.1.4.2 1995/10/12 03:15:57 jfieber Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>* Glossary<label id="glossary"></heading> diff --git a/share/doc/handbook/goals.sgml b/share/doc/handbook/goals.sgml index 24c145fc9f493..c0bfc68c6aaa7 100644 --- a/share/doc/handbook/goals.sgml +++ b/share/doc/handbook/goals.sgml @@ -1,4 +1,4 @@ -<!-- $Id: goals.sgml,v 1.1 1995/12/07 13:22:13 jkh Exp $ --> +<!-- $Id: goals.sgml,v 1.1.2.1 1996/07/16 16:01:33 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>FreeBSD Project goals<label id="goals"></heading> diff --git a/share/doc/handbook/handbook.sgml b/share/doc/handbook/handbook.sgml index 5eccbd0db8c0a..4313db9dc78bf 100644 --- a/share/doc/handbook/handbook.sgml +++ b/share/doc/handbook/handbook.sgml @@ -1,4 +1,4 @@ -<!-- $Id: handbook.sgml,v 1.7.4.8 1996/07/03 01:39:24 jkh Exp $ --> +<!-- $Id: handbook.sgml,v 1.7.4.9 1996/07/07 23:26:43 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [ diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml index 8c99c361cd873..aa59566788462 100644 --- a/share/doc/handbook/history.sgml +++ b/share/doc/handbook/history.sgml @@ -1,4 +1,4 @@ -<!-- $Id: history.sgml,v 1.1.4.5 1995/11/15 07:50:30 jkh Exp $ --> +<!-- $Id: history.sgml,v 1.1.4.6 1996/06/19 20:27:47 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>A brief history of FreeBSD<label id="history"></heading> diff --git a/share/doc/handbook/hw.sgml b/share/doc/handbook/hw.sgml index fd89d4a64e18d..bb9aa57d43e2a 100644 --- a/share/doc/handbook/hw.sgml +++ b/share/doc/handbook/hw.sgml @@ -1,4 +1,4 @@ -<!-- $Id: hw.sgml,v 1.6.2.5 1996/07/12 16:33:23 jkh Exp $ --> +<!-- $Id: hw.sgml,v 1.6.2.6 1996/07/16 16:01:34 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/install.sgml b/share/doc/handbook/install.sgml index c01041b9ce03c..6da659e3d6cec 100644 --- a/share/doc/handbook/install.sgml +++ b/share/doc/handbook/install.sgml @@ -1,4 +1,4 @@ -<!-- $Id: install.sgml,v 1.9.2.7 1996/06/19 20:27:52 jkh Exp $ --> +<!-- $Id: install.sgml,v 1.9.2.8 1996/07/01 16:35:55 bde Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/isdn.sgml b/share/doc/handbook/isdn.sgml index 0b5a502d2e8b0..b8aeba7bdb1a4 100644 --- a/share/doc/handbook/isdn.sgml +++ b/share/doc/handbook/isdn.sgml @@ -1,4 +1,4 @@ -<!-- $Id: isdn.sgml,v 1.1.2.1 1996/07/05 11:30:18 jkh Exp $ --> +<!-- $Id: isdn.sgml,v 1.1.2.2 1996/07/07 23:26:44 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>ISDN<label id="isdn"></heading> diff --git a/share/doc/handbook/kerberos.sgml b/share/doc/handbook/kerberos.sgml index ce20d3581ffba..df1044e79953a 100644 --- a/share/doc/handbook/kerberos.sgml +++ b/share/doc/handbook/kerberos.sgml @@ -1,4 +1,4 @@ -<!-- $Id: kerberos.sgml,v 1.2.4.2 1995/10/12 03:16:05 jfieber Exp $ --> +<!-- $Id: kerberos.sgml,v 1.2.4.3 1996/06/19 20:27:55 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>Kerberos<label id="kerberos"></heading> diff --git a/share/doc/handbook/kernelconfig.sgml b/share/doc/handbook/kernelconfig.sgml index 465681b4888b2..5adee8544f7fa 100644 --- a/share/doc/handbook/kernelconfig.sgml +++ b/share/doc/handbook/kernelconfig.sgml @@ -1,4 +1,4 @@ -<!-- $Id: kernelconfig.sgml,v 1.1.2.2 1996/01/31 14:32:22 mpp Exp $ --> +<!-- $Id: kernelconfig.sgml,v 1.1.2.3 1996/06/19 20:27:58 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> --> <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading> diff --git a/share/doc/handbook/kerneldebug.sgml b/share/doc/handbook/kerneldebug.sgml index 04ff59eea3568..bb7d8b43e3217 100644 --- a/share/doc/handbook/kerneldebug.sgml +++ b/share/doc/handbook/kerneldebug.sgml @@ -1,4 +1,4 @@ -<!-- $Id: kerneldebug.sgml,v 1.3.2.3 1996/01/31 14:32:23 mpp Exp $ --> +<!-- $Id: kerneldebug.sgml,v 1.3.2.4 1996/06/19 20:28:00 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Kernel Debugging<label id="kerneldebug"></heading> diff --git a/share/doc/handbook/linuxemu.sgml b/share/doc/handbook/linuxemu.sgml index 5652380596fd5..97c64a63178fc 100644 --- a/share/doc/handbook/linuxemu.sgml +++ b/share/doc/handbook/linuxemu.sgml @@ -1,4 +1,4 @@ -<!-- $Id: linuxemu.sgml,v 1.7 1996/05/21 04:06:00 jkh Exp $ --> +<!-- $Id: linuxemu.sgml,v 1.8 1996/05/24 19:33:32 jfieber Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Linux Emulation<label id="linuxemu"></heading> diff --git a/share/doc/handbook/lists.sgml b/share/doc/handbook/lists.sgml index 37b6434a6cd42..be98fba11a668 100644 --- a/share/doc/handbook/lists.sgml +++ b/share/doc/handbook/lists.sgml @@ -1,4 +1,4 @@ -<!-- $Id: lists.sgml,v 1.1 1996/05/16 23:18:06 mpp Exp $ --> +<!-- $Id: lists.sgml,v 1.1.2.1 1996/07/05 11:30:20 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/memoryuse.sgml b/share/doc/handbook/memoryuse.sgml index 367d006158a06..f0ba3d121ed60 100644 --- a/share/doc/handbook/memoryuse.sgml +++ b/share/doc/handbook/memoryuse.sgml @@ -1,4 +1,4 @@ -<!-- $Id: memoryuse.sgml,v 1.1.4.3 1995/10/22 00:50:32 jfieber Exp $ --> +<!-- $Id: memoryuse.sgml,v 1.1.4.4 1996/06/19 20:28:01 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>PC memory utilization<label id="memoryuse"></heading> diff --git a/share/doc/handbook/mirrors.sgml b/share/doc/handbook/mirrors.sgml index df898a3bd8994..91ab9630d2a72 100644 --- a/share/doc/handbook/mirrors.sgml +++ b/share/doc/handbook/mirrors.sgml @@ -1,4 +1,4 @@ -<!-- $Id: mirrors.sgml,v 1.1.2.6 1996/06/19 20:28:04 jkh Exp $ --> +<!-- $Id: mirrors.sgml,v 1.1.2.7 1996/07/03 01:39:25 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/nfs.sgml b/share/doc/handbook/nfs.sgml index b45bb8a622501..b33423460773b 100644 --- a/share/doc/handbook/nfs.sgml +++ b/share/doc/handbook/nfs.sgml @@ -1,4 +1,4 @@ -<!-- $Id: nfs.sgml,v 1.1.1.1.4.2 1995/10/12 03:16:20 jfieber Exp $ --> +<!-- $Id: nfs.sgml,v 1.1.1.1.4.3 1996/06/19 20:28:06 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>NFS<label id="nfs"></heading> diff --git a/share/doc/handbook/nutshell.sgml b/share/doc/handbook/nutshell.sgml index 0037f9327e6aa..4f24b916c75c0 100644 --- a/share/doc/handbook/nutshell.sgml +++ b/share/doc/handbook/nutshell.sgml @@ -1,4 +1,4 @@ -<!-- $Id: nutshell.sgml,v 1.1.4.3 1996/01/31 14:32:24 mpp Exp $ --> +<!-- $Id: nutshell.sgml,v 1.1.4.4 1996/06/19 20:28:07 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>FreeBSD in a nutshell<label id="nutshell"></heading> diff --git a/share/doc/handbook/pgpkeys.sgml b/share/doc/handbook/pgpkeys.sgml index faf08a0c98ba4..759485fe6307e 100644 --- a/share/doc/handbook/pgpkeys.sgml +++ b/share/doc/handbook/pgpkeys.sgml @@ -1,4 +1,4 @@ -<!-- $Id: pgpkeys.sgml,v 1.6.2.1 1996/06/26 09:24:00 jkh Exp $ --> +<!-- $Id: pgpkeys.sgml,v 1.6.2.2 1996/07/03 01:39:26 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>PGP keys<label id="pgpkeys"></heading> diff --git a/share/doc/handbook/policies.sgml b/share/doc/handbook/policies.sgml index 86a505cf0dd44..5c31757192a62 100644 --- a/share/doc/handbook/policies.sgml +++ b/share/doc/handbook/policies.sgml @@ -1,4 +1,4 @@ -<!-- $Id: policies.sgml,v 1.1 1996/06/30 18:01:25 phk Exp $ --> +<!-- $Id: policies.sgml,v 1.1.2.1 1996/07/05 11:30:21 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Source Tree Guidelines and Policies diff --git a/share/doc/handbook/porting.sgml b/share/doc/handbook/porting.sgml index b96271b410df9..576916cf107eb 100644 --- a/share/doc/handbook/porting.sgml +++ b/share/doc/handbook/porting.sgml @@ -1,4 +1,4 @@ -<!-- $Id: porting.sgml,v 1.21 1996/05/24 19:33:33 jfieber Exp $ --> +<!-- $Id: porting.sgml,v 1.2.4.5 1996/06/19 20:28:08 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect1><heading>Porting an existing piece of free software<label id="porting"></heading> @@ -156,7 +156,7 @@ The pattern is the year followed by the month. # Date created: 5 December 1994 # Whom: asami # - # $Id: porting.sgml,v 1.21 1996/05/24 19:33:33 jfieber Exp $ + # $Id: porting.sgml,v 1.2.4.5 1996/06/19 20:28:08 jkh Exp $ # DISTNAME= oneko-1.1b @@ -976,7 +976,7 @@ lib/libtcl.so.7.3 person who wrote this Makefile] # Whom: Satoshi Asami <asami@FreeBSD.ORG> # - # $Id: porting.sgml,v 1.21 1996/05/24 19:33:33 jfieber Exp $ + # $Id: porting.sgml,v 1.2.4.5 1996/06/19 20:28:08 jkh Exp $ [ ^^^^ do not worry about this...it will be automatically filled in by CVS when it is committed to our repository] # diff --git a/share/doc/handbook/ports.sgml b/share/doc/handbook/ports.sgml index db5280602e675..9217c87673778 100644 --- a/share/doc/handbook/ports.sgml +++ b/share/doc/handbook/ports.sgml @@ -1,4 +1,4 @@ -<!-- $Id: ports.sgml,v 1.2.4.3 1996/06/19 20:28:09 jkh Exp $ --> +<!-- $Id: ports.sgml,v 1.2.4.4 1996/06/26 09:24:01 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>The Ports collection<label id="ports"></heading> diff --git a/share/doc/handbook/ppp.sgml b/share/doc/handbook/ppp.sgml index ae5dd7ec74ec5..8e87bc26c33ac 100644 --- a/share/doc/handbook/ppp.sgml +++ b/share/doc/handbook/ppp.sgml @@ -1,4 +1,4 @@ -<!-- $Id: ppp.sgml,v 1.1.1.1.4.2 1995/10/12 03:16:29 jfieber Exp $ --> +<!-- $Id: ppp.sgml,v 1.1.1.1.4.3 1996/06/19 20:28:10 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>Setting up kernel PPP<label id="ppp"></heading> diff --git a/share/doc/handbook/printing.sgml b/share/doc/handbook/printing.sgml index 77d73bd1eda6f..6de985b57b3b4 100644 --- a/share/doc/handbook/printing.sgml +++ b/share/doc/handbook/printing.sgml @@ -1,7 +1,7 @@ <!-- This is an SGML document in the linuxdoc DTD describing Printing with FreeBSD. By Sean Kelly, 1995. - $Id: printing.sgml,v 1.2.2.2 1996/06/19 20:28:12 jkh Exp $ + $Id: printing.sgml,v 1.2.2.3 1996/07/03 01:39:27 jkh Exp $ The FreeBSD Documentation Project diff --git a/share/doc/handbook/quotas.sgml b/share/doc/handbook/quotas.sgml index 6a6225006d122..0faa4767e5d0c 100644 --- a/share/doc/handbook/quotas.sgml +++ b/share/doc/handbook/quotas.sgml @@ -1,7 +1,7 @@ <!-- This is an SGML document in the linuxdoc DTD describing disk quotas under FreeBSD. By Mike Pritchard, 1996. - $Id: quotas.sgml,v 1.2 1996/03/31 21:17:17 mpp Exp $ + $Id: quotas.sgml,v 1.3 1996/05/15 19:40:57 mpp Exp $ The FreeBSD Documentation Project diff --git a/share/doc/handbook/relnotes.sgml b/share/doc/handbook/relnotes.sgml index 2823c440909d6..45d7fec9ed918 100644 --- a/share/doc/handbook/relnotes.sgml +++ b/share/doc/handbook/relnotes.sgml @@ -1,4 +1,4 @@ -<!-- $Id: relnotes.sgml,v 1.4.2.5 1996/01/31 14:32:28 mpp Exp $ --> +<!-- $Id: relnotes.sgml,v 1.4.2.6 1996/06/19 20:28:14 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/routing.sgml b/share/doc/handbook/routing.sgml index 6dd8b850e0388..78fae674a4ef6 100644 --- a/share/doc/handbook/routing.sgml +++ b/share/doc/handbook/routing.sgml @@ -1,4 +1,4 @@ -<!-- $Id: routing.sgml,v 1.1.2.1 1996/01/31 14:32:28 mpp Exp $ --> +<!-- $Id: routing.sgml,v 1.1.2.2 1996/06/19 20:28:16 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> --> diff --git a/share/doc/handbook/scsi.sgml b/share/doc/handbook/scsi.sgml index 815fa8caac081..75317e09e5957 100644 --- a/share/doc/handbook/scsi.sgml +++ b/share/doc/handbook/scsi.sgml @@ -1,4 +1,4 @@ -<!-- $Id: scsi.sgml,v 1.1.1.1.4.5 1996/06/19 20:28:17 jkh Exp $ --> +<!-- $Id: scsi.sgml,v 1.1.1.1.4.6 1996/07/07 23:26:45 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/sections.sgml b/share/doc/handbook/sections.sgml index dfda4f4c81298..2707550d32658 100644 --- a/share/doc/handbook/sections.sgml +++ b/share/doc/handbook/sections.sgml @@ -1,4 +1,4 @@ -<!-- $Id: sections.sgml,v 1.1.2.3 1996/06/19 20:28:18 jkh Exp $ --> +<!-- $Id: sections.sgml,v 1.1.2.4 1996/07/03 01:39:28 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- Entities containing all the pieces of the handbook are --> diff --git a/share/doc/handbook/sio.sgml b/share/doc/handbook/sio.sgml index 95b2c483c8118..ffae3fcc6fa92 100644 --- a/share/doc/handbook/sio.sgml +++ b/share/doc/handbook/sio.sgml @@ -1,4 +1,4 @@ -<!-- $Id: sio.sgml,v 1.1 1996/02/16 13:28:21 jkh Exp $ --> +<!-- $Id: sio.sgml,v 1.2 1996/03/26 23:22:03 mpp Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/skey.sgml b/share/doc/handbook/skey.sgml index 4163dbc1cb9a5..2367ed922d50c 100644 --- a/share/doc/handbook/skey.sgml +++ b/share/doc/handbook/skey.sgml @@ -1,4 +1,4 @@ -<!-- $Id: skey.sgml,v 1.3.2.1 1996/01/31 14:32:30 mpp Exp $ --> +<!-- $Id: skey.sgml,v 1.3.2.2 1996/06/19 20:28:19 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- Copyright 1995 Massachusetts Institute of Technology diff --git a/share/doc/handbook/slipc.sgml b/share/doc/handbook/slipc.sgml index 2222bd6c95b5a..951fbfe0b0866 100644 --- a/share/doc/handbook/slipc.sgml +++ b/share/doc/handbook/slipc.sgml @@ -1,4 +1,4 @@ -<!-- $Id: slipc.sgml,v 1.1.1.1.4.3 1995/10/12 03:16:35 jfieber Exp $ --> +<!-- $Id: slipc.sgml,v 1.1.1.1.4.4 1996/06/19 20:28:20 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect><heading>Setting up a SLIP client<label id="slipc"></heading> diff --git a/share/doc/handbook/stable.sgml b/share/doc/handbook/stable.sgml index 6110c35ba07e1..43e77fc6abb3c 100644 --- a/share/doc/handbook/stable.sgml +++ b/share/doc/handbook/stable.sgml @@ -1,4 +1,4 @@ -<!-- $Id: stable.sgml,v 1.2.2.1 1996/07/05 11:30:22 jkh Exp $ --> +<!-- $Id: stable.sgml,v 1.2.2.2 1996/07/12 16:33:24 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> @@ -10,7 +10,7 @@ THE FREEBSD STABLE POLICY -Last updated: $Date: 1996/07/05 11:30:22 $ +Last updated: $Date: 1996/07/12 16:33:24 $ This document attempts to explain the rationale behind FreeBSD-stable, what you should expect should you decide to run it, diff --git a/share/doc/handbook/submitters.sgml b/share/doc/handbook/submitters.sgml index 5ecec1b44375c..f45c6e34d8295 100644 --- a/share/doc/handbook/submitters.sgml +++ b/share/doc/handbook/submitters.sgml @@ -1,4 +1,4 @@ -<!-- $Id: submitters.sgml,v 1.2.4.4 1996/07/12 16:33:27 jkh Exp $ --> +<!-- $Id: submitters.sgml,v 1.2.4.5 1996/07/16 16:01:35 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Contributing to FreeBSD<label id="submitters"></heading> @@ -401,7 +401,7 @@ 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. - $Id: submitters.sgml,v 1.2.4.4 1996/07/12 16:33:27 jkh Exp $ + $Id: submitters.sgml,v 1.2.4.5 1996/07/16 16:01:35 jkh Exp $ </verb></tscreen> For your convenience, a copy of this text can be found in <tt>/usr/share/examples/etc/bsd-style-copyright</tt>. diff --git a/share/doc/handbook/sup.sgml b/share/doc/handbook/sup.sgml index c7387ad8bc625..b13383ba6ca11 100644 --- a/share/doc/handbook/sup.sgml +++ b/share/doc/handbook/sup.sgml @@ -1,4 +1,4 @@ -<!-- $Id: sup.sgml,v 1.2.4.4 1996/06/19 20:28:26 jkh Exp $ --> +<!-- $Id: sup.sgml,v 1.2.4.5 1996/07/05 11:30:22 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> diff --git a/share/doc/handbook/synching.sgml b/share/doc/handbook/synching.sgml index 68a7ad497761c..a336722c0318a 100644 --- a/share/doc/handbook/synching.sgml +++ b/share/doc/handbook/synching.sgml @@ -1,4 +1,4 @@ -<!-- $Id: current.sgml,v 1.8 1996/01/31 14:26:01 mpp Exp $ --> +<!-- $Id: synching.sgml,v 1.1 1996/02/11 00:16:20 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Synchronizing source trees over the Internet<label id="synching"></heading> @@ -7,7 +7,7 @@ <!-- -Last updated: $Date: 1996/01/31 14:26:01 $ +Last updated: $Date: 1996/02/11 00:16:20 $ This document tries to describe the various ways in which a user may use the internet to keep development sources in synch. diff --git a/share/doc/handbook/troubleshooting.sgml b/share/doc/handbook/troubleshooting.sgml index 042e0972fd4b3..553c273275d97 100644 --- a/share/doc/handbook/troubleshooting.sgml +++ b/share/doc/handbook/troubleshooting.sgml @@ -1,4 +1,4 @@ -<!-- $Id: troubleshooting.sgml,v 1.1.1.1.4.2 1995/10/12 03:16:40 jfieber Exp $ --> +<!-- $Id: troubleshooting.sgml,v 1.1.1.1.4.3 1996/06/19 20:28:28 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <chapt><heading>Troubleshooting<label id="troubleshooting"></heading> diff --git a/share/doc/handbook/uart.sgml b/share/doc/handbook/uart.sgml index 74ce20ba379f5..3fa3969ddd2fe 100644 --- a/share/doc/handbook/uart.sgml +++ b/share/doc/handbook/uart.sgml @@ -1,4 +1,4 @@ -<!-- $Id: uart.sgml,v 1.1 1996/02/16 13:28:22 jkh Exp $ --> +<!-- $Id: uart.sgml,v 1.2 1996/02/27 15:57:51 jfieber Exp $ --> <!-- The FreeBSD Documentation Project --> <!-- diff --git a/share/doc/handbook/userppp.sgml b/share/doc/handbook/userppp.sgml index cc97f63419e5a..ec2c659181dfb 100644 --- a/share/doc/handbook/userppp.sgml +++ b/share/doc/handbook/userppp.sgml @@ -1,4 +1,4 @@ -<!-- $Id: userppp.sgml,v 1.3.2.1 1996/01/31 14:32:32 mpp Exp $ --> +<!-- $Id: userppp.sgml,v 1.3.2.2 1996/06/19 20:28:30 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect>Setting up user PPP<label id="userppp"> diff --git a/share/doc/iso/ucb/program.nr b/share/doc/iso/ucb/program.nr index a4fe690f81879..a7993745003d4 100644 --- a/share/doc/iso/ucb/program.nr +++ b/share/doc/iso/ucb/program.nr @@ -1,5 +1,5 @@ -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/ucb/program.nr,v 1.1.1.1 1994/05/30 19:08:12 rgrimes Exp $ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/ucb/program.nr,v $ +.\"$Header: /home/ncvs/src/share/doc/iso/ucb/program.nr,v 1.1.1.1.6.1 1996/06/05 02:53:28 jkh Exp $ +.\"$Source: /home/ncvs/src/share/doc/iso/ucb/program.nr,v $ .\" .\" .\" FONT CONVENTIONS diff --git a/share/doc/iso/wisc/appendix_a.nr b/share/doc/iso/wisc/appendix_a.nr index 7f26a82d8ae50..6a5b6dbed5e9c 100644 --- a/share/doc/iso/wisc/appendix_a.nr +++ b/share/doc/iso/wisc/appendix_a.nr @@ -1,4 +1,4 @@ -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/appendix_a.nr,v 1.1.1.1 1994/05/30 19:08:06 rgrimes Exp $ +.\" $Header: /home/ncvs/src/share/doc/iso/wisc/appendix_a.nr,v 1.1.1.1.6.1 1996/06/05 02:53:30 jkh Exp $ .(x Appendix A .)x diff --git a/share/doc/iso/wisc/appendix_b.nr b/share/doc/iso/wisc/appendix_b.nr index 2350d8c59b379..b000b29906810 100644 --- a/share/doc/iso/wisc/appendix_b.nr +++ b/share/doc/iso/wisc/appendix_b.nr @@ -1,4 +1,4 @@ -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/appendix_b.nr,v 1.1.1.1 1994/05/30 19:08:06 rgrimes Exp $ +.\" $Header: /home/ncvs/src/share/doc/iso/wisc/appendix_b.nr,v 1.1.1.1.6.1 1996/06/05 02:53:31 jkh Exp $ .(x Appendix B .)x diff --git a/share/doc/iso/wisc/debug.nr b/share/doc/iso/wisc/debug.nr index 61776f65ad7e4..444f90ea0f06f 100644 --- a/share/doc/iso/wisc/debug.nr +++ b/share/doc/iso/wisc/debug.nr @@ -1,5 +1,5 @@ -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/debug.nr,v 1.1.1.1 1994/05/30 19:08:05 rgrimes Exp $ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/debug.nr,v $ +.\"$Header: /home/ncvs/src/share/doc/iso/wisc/debug.nr,v 1.1.1.1.6.1 1996/06/05 02:53:31 jkh Exp $ +.\"$Source: /home/ncvs/src/share/doc/iso/wisc/debug.nr,v $ .\" .\" Program names should be in italics .\" diff --git a/share/doc/iso/wisc/errors.nr b/share/doc/iso/wisc/errors.nr index 5955760222cb7..fb3dccd5b6526 100644 --- a/share/doc/iso/wisc/errors.nr +++ b/share/doc/iso/wisc/errors.nr @@ -1,5 +1,5 @@ -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/errors.nr,v 1.1.1.1 1994/05/30 19:08:05 rgrimes Exp $ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/errors.nr,v $ +.\"$Header: /home/ncvs/src/share/doc/iso/wisc/errors.nr,v 1.1.1.1.6.1 1996/06/05 02:53:32 jkh Exp $ +.\"$Source: /home/ncvs/src/share/doc/iso/wisc/errors.nr,v $ .NC "Error Handling" This section describes the various ways that the ARGO kernel handles errors. diff --git a/share/doc/iso/wisc/figs/Makefile b/share/doc/iso/wisc/figs/Makefile index 2562b0b3e63ed..451b6787590ee 100644 --- a/share/doc/iso/wisc/figs/Makefile +++ b/share/doc/iso/wisc/figs/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1.6.1 1996/07/07 23:26:49 jkh Exp $ # .SUFFIXES: .nr .grn diff --git a/share/doc/iso/wisc/parts.nr b/share/doc/iso/wisc/parts.nr index fda5c4ce86b62..1f0c04085bb89 100644 --- a/share/doc/iso/wisc/parts.nr +++ b/share/doc/iso/wisc/parts.nr @@ -1,5 +1,5 @@ -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/parts.nr,v 1.1.1.1 1994/05/30 19:08:06 rgrimes Exp $ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/parts.nr,v $ +.\"$Header: /home/ncvs/src/share/doc/iso/wisc/parts.nr,v 1.1.1.1.6.1 1996/06/05 02:53:33 jkh Exp $ +.\"$Source: /home/ncvs/src/share/doc/iso/wisc/parts.nr,v $ .\" .\" .\" LOOK FOR ALL CASES OF 'writing' (as in, "at this writing") diff --git a/share/doc/iso/wisc/program.nr b/share/doc/iso/wisc/program.nr index 6e29668233631..8d6898d4ab294 100644 --- a/share/doc/iso/wisc/program.nr +++ b/share/doc/iso/wisc/program.nr @@ -1,5 +1,5 @@ -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/program.nr,v 1.1.1.1 1994/05/30 19:08:06 rgrimes Exp $ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wisc/program.nr,v $ +.\"$Header: /home/ncvs/src/share/doc/iso/wisc/program.nr,v 1.1.1.1.6.1 1996/06/05 02:53:34 jkh Exp $ +.\"$Source: /home/ncvs/src/share/doc/iso/wisc/program.nr,v $ .\" .\" .\" FONT CONVENTIONS diff --git a/share/doc/iso/wiscman/cons.4 b/share/doc/iso/wiscman/cons.4 index 39f50e3ea3394..b10da1d0c412c 100644 --- a/share/doc/iso/wiscman/cons.4 +++ b/share/doc/iso/wiscman/cons.4 @@ -3,9 +3,9 @@ .\" LICENSED MATERIALS - PROPERTY OF IBM .\" REFER TO COPYRIGHT INSTRUCTIONS FORM NUMBER G120-2083 .\" -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/cons.4,v 1.1.1.1 1994/05/30 19:08:11 rgrimes Exp $ +.\"$Header: /home/ncvs/src/share/doc/iso/wiscman/cons.4,v 1.1.1.1.6.1 1996/06/05 02:53:36 jkh Exp $ .\"$ACIS:cons.4_ca 11.3$ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/cons.4,v $ +.\"$Source: /home/ncvs/src/share/doc/iso/wiscman/cons.4,v $ .\" This file uses -man macros. .TH CONS 4 "Sept 1988" "Space overwritten by .AC macro" " " .AC 1 0 diff --git a/share/doc/iso/wiscman/if.4n b/share/doc/iso/wiscman/if.4n index 21286060b074f..032e95b711de3 100644 --- a/share/doc/iso/wiscman/if.4n +++ b/share/doc/iso/wiscman/if.4n @@ -3,9 +3,9 @@ # LICENSED MATERIALS - PROPERTY OF IBM # REFER TO COPYRIGHT INSTRUCTIONS FORM NUMBER G120-2083 # -.\"# $Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/if.4n,v 1.1.1.1 1994/05/30 19:08:12 rgrimes Exp $ +.\"# $Header: /home/ncvs/src/share/doc/iso/wiscman/if.4n,v 1.1.1.1.6.1 1996/06/05 02:53:37 jkh Exp $ .\"# $ACIS:if.4n_ca 1.5$ -.\"# $Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/if.4n,v $ +.\"# $Source: /home/ncvs/src/share/doc/iso/wiscman/if.4n,v $ .\" @(#)if.4n 1.2 87/08/23 3.2/4.3NFSSRC .\" @(#)if.4n 1.2 87/02/10 NFSSRC .\" @(#)if.4n 1.1 86/09/25 SMI; diff --git a/share/doc/iso/wiscman/rvd.4p b/share/doc/iso/wiscman/rvd.4p index 13cff8ded7e59..8d64a269e03b8 100644 --- a/share/doc/iso/wiscman/rvd.4p +++ b/share/doc/iso/wiscman/rvd.4p @@ -3,9 +3,9 @@ .\" LICENSED MATERIALS - PROPERTY OF IBM .\" REFER TO COPYRIGHT INSTRUCTIONS FORM NUMBER G120-2083 .\" -.\"$Header: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/rvd.4p,v 1.1.1.1 1994/05/30 19:08:12 rgrimes Exp $ +.\"$Header: /home/ncvs/src/share/doc/iso/wiscman/rvd.4p,v 1.1.1.1.6.1 1996/06/05 02:53:37 jkh Exp $ .\"$ACIS:rvd.4p_ca 11.0$ -.\"$Source: /pub/FreeBSD/FreeBSD-CVS/src/share/doc/iso/wiscman/rvd.4p,v $ +.\"$Source: /home/ncvs/src/share/doc/iso/wiscman/rvd.4p,v $ .\"This file contains -man macros. .TH RVD 4P "July 1987" "Space overwritten by .AC macro" " " .AC 1 0 diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile index cd1088603ca89..e3fd6961d7445 100644 --- a/share/doc/papers/Makefile +++ b/share/doc/papers/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/01/11 04:09:56 wollman Exp $ +# $Id: Makefile,v 1.2 1995/01/11 19:51:41 wollman Exp $ SUBDIR= beyond4.3 diskperf fsinterface kernmalloc kerntune memfs \ newvm nqnfs px relengr sysperf diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile index 7f9858ebcfbfc..6c3db75ed55bb 100644 --- a/share/doc/papers/beyond4.3/Makefile +++ b/share/doc/papers/beyond4.3/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.2 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.4 1995/01/11 04:10:00 wollman Exp $ VOLUME= papers SRCS= beyond43.ms diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile index c42675f97087e..b36317c3faa8c 100644 --- a/share/doc/papers/contents/Makefile +++ b/share/doc/papers/contents/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/01/11 00:15:20 wollman Exp $ +# $Id: Makefile,v 1.1 1996/04/19 21:26:26 wosch Exp $ VOLUME= papers DOC= CONTENTS diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms index 8da576bc58e01..c42c7fb38aa28 100644 --- a/share/doc/papers/contents/contents.ms +++ b/share/doc/papers/contents/contents.ms @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: $ +.\" $Id: contents.ms,v 1.1 1996/04/19 21:26:27 wosch Exp $ .\" .OH '''Papers Contents' .EH 'Papers Contents''' diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile index 1b9ccd32348d0..22dc271b35bd7 100644 --- a/share/doc/papers/diskperf/Makefile +++ b/share/doc/papers/diskperf/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 6.3 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:01 wollman Exp $ VOLUME= papers DOC= diskperf diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile index 3eccadd88ab8a..7017442b81f35 100644 --- a/share/doc/papers/fsinterface/Makefile +++ b/share/doc/papers/fsinterface/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.3 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.3 1995/01/11 04:10:02 wollman Exp $ VOLUME= papers DOC= fsinterface diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile index 7c97c8224a0a4..2d3f4ea1063d5 100644 --- a/share/doc/papers/kernmalloc/Makefile +++ b/share/doc/papers/kernmalloc/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.8 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:03 wollman Exp $ VOLUME= papers DOC= kernmalloc diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile index 605d782e7eb58..f6b347e0f114c 100644 --- a/share/doc/papers/kerntune/Makefile +++ b/share/doc/papers/kerntune/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.5 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:04 wollman Exp $ VOLUME= papers DOC= kerntune diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile index 033b7703641e7..6b720dccae219 100644 --- a/share/doc/papers/memfs/Makefile +++ b/share/doc/papers/memfs/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.8 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.2 1995/01/11 04:10:05 wollman Exp $ +# $Id: Makefile,v 1.3 1995/01/22 16:49:22 bde Exp $ VOLUME= papers DOC= memfs diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile index 2bddf9d415f3a..dde2f2610ac7a 100644 --- a/share/doc/papers/newvm/Makefile +++ b/share/doc/papers/newvm/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.4 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:05 wollman Exp $ VOLUME= papers DOC= newvm diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile index 316cdd79fc004..ebd726a7f660f 100644 --- a/share/doc/papers/nqnfs/Makefile +++ b/share/doc/papers/nqnfs/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 4/20/94 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:06 wollman Exp $ VOLUME= papers DOC= nqnfs diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile index f7282e5d3370a..fb15007bc5c62 100644 --- a/share/doc/papers/px/Makefile +++ b/share/doc/papers/px/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.3 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:07 wollman Exp $ VOLUME= papers DOC= px diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile index da1b8bf660020..90ba1cdb195b8 100644 --- a/share/doc/papers/relengr/Makefile +++ b/share/doc/papers/relengr/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.6 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.3 1995/01/11 04:10:09 wollman Exp $ VOLUME= papers DOC= releng diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile index ae567bce547e6..0d146c1ede037 100644 --- a/share/doc/papers/sysperf/Makefile +++ b/share/doc/papers/sysperf/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 1.6 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 04:10:10 wollman Exp $ VOLUME= papers DOC= sysperf diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile index 6881a28cf71e3..ad2c6965f5ca4 100644 --- a/share/doc/psd/05.sysman/Makefile +++ b/share/doc/psd/05.sysman/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 01:51:59 wollman Exp $ VOLUME= psd/05.sysman SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \ diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile index 0fad5f7396e16..e02451e7b4b85 100644 --- a/share/doc/psd/12.make/Makefile +++ b/share/doc/psd/12.make/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:00 wollman Exp $ VOLUME= psd/12.make SRCS= tutorial.ms diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile index 942c411bd33db..91b16e083e03f 100644 --- a/share/doc/psd/18.gprof/Makefile +++ b/share/doc/psd/18.gprof/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:01 wollman Exp $ VOLUME= psd/18.gprof SRCS= header.me abstract.me intro.me profiling.me gathering.me \ diff --git a/share/doc/psd/19.curses/Makefile b/share/doc/psd/19.curses/Makefile index ce71b294f1893..abfbc43b7dad0 100644 --- a/share/doc/psd/19.curses/Makefile +++ b/share/doc/psd/19.curses/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id: Makefile,v 1.1 1995/01/11 01:52:02 wollman Exp $ +# $Id: Makefile,v 1.2 1995/02/08 21:27:09 bde Exp $ VOLUME= psd/19.curses SRCS= Master diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile index 2c8befd5e684d..9cc8bc8a28172 100644 --- a/share/doc/psd/20.ipctut/Makefile +++ b/share/doc/psd/20.ipctut/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 01:52:03 wollman Exp $ VOLUME= psd/20.ipctut SRCS= tutor.me diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile index c825d14f3b659..1e6b18ccc3396 100644 --- a/share/doc/psd/21.ipc/Makefile +++ b/share/doc/psd/21.ipc/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 01:52:04 wollman Exp $ VOLUME= psd/21.ipc SRCS= 0.t 1.t 2.t 3.t 4.t 5.t diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile index 6bf3fb638b599..34aadfe84f5d7 100644 --- a/share/doc/psd/22.rpcgen/Makefile +++ b/share/doc/psd/22.rpcgen/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:05 wollman Exp $ VOLUME= psd/22.rpcgen SRCS= rpcgen.ms diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile index 78a0bcea7193e..29368e48a0bb6 100644 --- a/share/doc/psd/23.rpc/Makefile +++ b/share/doc/psd/23.rpc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:06 wollman Exp $ VOLUME= psd/23.rpc SRCS= rpc.prog.ms diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile index dbff9a145e2a5..77e41b2cccc28 100644 --- a/share/doc/psd/24.xdr/Makefile +++ b/share/doc/psd/24.xdr/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:06 wollman Exp $ VOLUME= psd/24.xdr SRCS= xdr.nts.ms diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile index 28bf75670c09d..f100025340f42 100644 --- a/share/doc/psd/25.xdrrfc/Makefile +++ b/share/doc/psd/25.xdrrfc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:07 wollman Exp $ VOLUME= psd/25.xdrrfc SRCS= xdr.rfc.ms diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile index 88107dea503b1..1defdf854674b 100644 --- a/share/doc/psd/26.rpcrfc/Makefile +++ b/share/doc/psd/26.rpcrfc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:08 wollman Exp $ VOLUME= psd/26.rpcrfc SRCS= rpc.rfc.ms diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile index bcdc4274e13ef..aded8eb88f230 100644 --- a/share/doc/psd/27.nfsrpc/Makefile +++ b/share/doc/psd/27.nfsrpc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:09 wollman Exp $ VOLUME= psd/27.nfsrfc SRCS= nfs.rfc.ms diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile index 24ed9d6625811..ac19cc3517517 100644 --- a/share/doc/psd/Makefile +++ b/share/doc/psd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.8 1996/06/15 22:17:13 wosch Exp $ +# $Id: Makefile,v 1.7.4.1 1996/06/23 23:09:12 wosch Exp $ # The following modules do not build/install: # 10.gdb, 13.rcs diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile index 421308f3e4ea2..e70f7593684be 100644 --- a/share/doc/psd/contents/Makefile +++ b/share/doc/psd/contents/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:52:59 wollman Exp $ VOLUME= psd SRCS= contents.ms diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile index 9762851e7b26f..6daa57b44d4ce 100644 --- a/share/doc/psd/title/Makefile +++ b/share/doc/psd/title/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 01:53:03 wollman Exp $ VOLUME= psd SRCS= Title diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile index 0aabf0636ef13..f352a7af599c0 100644 --- a/share/doc/smm/01.setup/Makefile +++ b/share/doc/smm/01.setup/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/27/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 00:15:04 wollman Exp $ VOLUME= smm/01.setup SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile index 53ccfdb6b7c0c..990cbfed332ae 100644 --- a/share/doc/smm/02.config/Makefile +++ b/share/doc/smm/02.config/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:05 wollman Exp $ VOLUME= smm/02.config SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile index 055f7b85d80ea..8579299332cd0 100644 --- a/share/doc/smm/03.fsck/Makefile +++ b/share/doc/smm/03.fsck/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:06 wollman Exp $ VOLUME= smm/03.fsck SRCS= 0.t 1.t 2.t 3.t 4.t diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile index f97818a9d66be..70276effc478d 100644 --- a/share/doc/smm/04.quotas/Makefile +++ b/share/doc/smm/04.quotas/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 00:15:07 wollman Exp $ VOLUME= smm/04.quotas SRCS= quotas.ms diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile index cbe4794c64934..9c308f776ae89 100644 --- a/share/doc/smm/05.fastfs/Makefile +++ b/share/doc/smm/05.fastfs/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 00:15:09 wollman Exp $ VOLUME= smm/05.fastfs SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile index ff8f631a9da8b..e73c6ea332ffb 100644 --- a/share/doc/smm/06.nfs/Makefile +++ b/share/doc/smm/06.nfs/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 00:15:10 wollman Exp $ VOLUME= smm/06.nfs SRCS= 0.t 1.t 2.t ref.t diff --git a/share/doc/smm/07.lpd/Makefile b/share/doc/smm/07.lpd/Makefile index bab42d6baff01..2d440eb24cb3e 100644 --- a/share/doc/smm/07.lpd/Makefile +++ b/share/doc/smm/07.lpd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:12 wollman Exp $ VOLUME= smm/07.lpd SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile index eecdd0db509ae..910da8c91bdd0 100644 --- a/share/doc/smm/08.sendmailop/Makefile +++ b/share/doc/smm/08.sendmailop/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 2/28/94 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:14 wollman Exp $ VOLUME= smm/08.sendmailop SRCS= op.me diff --git a/share/doc/smm/09.sendmail/Makefile b/share/doc/smm/09.sendmail/Makefile index 77622cc0e8a54..e2f32508ea2b8 100644 --- a/share/doc/smm/09.sendmail/Makefile +++ b/share/doc/smm/09.sendmail/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 2/28/94 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:15 wollman Exp $ VOLUME= smm/09.sendmail SRCS= intro.me diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile index 56f510610c1ae..537bd74517e7c 100644 --- a/share/doc/smm/11.timedop/Makefile +++ b/share/doc/smm/11.timedop/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:16 wollman Exp $ VOLUME= smm/11.timedop SRCS= timed.ms diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile index 3315cabb39fae..aa536651e4a93 100644 --- a/share/doc/smm/12.timed/Makefile +++ b/share/doc/smm/12.timed/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:17 wollman Exp $ VOLUME= smm/12.timed SRCS= timed.ms diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile index a8cbbae69f285..54ec1a139256e 100644 --- a/share/doc/smm/18.net/Makefile +++ b/share/doc/smm/18.net/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $Id$ +# $Id: Makefile,v 1.3 1995/01/11 00:16:04 wollman Exp $ VOLUME= smm/18.net SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile index 9f4b0be14f771..74b699b71749e 100644 --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $Id: Makefile,v 1.2 1995/01/11 00:12:20 wollman Exp $ +# $Id: Makefile,v 1.3 1995/01/11 19:51:47 wollman Exp $ # The following modules do not describe FreeBSD: # 14.uucpimpl, 15.uucpnet diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile index 24d90896cb278..8734d81d16806 100644 --- a/share/doc/smm/contents/Makefile +++ b/share/doc/smm/contents/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:20 wollman Exp $ VOLUME= smm SRCS= contents.ms diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile index 98d12be9d03a9..1fdae6bb91a21 100644 --- a/share/doc/smm/title/Makefile +++ b/share/doc/smm/title/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 00:15:22 wollman Exp $ VOLUME= smm SRCS= Title diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile index a0715282dc6ed..772a0902303e2 100644 --- a/share/doc/usd/04.csh/Makefile +++ b/share/doc/usd/04.csh/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id: Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp $ +# $Id: Makefile,v 1.1 1995/01/11 03:24:07 wollman Exp $ VOLUME= usd/04.csh SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile index c87560bebccda..a1d6f98425ea7 100644 --- a/share/doc/usd/07.mail/Makefile +++ b/share/doc/usd/07.mail/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 03:24:08 wollman Exp $ VOLUME= usd/07.mail SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \ diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile index d1393a12d26d6..087bd5611a612 100644 --- a/share/doc/usd/10.exref/Makefile +++ b/share/doc/usd/10.exref/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.4 1995/07/30 08:04:33 bde Exp $ +# $Id: Makefile,v 1.2.4.1 1995/09/17 11:19:50 davidg Exp $ VOLUME= usd/10.exref SRCS= ex.rm diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile index f77ba6d6a4aa1..ee29a61542037 100644 --- a/share/doc/usd/11.vitut/Makefile +++ b/share/doc/usd/11.vitut/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 03:24:12 wollman Exp $ VOLUME= usd/11.edit SRCS= edittut.ms diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile index a077907981d3e..4ccac97f30bbb 100644 --- a/share/doc/usd/12.vi/Makefile +++ b/share/doc/usd/12.vi/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 8/14/93 -# $Id: Makefile,v 1.3 1995/07/30 08:04:50 bde Exp $ +# $Id: Makefile,v 1.1.4.1 1995/09/17 11:19:51 davidg Exp $ VOLUME= usd/12.vi SRCS= vi.in vi.chars diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile index e5033022289df..b376cb39a8c4b 100644 --- a/share/doc/usd/13.viref/Makefile +++ b/share/doc/usd/13.viref/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.16 (Berkeley) 8/15/94 -# $Id: Makefile,v 1.1 1995/01/11 03:24:15 wollman Exp $ +# $Id: Makefile,v 1.2 1995/05/30 06:58:01 rgrimes Exp $ VOLUME= usd/13.viref SRCS= vi.ref ${.OBJDIR}/index.so diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile index 3a5456a89776b..4e143e88f4b8c 100644 --- a/share/doc/usd/18.msdiffs/Makefile +++ b/share/doc/usd/18.msdiffs/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 03:24:16 wollman Exp $ VOLUME= usd/18.msdiffs SRCS= ms.diffs diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile index 780c2b7669eb7..1df96bd738814 100644 --- a/share/doc/usd/19.memacros/Makefile +++ b/share/doc/usd/19.memacros/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 03:24:18 wollman Exp $ VOLUME= usd/19.memacros SRCS= intro.me diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile index 8833858ff52a6..297f78efb90ed 100644 --- a/share/doc/usd/20.meref/Makefile +++ b/share/doc/usd/20.meref/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 03:24:19 wollman Exp $ VOLUME= usd/20.meref SRCS= ref.me diff --git a/share/doc/usd/30.rogue/Makefile b/share/doc/usd/30.rogue/Makefile index 55df1c8cc0310..92ea4c976f11f 100644 --- a/share/doc/usd/30.rogue/Makefile +++ b/share/doc/usd/30.rogue/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.3 1995/02/19 09:11:30 rgrimes Exp $ +# $Id: Makefile,v 1.3.4.1 1996/11/08 06:09:44 jkh Exp $ .if exists(${.CURDIR}/../../../../games) VOLUME= usd/30.rogue diff --git a/share/doc/usd/31.trek/Makefile b/share/doc/usd/31.trek/Makefile index decaf628f4aee..44f89cd3f4859 100644 --- a/share/doc/usd/31.trek/Makefile +++ b/share/doc/usd/31.trek/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.2 1995/01/14 19:56:16 jkh Exp $ +# $Id: Makefile,v 1.2.4.1 1996/11/08 13:26:32 jkh Exp $ .if exists(${.CURDIR}/../../../../games) VOLUME= usd/31.trek diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile index 3ca9ffd5d0bfe..4f8b0d1e29056 100644 --- a/share/doc/usd/Makefile +++ b/share/doc/usd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 4/20/94 -# $Id: Makefile,v 1.3 1995/01/12 20:58:10 wollman Exp $ +# $Id: Makefile,v 1.4 1995/05/30 06:57:59 rgrimes Exp $ # The following modules are encumbered: # 01.begin 02.learn 03.shell 05.dc 06.bc 09.edtut 10.edadv 15.sed 16.awk diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile index b7bc9c0cb0f0e..71b4021003428 100644 --- a/share/doc/usd/contents/Makefile +++ b/share/doc/usd/contents/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 03:24:24 wollman Exp $ VOLUME= usd SRCS= contents.ms diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile index 96df227f126b5..bb07b01316be0 100644 --- a/share/doc/usd/title/Makefile +++ b/share/doc/usd/title/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/11 03:24:28 wollman Exp $ VOLUME= usd SRCS= Title diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile index 685c2348f20e8..e9e6e1f665b11 100644 --- a/share/examples/FreeBSD_version/Makefile +++ b/share/examples/FreeBSD_version/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/08/10 06:40:35 wollman Exp $ PROG= FreeBSD_version NOMAN= diff --git a/share/examples/Makefile b/share/examples/Makefile index 9d4763ed8507f..e8a01d87abf99 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13.4.5 1996/05/04 13:57:02 jkh Exp $ +# $Id: Makefile,v 1.13.4.6 1996/09/12 17:27:05 jkh Exp $ # # Doing a make install builds /usr/share/examples diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index e15b3b7380a5d..354ed54562732 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -1,4 +1,4 @@ -$Id$ +$Id: README.examples,v 1.1 1994/09/19 21:27:56 wollman Exp $ The /usr/share/examples/etc directory contains the original distribution versions of the files which are shipped in /etc. This is diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile index fcc330cc19496..29eb19193c6c3 100644 --- a/share/examples/find_interface/Makefile +++ b/share/examples/find_interface/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/08/14 16:08:33 wollman Exp $ PROG= find_interface NOMAN= diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c index e534314f86748..5791f75ad1da1 100644 --- a/share/examples/find_interface/find_interface.c +++ b/share/examples/find_interface/find_interface.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: find_interface.c,v 1.1 1995/08/14 16:08:39 wollman Exp $ + * $Id: find_interface.c,v 1.2 1996/03/12 10:22:22 ache Exp $ */ /* diff --git a/share/examples/lkm/misc/module/Makefile b/share/examples/lkm/misc/module/Makefile index 6c08a6617e7dd..7f453bbe226cc 100644 --- a/share/examples/lkm/misc/module/Makefile +++ b/share/examples/lkm/misc/module/Makefile @@ -34,7 +34,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: Makefile,v 1.3 1995/12/25 07:18:49 bde Exp $ +# $Id: Makefile,v 1.1.6.1 1996/07/01 14:20:15 joerg Exp $ # BINDIR= /tmp SRCS= misccall.c miscmod.c diff --git a/share/examples/lkm/misc/test/Makefile b/share/examples/lkm/misc/test/Makefile index 5bfb2536e3a22..949d8f1253387 100644 --- a/share/examples/lkm/misc/test/Makefile +++ b/share/examples/lkm/misc/test/Makefile @@ -34,7 +34,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: Makefile,v 1.3 1995/12/25 07:18:59 bde Exp $ +# $Id: Makefile,v 1.1.6.1 1996/07/01 14:20:25 joerg Exp $ # PROG= testmisc NOMAN= diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile index f612c8eb25bb3..6b799e771cd4d 100644 --- a/share/man/man0/Makefile +++ b/share/man/man0/Makefile @@ -3,7 +3,7 @@ # All rights reserved. # # From: @(#)Makefile 8.2 (Berkeley) 1/29/94 -# $Id$ +# $Id: Makefile,v 1.2 1995/01/11 21:33:43 wollman Exp $ # SRCS= man1 man2 man3 man4 man5 man6 man7 man8 diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3 index 4c409e59c89d5..3cfa642f43dd7 100644 --- a/share/man/man3/sysexits.3 +++ b/share/man/man3/sysexits.3 @@ -23,7 +23,7 @@ .\" (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: sysexits.3,v 1.1 1996/03/31 22:33:54 joerg Exp $ +.\" $Id: sysexits.3,v 1.2 1996/04/08 04:18:00 mpp Exp $ .\" .\" " .Dd March 31, 1996 diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4 index f22c4e48e3adb..2a7f144504c63 100644 --- a/share/man/man4/inet.4 +++ b/share/man/man4/inet.4 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.4 8.1 (Berkeley) 6/5/93 -.\" $Id: inet.4,v 1.2 1995/02/15 03:30:51 wollman Exp $ +.\" $Id: inet.4,v 1.3 1995/03/16 18:24:19 wollman Exp $ .\" .Dd February 14, 1995 .Dt INET 4 diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4 index 6260982fa750e..4147b14575a76 100644 --- a/share/man/man4/intro.4 +++ b/share/man/man4/intro.4 @@ -23,7 +23,7 @@ .\" (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: intro.4,v 1.1 1996/01/21 14:01:49 joerg Exp $ +.\" $Id: intro.4,v 1.2 1996/02/11 22:37:26 mpp Exp $ .\" .Dd January 20, 1996 .Dt INTRO 4 diff --git a/share/man/man4/lkm.4 b/share/man/man4/lkm.4 index ceb5c9e1556ba..467713f4378f3 100644 --- a/share/man/man4/lkm.4 +++ b/share/man/man4/lkm.4 @@ -23,7 +23,7 @@ .\" (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: lkm.4,v 1.3 1995/04/05 01:06:00 jkh Exp $ +.\" $Id: lkm.4,v 1.3.4.1 1996/01/30 14:02:03 mpp Exp $ .\" .Dd September 4, 1993 .Dt LKM 4 diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index 60a662480b1ee..732d8260b6f3c 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.26.4.7 1996/07/11 20:03:32 mpp Exp $ +# $Id: Makefile,v 1.26.4.8 1996/07/12 12:00:37 jkh Exp $ MAN4= aha.4 ahb.4 ahc.4 aic.4 apm.4 asc.4 bt.4 cx.4 cy.4 dgb.4 \ ed.4 eg.4 el.4 ep.4 fdc.4 fe.4 ie.4 io.4 is.4 \ diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4 index c1e2dbd8fc3fa..929840b8bfae2 100644 --- a/share/man/man4/man4.i386/cy.4 +++ b/share/man/man4/man4.i386/cy.4 @@ -35,7 +35,7 @@ .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp .\" from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $ -.\" $Id$ +.\" $Id: cy.4,v 1.1 1995/10/10 09:34:21 bde Exp $ .\" .Dd October 10, 1995 .Dt CY 4 i386 diff --git a/share/man/man4/man4.i386/dgb.4 b/share/man/man4/man4.i386/dgb.4 index b72ae1412f533..969f597dd4e52 100644 --- a/share/man/man4/man4.i386/dgb.4 +++ b/share/man/man4/man4.i386/dgb.4 @@ -35,7 +35,7 @@ .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp .\" from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp -.\" $Id$ +.\" $Id: dgb.4,v 1.1 1995/10/17 17:38:42 bde Exp $ .\" .Dd Oct 13, 1995 .Dt DGB 4 i386 diff --git a/share/man/man4/man4.i386/ed.4 b/share/man/man4/man4.i386/ed.4 index 4b1e05b76f917..2ac7446ecaa98 100644 --- a/share/man/man4/man4.i386/ed.4 +++ b/share/man/man4/man4.i386/ed.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ed.4,v 1.1 1994/08/23 09:50:48 davidg Exp $ +.\" $Id: ed.4,v 1.2 1994/08/23 10:51:40 davidg Exp $ .\" .Dd August 22, 1994 .Dt ED 4 i386 diff --git a/share/man/man4/man4.i386/ep.4 b/share/man/man4/man4.i386/ep.4 index 51b6a80666cd2..f0346a359b59b 100644 --- a/share/man/man4/man4.i386/ep.4 +++ b/share/man/man4/man4.i386/ep.4 @@ -27,7 +27,7 @@ .\" (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: ep.4,v 1.1 1996/07/11 00:22:46 mpp Exp $ +.\" $Id: ep.4,v 1.2 1996/07/11 00:31:57 mpp Exp $ .\" .Dd February 04, 1993 .Dt EP 4 diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4 index 7141e9747044d..b7d7894b938e2 100644 --- a/share/man/man4/man4.i386/fe.4 +++ b/share/man/man4/man4.i386/fe.4 @@ -20,7 +20,7 @@ .\" Contributed by M.S. <seki@sysrap.cs.fujitsu.co.jp> .\" for fe driver version 0.8 .\" -.\" $Id: fe.4,v 1.2 1996/02/11 22:37:34 mpp Exp $ +.\" $Id: fe.4,v 1.1.4.1 1996/06/27 05:32:24 gpalmer Exp $ .Dd April 23, 1995 .Dt FE 4 .Sh NAME diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4 index 1a076ff57f608..fc0b748e38956 100644 --- a/share/man/man4/man4.i386/io.4 +++ b/share/man/man4/man4.i386/io.4 @@ -25,7 +25,7 @@ .\" (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$ +.\" $Id: io.4,v 1.1 1996/01/01 11:01:13 joerg Exp $ .\" .Dd Jan 1, 1996 .Dt IO 4 i386 diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4 index f904bd19fd871..dd1e4fe4b8102 100644 --- a/share/man/man4/man4.i386/npx.4 +++ b/share/man/man4/man4.i386/npx.4 @@ -28,7 +28,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" from: npx.4,v 1.1 1993/08/06 10:58:03 cgd Exp -.\" $Id$ +.\" $Id: npx.4,v 1.1 1993/08/28 12:41:22 rgrimes Exp $ .\" .Dd August 28, 1993 .Dt NPX 4 i386 diff --git a/share/man/man4/man4.i386/si.4 b/share/man/man4/man4.i386/si.4 index aa346f6141676..f00d5ca17dd98 100644 --- a/share/man/man4/man4.i386/si.4 +++ b/share/man/man4/man4.i386/si.4 @@ -1,4 +1,4 @@ -.\" $Id$ +.\" $Id: si.4,v 1.1 1995/09/26 18:23:38 peter Exp $ .\" The following requests are required for all man pages. .Dd September 16, 1995 .Os FreeBSD diff --git a/share/man/man4/man4.i386/sio.4 b/share/man/man4/man4.i386/sio.4 index 67790426d6cb7..7cabda7755224 100644 --- a/share/man/man4/man4.i386/sio.4 +++ b/share/man/man4/man4.i386/sio.4 @@ -34,7 +34,7 @@ .\" .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp -.\" $Id: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $ +.\" $Id: sio.4,v 1.15.4.1 1995/07/26 23:38:19 jkh Exp $ .\" .Dd June 3, 1994 .Dt SIO 4 i386 diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4 index 48d00a541a602..6e1298221793d 100644 --- a/share/man/man4/snp.4 +++ b/share/man/man4/snp.4 @@ -1,6 +1,6 @@ .\" -.\" $Id: snp.4,v 1.6.4.1 1996/01/30 14:02:11 mpp Exp $ -.\" $Source: /pub/FreeBSD/FreeBSD-CVS/src/share/man/man4/snp.4,v $ +.\" $Id: snp.4,v 1.6.4.2 1996/06/05 02:53:43 jkh Exp $ +.\" $Source: /home/ncvs/src/share/man/man4/snp.4,v $ .\" .Dd February 24, 1995 .Dt SNP 4 diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 5aecf1d45e49f..cb3604b10c29b 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $Id: tcp.4,v 1.3 1995/02/15 03:30:54 wollman Exp $ +.\" $Id: tcp.4,v 1.4 1995/02/15 22:07:27 wollman Exp $ .\" .Dd February 14, 1995 .Dt TCP 4 diff --git a/share/man/man4/ttcp.4 b/share/man/man4/ttcp.4 index ab585fe98834d..ccf9b8f1e3c91 100644 --- a/share/man/man4/ttcp.4 +++ b/share/man/man4/ttcp.4 @@ -25,7 +25,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: ttcp.4,v 1.1 1995/02/15 22:07:28 wollman Exp $ .\" .Dd February 15, 1995 .Dt TTCP 4 diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4 index 4454bb297a067..c300215753c1f 100644 --- a/share/man/man4/worm.4 +++ b/share/man/man4/worm.4 @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $Id: worm.4,v 1.1.4.1 1996/06/23 16:50:11 joerg Exp $ +.\" $Id: worm.4,v 1.1.4.2 1996/06/23 18:33:04 joerg Exp $ .\" " .Dd January 27, 1996 .Dt WORM 4 diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4 index 2810b0234d9ab..0b60cac28a05b 100644 --- a/share/man/man4/yp.4 +++ b/share/man/man4/yp.4 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)yp.8 1.0 (deraadt) 4/26/93 -.\" $Id: yp.4,v 1.3.4.1 1995/10/05 20:50:09 davidg Exp $ +.\" $Id: yp.4,v 1.3.4.2 1996/01/30 14:02:25 mpp Exp $ .\" .Dd April 5, 1993 .Dt YP 4 diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5 index 332c757be66fa..686765bc9466f 100644 --- a/share/man/man5/a.out.5 +++ b/share/man/man5/a.out.5 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)a.out.5 8.1 (Berkeley) 6/5/93 -.\" $Id: a.out.5,v 1.2 1994/12/23 22:41:45 nate Exp $ +.\" $Id: a.out.5,v 1.2.4.1 1996/01/30 14:02:37 mpp Exp $ .\" .Dd June 5, 1993 .Dt A.OUT 5 diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5 index e6feae684e9f1..5c9ae696bd592 100644 --- a/share/man/man5/ethers.5 +++ b/share/man/man5/ethers.5 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ethers.5,v 1.1 1995/04/12 22:16:08 wpaul Exp $ +.\" $Id: ethers.5,v 1.1.4.1 1996/01/30 14:02:44 mpp Exp $ .\" .Dd April 12, 1995 .Dt ETHERS 5 diff --git a/share/man/man5/group.5 b/share/man/man5/group.5 index a785743544ca8..4fee01be08602 100644 --- a/share/man/man5/group.5 +++ b/share/man/man5/group.5 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)group.5 8.3 (Berkeley) 4/19/94 -.\" $Id$ +.\" $Id: group.5,v 1.2 1994/09/20 22:44:35 wollman Exp $ .\" .Dd September 29, 1994 .Dt GROUP 5 diff --git a/share/man/man5/link.5 b/share/man/man5/link.5 index d85fbecb40327..9008aaf4b3eb3 100644 --- a/share/man/man5/link.5 +++ b/share/man/man5/link.5 @@ -26,7 +26,7 @@ .\" (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: link.5,v 1.2 1995/04/16 12:35:13 ats Exp $ +.\" $Id: link.5,v 1.2.4.1 1996/01/30 14:02:47 mpp Exp $ .\" .Dd October 23, 1993 .Dt LINK 5 diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5 index 71d38d935c668..142f9f6f7b9e7 100644 --- a/share/man/man5/procfs.5 +++ b/share/man/man5/procfs.5 @@ -1,4 +1,4 @@ -.\" $Id: procfs.5,v 1.1 1994/08/10 20:03:06 wollman Exp $ +.\" $Id: procfs.5,v 1.2 1994/08/10 20:03:54 wollman Exp $ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7 index 40b9bf0a48a70..1eb3f02d94a83 100644 --- a/share/man/man7/clocks.7 +++ b/share/man/man7/clocks.7 @@ -25,7 +25,7 @@ .\" (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$ +.\" $Id: clocks.7,v 1.1 1996/04/05 08:51:22 joerg Exp $ .\" " .Dd April 1, 1996 .Os diff --git a/share/mk/Makefile b/share/mk/Makefile index 0d7be535db9ca..d773b764aab8b 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7.4.4 1996/06/20 14:35:29 jkh Exp $ +# $Id: Makefile,v 1.7.4.5 1996/11/08 06:33:38 jkh Exp $ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index f07ea048c54a6..52356d84df729 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $Id: bsd.dep.mk,v 1.2 1995/02/08 21:35:24 bde Exp $ +# $Id: bsd.dep.mk,v 1.2.4.2 1996/06/05 02:53:48 jkh Exp $ # some of the rules involve .h sources, so remove them from mkdep line .if !target(depend) diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index c8eb75ca53526..71e284b2f361e 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $Id: bsd.doc.mk,v 1.19.4.3 1995/10/15 16:30:48 jkh Exp $ +# $Id: bsd.doc.mk,v 1.19.4.5 1996/06/05 02:53:50 jkh Exp $ PRINTER?= ascii diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 5d3e6deecbf4b..97fad4c1c4c7d 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -1,4 +1,4 @@ -# $Id: bsd.info.mk,v 1.13.4.1 1995/09/17 11:14:36 davidg Exp $ +# $Id: bsd.info.mk,v 1.13.4.3 1996/06/05 02:53:53 jkh Exp $ BINMODE= 444 BINDIR?= /usr/share/info diff --git a/share/mk/bsd.kern.mk b/share/mk/bsd.kern.mk index d6c5eaf80c685..943de2d1b77f2 100644 --- a/share/mk/bsd.kern.mk +++ b/share/mk/bsd.kern.mk @@ -1,4 +1,4 @@ -# $Id: bsd.kern.mk,v 1.1 1996/10/08 22:10:49 bde Exp $ +# $Id: bsd.kern.mk,v 1.2 1996/10/09 18:41:40 bde Exp $ # # Warning flags for compiling the kernel and components of the kernel. diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index 80771b9b17830..3bd7e93b75167 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.kmod.mk,v 1.11.4.1 1996/04/03 12:10:28 phk Exp $ +# $Id: bsd.kmod.mk,v 1.11.4.3 1996/06/05 02:53:54 jkh Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 39311a38b969b..f33fd8441e469 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.24.4.4 1996/06/05 02:53:55 jkh Exp $ +# $Id: bsd.lib.mk,v 1.24.4.5 1997/02/05 05:09:13 pst Exp $ # .if exists(${.CURDIR}/../Makefile.inc) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 78a070408de61..f3b3d65139b1d 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90 -# $Id: bsd.man.mk,v 1.4 1994/12/28 03:50:51 ache Exp $ +# $Id: bsd.man.mk,v 1.4.4.2 1996/06/05 02:53:56 jkh Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 133c194bafef0..2ae28350c3cd6 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $Id: bsd.obj.mk,v 1.2 1996/04/09 22:43:33 wosch Exp $ +# $Id: bsd.obj.mk,v 1.3 1996/04/22 23:31:39 wosch Exp $ # # The include file <bsd.obj.mk> handles creating 'obj' directory # and cleaning up object files, log files etc. diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7a7bd4c521fce..092c1606e14b6 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $Id: bsd.own.mk,v 1.6 1996/05/25 23:09:49 wosch Exp $ +# $Id: bsd.own.mk,v 1.2.6.3 1996/06/20 23:51:50 jkh Exp $ # # The include file <bsd.own.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 5a66a52733967..ee7bf5a09c4f7 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -6,7 +6,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.165.2.21 1997/01/12 12:40:51 asami Exp $ +# $Id: bsd.port.mk,v 1.165.2.22 1997/01/25 02:52:10 asami Exp $ # # Please view me with 4 column tabs! diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk index 3e629eb5fbd59..b214d215a2208 100644 --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $Id: bsd.port.subdir.mk,v 1.11.4.2 1996/06/05 02:54:01 jkh Exp $ +# $Id: bsd.port.subdir.mk,v 1.11.4.3 1997/01/13 02:17:00 asami Exp $ .MAIN: all diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 657d53aef5a47..65d24f198d28a 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.26 1995/05/07 06:39:30 bde Exp $ +# $Id: bsd.prog.mk,v 1.26.4.2 1996/06/05 02:54:02 jkh Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk index 8543cd3300111..e1fb452150d2d 100644 --- a/share/mk/bsd.sgml.mk +++ b/share/mk/bsd.sgml.mk @@ -1,7 +1,7 @@ # bsd.sgml.mk - 8 Sep 1995 John Fieber # This file is in the public domain. # -# $Id: bsd.sgml.mk,v 1.5 1996/05/27 23:12:15 wosch Exp $ +# $Id: bsd.sgml.mk,v 1.3.2.4 1996/06/20 14:35:33 jkh Exp $ # # The include file <bsd.sgml.mk> handles installing sgml documents. # <bsd.prog.mk> includes the file named "../Makefile.inc" if it exists, diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 9da0febb156dd..ead103768b3e8 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $Id: bsd.subdir.mk,v 1.8 1995/02/25 20:51:14 phk Exp $ +# $Id: bsd.subdir.mk,v 1.8.4.2 1996/06/05 02:54:04 jkh Exp $ .MAIN: all diff --git a/share/mk/sys.mk b/share/mk/sys.mk index c7878a28a0584..4f620c3263e35 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $Id: sys.mk,v 1.9.4.3 1996/06/05 02:54:05 jkh Exp $ +# $Id: sys.mk,v 1.9.4.4 1996/06/25 18:24:50 bde Exp $ unix ?= We run FreeBSD, not UNIX. diff --git a/share/sgml/FreeBSD/Makefile b/share/sgml/FreeBSD/Makefile index 084125b1f217e..0247ce185ff0c 100644 --- a/share/sgml/FreeBSD/Makefile +++ b/share/sgml/FreeBSD/Makefile @@ -1,4 +1,4 @@ -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1995/05/09 23:19:45 jfieber Exp $ SUBDIR= dtd rep lib diff --git a/share/sgml/FreeBSD/Makefile.inc b/share/sgml/FreeBSD/Makefile.inc index 847d34b5eb965..3e61d8021861b 100644 --- a/share/sgml/FreeBSD/Makefile.inc +++ b/share/sgml/FreeBSD/Makefile.inc @@ -1,3 +1,3 @@ -# $Id:$ +# $Id: Makefile.inc,v 1.1.1.1 1995/05/09 23:19:45 jfieber Exp $ BINDIR?= /usr/share/sgml/FreeBSD diff --git a/share/sgml/FreeBSD/dtd/Makefile b/share/sgml/FreeBSD/dtd/Makefile index 10a7e94ab62ed..a21c39056432e 100644 --- a/share/sgml/FreeBSD/dtd/Makefile +++ b/share/sgml/FreeBSD/dtd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/07/25 00:34:37 bde Exp $ +# $Id: Makefile,v 1.1.1.1.4.1 1995/09/17 23:42:31 davidg Exp $ FILES= linuxdoc linuxdoc.dec NOOBJ= noobj diff --git a/share/sgml/FreeBSD/lib/Makefile b/share/sgml/FreeBSD/lib/Makefile index 4a3889986fb41..43e2778a27c4c 100644 --- a/share/sgml/FreeBSD/lib/Makefile +++ b/share/sgml/FreeBSD/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/07/25 00:34:47 bde Exp $ +# $Id: Makefile,v 1.1.1.1.4.1 1995/09/17 23:42:39 davidg Exp $ FILES= linuxdoc.sty NOOBJ= noobj diff --git a/share/sgml/FreeBSD/rep/Makefile b/share/sgml/FreeBSD/rep/Makefile index 148fe871c99e1..c9754d89d17d1 100644 --- a/share/sgml/FreeBSD/rep/Makefile +++ b/share/sgml/FreeBSD/rep/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/07/25 00:34:52 bde Exp $ +# $Id: Makefile,v 1.1.1.1.4.1 1995/09/17 23:42:40 davidg Exp $ FILES= html.general html.mapping html.math latex.general latex.mapping FILES+= latex.math nroff.general nroff.mapping nroff.math diff --git a/share/sgml/Makefile b/share/sgml/Makefile index ddc70e608bbc6..aab931b9c141f 100644 --- a/share/sgml/Makefile +++ b/share/sgml/Makefile @@ -1,4 +1,4 @@ -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1995/05/09 23:19:45 jfieber Exp $ SUBDIR= FreeBSD diff --git a/share/sgml/Makefile.inc b/share/sgml/Makefile.inc index 0fd5d0e6ceadf..98600df65a7bf 100644 --- a/share/sgml/Makefile.inc +++ b/share/sgml/Makefile.inc @@ -1,3 +1,3 @@ -# $Id:$ +# $Id: Makefile.inc,v 1.1.1.1 1995/05/09 23:19:45 jfieber Exp $ BINDIR?= /usr/share/sgml diff --git a/share/skel/dot.profile b/share/skel/dot.profile index b5e9c555eb9f9..0ad13024ed3a5 100644 --- a/share/skel/dot.profile +++ b/share/skel/dot.profile @@ -1,4 +1,4 @@ -# $Id: dot.profile,v 1.6 1996/05/12 14:32:23 wosch Exp $ +# $Id: dot.profile,v 1.2.4.1 1996/06/23 20:35:22 wosch Exp $ # PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin export PATH diff --git a/share/syscons/Makefile b/share/syscons/Makefile index 5ffd23a3556da..409a985eb7710 100644 --- a/share/syscons/Makefile +++ b/share/syscons/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/09/30 23:24:48 jkh Exp $ +# $Id: Makefile,v 1.1 1994/09/25 03:42:20 ache Exp $ SUBDIR= fonts keymaps scrnmaps diff --git a/share/syscons/fonts/INDEX.fonts b/share/syscons/fonts/INDEX.fonts index 973931421aff2..29439fde44fde 100644 --- a/share/syscons/fonts/INDEX.fonts +++ b/share/syscons/fonts/INDEX.fonts @@ -1,5 +1,5 @@ # -# $Id: INDEX.fonts,v 1.7 1995/04/03 21:10:19 w Exp $ +# $Id: INDEX.fonts,v 1.2 1995/04/05 08:02:24 jkh Exp $ # # database for vidfont(8) # diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index becb7da7f21e4..ed5901a54c536 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1996/02/18 02:25:32 wosch Exp $ +# $Id: Makefile,v 1.6.4.1 1996/06/23 22:10:13 wosch Exp $ FONTS= cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \ cp437-thin-8x8.fnt cp437-thin-8x16.fnt \ diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps index 39480486b2963..249c23fc94921 100644 --- a/share/syscons/keymaps/INDEX.keymaps +++ b/share/syscons/keymaps/INDEX.keymaps @@ -1,5 +1,5 @@ # -# $Id: INDEX.keymaps,v 1.4 1996/04/14 17:22:43 wosch Exp $ +# $Id: INDEX.keymaps,v 1.3.4.1 1996/06/23 22:10:28 wosch Exp $ # # database for kbdmap(8) # diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index bef932eb180f8..f1facd017b2b4 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.15 1996/10/21 23:34:58 ache Exp $ +# $Id: Makefile,v 1.5.4.3 1996/11/10 20:44:59 jkh Exp $ KEYMAPS= INDEX.keymaps KEYMAPS+= be.iso.kbd diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index b279d84663877..6cfe49e3c793a 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1995/11/16 02:00:38 gpalmer Exp $ +# $Id: Makefile,v 1.7.6.1 1995/11/16 02:03:30 gpalmer Exp $ NOBIN= CLEANFILES+= yearistype diff --git a/sys/Makefile b/sys/Makefile index 00d80648ef6d5..8cd55f2eff87d 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1994/08/02 07:38:17 davidg Exp $ +# $Id: Makefile,v 1.3 1994/08/25 13:54:28 paul Exp $ SUBDIR= ${MACHINE}/boot libkern diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5da6c383ebade..42c1b2572dfda 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,12 +32,12 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $Id: newvers.sh,v 1.16.4.10 1997/02/07 01:55:21 jkh Exp $ +# $Id: newvers.sh,v 1.16.4.11 1997/02/10 06:36:10 jkh Exp $ TYPE="FreeBSD" REVISION="2.1.7" BRANCH="RELEASE" -RELEASE="${REVISION}-${BRANCH}" +RELEASE=2.1.7-RELEASE SNAPDATE="" if [ "X${SNAPDATE}" != "X" ]; then RELEASE="${RELEASE}-${SNAPDATE}" diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c index 80cb84a3734f4..44e81ef5a9fce 100644 --- a/sys/conf/nfsswapkernel.c +++ b/sys/conf/nfsswapkernel.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)nfsswapvmunix.c 8.1 (Berkeley) 6/10/93 - * $Id: nfsswapvmunix.c,v 1.2 1994/08/02 07:38:29 davidg Exp $ + * $Id: nfsswapkernel.c,v 1.1 1994/08/05 09:25:31 davidg Exp $ */ /* diff --git a/sys/conf/param.c b/sys/conf/param.c index a876f19829b11..453341efe749f 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.c 8.2 (Berkeley) 1/21/94 - * $Id: param.c,v 1.9 1995/05/25 07:36:24 davidg Exp $ + * $Id: param.c,v 1.9.4.1 1995/08/23 04:22:29 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh index 4cda02af41d82..7d8ec313c3cbc 100644 --- a/sys/conf/systags.sh +++ b/sys/conf/systags.sh @@ -38,7 +38,7 @@ # # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory. # -# $Id$ +# $Id: systags.sh,v 1.2 1994/08/02 07:38:32 davidg Exp $ rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles MACHINE=`machine` diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index fb53d27f5f129..df6feaadde5d3 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_access.c,v 1.6 1994/08/18 22:34:18 wollman Exp $ + * $Id: db_access.c,v 1.7 1995/05/30 07:56:46 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h index dbf3d21121150..8a489d64ce6b1 100644 --- a/sys/ddb/db_access.h +++ b/sys/ddb/db_access.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_access.h,v 1.3 1993/11/07 17:39:20 wollman Exp $ + * $Id: db_access.h,v 1.4 1995/05/30 07:56:47 rgrimes Exp $ */ #ifndef _DDB_DB_ACCESS_H_ diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c index 62cbba94b6530..6893510cd7946 100644 --- a/sys/ddb/db_aout.c +++ b/sys/ddb/db_aout.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_aout.c,v 1.10 1995/01/25 21:37:04 bde Exp $ + * $Id: db_aout.c,v 1.11 1995/05/30 07:56:49 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index 05a4cc16a93ce..bc112d431a95e 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_break.c,v 1.5 1994/08/18 22:34:19 wollman Exp $ + * $Id: db_break.c,v 1.6 1995/05/30 07:56:50 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index efe62c717e298..a46662d04c977 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_break.h,v 1.2 1993/10/16 16:47:09 rgrimes Exp $ + * $Id: db_break.h,v 1.3 1995/05/30 07:56:51 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 73b313a26ab3a..47f69f0ecd366 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.c,v 1.14 1995/08/27 02:39:39 bde Exp $ + * $Id: db_command.c,v 1.13.4.1 1995/09/12 04:21:42 davidg Exp $ */ /* diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h index 3b6d77ae71029..aae91d44305de 100644 --- a/sys/ddb/db_command.h +++ b/sys/ddb/db_command.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.h,v 1.5 1994/08/18 22:34:21 wollman Exp $ + * $Id: db_command.h,v 1.6 1995/05/30 07:56:54 rgrimes Exp $ */ #ifndef _DDB_DB_COMMAND_H_ diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index 8f321b936c852..ea46d42b4c6eb 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_examine.c,v 1.7 1995/05/22 13:07:11 davidg Exp $ + * $Id: db_examine.c,v 1.8 1995/05/30 07:56:55 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index 8f4b78f99defd..8e2dacf442ad3 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_expr.c,v 1.4 1994/08/13 03:49:18 wollman Exp $ + * $Id: db_expr.c,v 1.5 1995/05/30 07:56:56 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index c3097742eb9fc..9b02f2d0ebd15 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_input.c,v 1.6 1994/08/18 22:34:23 wollman Exp $ + * $Id: db_input.c,v 1.7 1995/05/30 07:56:58 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 3985c4f67e34f..5c4597bcafc03 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_lex.c,v 1.5 1994/08/18 22:34:23 wollman Exp $ + * $Id: db_lex.c,v 1.6 1995/05/30 07:57:00 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h index 0be7d4ac4a188..278217ee429be 100644 --- a/sys/ddb/db_lex.h +++ b/sys/ddb/db_lex.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_lex.h,v 1.4 1994/08/18 22:34:24 wollman Exp $ + * $Id: db_lex.h,v 1.5 1995/05/30 07:57:01 rgrimes Exp $ */ #ifndef _DDB_DB_LEX_H_ diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index ca92bfc912ded..a2bcea107da65 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.c,v 1.10 1994/10/30 20:55:44 bde Exp $ + * $Id: db_output.c,v 1.11 1995/05/30 07:57:02 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 3a2f5fd321a9f..35999bd6f8cae 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.h,v 1.6 1994/09/27 12:15:53 davidg Exp $ + * $Id: db_output.h,v 1.7 1995/05/30 07:57:04 rgrimes Exp $ */ #ifndef _DDB_DB_OUTPUT_H_ diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 7f0557b5c7710..4cfd4cd9c8462 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_print.c,v 1.6 1994/09/27 03:34:56 phk Exp $ + * $Id: db_print.c,v 1.7 1995/05/30 07:57:06 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index 639d1ee671ee6..2714c16e943ce 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: db_ps.c,v 1.6.4.1 1995/08/23 04:25:16 davidg Exp $ + * $Id: db_ps.c,v 1.6.4.2 1995/09/12 04:21:43 davidg Exp $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index e161a73228ce5..6ac3eaedf519e 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_run.c,v 1.4 1994/08/13 03:49:22 wollman Exp $ + * $Id: db_run.c,v 1.5 1995/05/30 07:57:08 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 81c7b4d94a806..409a911bcb391 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.c,v 1.8 1995/05/22 13:07:12 davidg Exp $ + * $Id: db_sym.c,v 1.9 1995/05/30 07:57:10 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index 319279dab56bb..29088b690249b 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.h,v 1.7 1995/03/16 18:11:00 bde Exp $ + * $Id: db_sym.h,v 1.8 1995/05/30 07:57:11 rgrimes Exp $ */ #ifndef _DDB_DB_SYM_H_ diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c index 83419b8255374..0c7697ddb9e76 100644 --- a/sys/ddb/db_trap.c +++ b/sys/ddb/db_trap.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trap.c,v 1.6 1994/10/02 19:36:21 phk Exp $ + * $Id: db_trap.c,v 1.7 1995/05/30 07:57:14 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index 25485f5256c23..a22cc9dafabec 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_variables.c,v 1.6 1994/09/27 03:34:58 phk Exp $ + * $Id: db_variables.c,v 1.7 1995/05/30 07:57:17 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h index 76aeedecaf627..631ef5e24e30b 100644 --- a/sys/ddb/db_variables.h +++ b/sys/ddb/db_variables.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_variables.h,v 1.3 1993/11/25 01:30:14 wollman Exp $ + * $Id: db_variables.h,v 1.4 1995/05/30 07:57:19 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index b74fab9e9fa62..5e5d0a81c978e 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.c,v 1.5 1994/08/18 22:34:28 wollman Exp $ + * $Id: db_watch.c,v 1.6 1995/05/30 07:57:20 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h index 61cb7c1806bba..da9909a330371 100644 --- a/sys/ddb/db_watch.h +++ b/sys/ddb/db_watch.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_watch.h,v 1.3 1994/08/18 22:34:29 wollman Exp $ + * $Id: db_watch.h,v 1.4 1995/05/30 07:57:21 rgrimes Exp $ */ /* diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index 1b2a99e42c1f2..2b06fa55141d3 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp $ + * $Id: db_write_cmd.c,v 1.5 1995/05/30 07:57:23 rgrimes Exp $ */ /* diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index 23702b28cb7f7..d20e696e7baf0 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ddb.h,v 1.5 1995/03/16 18:11:01 bde Exp $ + * $Id: ddb.h,v 1.6 1995/05/30 07:57:24 rgrimes Exp $ */ /* diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 0f41068195710..cba1d66382c70 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -39,7 +39,7 @@ * *-M************************************************************************/ -VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.16.4.19 1997/02/12 18:35:41 gibbs Exp $" +VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.16.4.20 1997/02/18 19:52:36 gibbs Exp $" #if defined(__NetBSD__) #include "../../../../dev/ic/aic7xxxreg.h" diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c index 24140373b13d1..8984291466c3c 100644 --- a/sys/dev/aic7xxx/aic7xxx_asm.c +++ b/sys/dev/aic7xxx/aic7xxx_asm.c @@ -43,7 +43,7 @@ * are token separators. * *-M*************************************************************************/ -static char id[] = "$Id: aic7xxx_asm.c,v 1.12 1996/03/31 03:02:35 gibbs Exp $"; +static char id[] = "$Id: aic7xxx_asm.c,v 1.9.4.4 1996/06/08 07:10:21 gibbs Exp $"; #include <ctype.h> #include <stdio.h> #include <string.h> diff --git a/sys/dev/aic7xxx/aic7xxx_reg.h b/sys/dev/aic7xxx/aic7xxx_reg.h index a0172f9aa61c1..096c383fc6c7e 100644 --- a/sys/dev/aic7xxx/aic7xxx_reg.h +++ b/sys/dev/aic7xxx/aic7xxx_reg.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_reg.h,v 1.2.2.10 1997/02/12 18:35:43 gibbs Exp $ + * $Id: aic7xxx_reg.h,v 1.2.2.11 1997/02/18 19:52:38 gibbs Exp $ */ /* diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index ae7d8f400c823..d6f3952752a71 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.10.2.3 1996/05/13 09:18:26 asami Exp $ */ +/* $Id: ccd.c,v 1.10.2.4 1997/02/18 22:40:31 davidg Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h index 0e799c568f032..5a02225c5c349 100644 --- a/sys/gnu/i386/fpemul/control_w.h +++ b/sys/gnu/i386/fpemul/control_w.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: control_w.h,v 1.3 1994/06/10 07:44:07 rich Exp $ + * $Id: control_w.h,v 1.4 1995/05/30 07:57:41 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s index d25313b3792c1..aff2738fe43f7 100644 --- a/sys/gnu/i386/fpemul/div_small.s +++ b/sys/gnu/i386/fpemul/div_small.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: div_small.s,v 1.2 1994/04/29 21:07:11 gclarkii Exp $ + * $Id: div_small.s,v 1.3 1994/06/10 07:44:08 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c index a303b3416f840..c917fd40de7b3 100644 --- a/sys/gnu/i386/fpemul/errors.c +++ b/sys/gnu/i386/fpemul/errors.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: errors.c,v 1.3 1994/06/10 07:44:10 rich Exp $ + * $Id: errors.c,v 1.4 1995/03/16 18:11:10 bde Exp $ * */ diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h index 11f9d02160d8a..af814f1d51916 100644 --- a/sys/gnu/i386/fpemul/exception.h +++ b/sys/gnu/i386/fpemul/exception.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: exception.h,v 1.2 1994/04/29 21:07:13 gclarkii Exp $ + * $Id: exception.h,v 1.3 1994/06/10 07:44:12 rich Exp $ * * */ diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c index 5745e1b32d171..4321cf2c94f50 100644 --- a/sys/gnu/i386/fpemul/fpu_arith.c +++ b/sys/gnu/i386/fpemul/fpu_arith.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_arith.c,v 1.3 1994/06/10 07:44:14 rich Exp $ + * $Id: fpu_arith.c,v 1.4 1995/05/30 07:57:43 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h index e618c04e1f353..2f6e58a654108 100644 --- a/sys/gnu/i386/fpemul/fpu_asm.h +++ b/sys/gnu/i386/fpemul/fpu_asm.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_asm.h,v 1.2 1994/04/29 21:07:14 gclarkii Exp $ + * $Id: fpu_asm.h,v 1.3 1994/06/10 07:44:16 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c index 629e45a794728..135fef9e105fc 100644 --- a/sys/gnu/i386/fpemul/fpu_aux.c +++ b/sys/gnu/i386/fpemul/fpu_aux.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_aux.c,v 1.2 1994/04/29 21:16:19 gclarkii Exp $ + * $Id: fpu_aux.c,v 1.3 1994/06/10 07:44:17 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h index b62a9cf894765..b81a85127fecf 100644 --- a/sys/gnu/i386/fpemul/fpu_emu.h +++ b/sys/gnu/i386/fpemul/fpu_emu.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_emu.h,v 1.2 1994/04/29 21:16:20 gclarkii Exp $ + * $Id: fpu_emu.h,v 1.3 1994/06/10 07:44:19 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c index edbe94d6aeeaf..d237df5763474 100644 --- a/sys/gnu/i386/fpemul/fpu_entry.c +++ b/sys/gnu/i386/fpemul/fpu_entry.c @@ -55,7 +55,7 @@ * * W. Metzenthen June 1994. * - * $Id: fpu_entry.c,v 1.5 1994/08/30 20:18:52 davidg Exp $ + * $Id: fpu_entry.c,v 1.6 1995/05/30 07:57:45 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c index 936e39a8b8bb8..9993d3bddfd4c 100644 --- a/sys/gnu/i386/fpemul/fpu_etc.c +++ b/sys/gnu/i386/fpemul/fpu_etc.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_etc.c,v 1.2 1994/04/29 21:16:22 gclarkii Exp $ + * $Id: fpu_etc.c,v 1.3 1994/06/10 07:44:24 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h index c15c913899fb9..4e6c71819c3b7 100644 --- a/sys/gnu/i386/fpemul/fpu_proto.h +++ b/sys/gnu/i386/fpemul/fpu_proto.h @@ -1,6 +1,6 @@ /* * - * $Id: fpu_proto.h,v 1.2 1994/04/29 21:16:23 gclarkii Exp $ + * $Id: fpu_proto.h,v 1.3 1995/03/16 18:11:11 bde Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h index bb9e5d04fdb47..c2dcfe14da6f8 100644 --- a/sys/gnu/i386/fpemul/fpu_system.h +++ b/sys/gnu/i386/fpemul/fpu_system.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_system.h,v 1.3 1994/06/10 07:44:25 rich Exp $ + * $Id: fpu_system.h,v 1.4 1995/05/30 07:57:51 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c index ca32f91d0aef9..af2bd0553ce97 100644 --- a/sys/gnu/i386/fpemul/fpu_trig.c +++ b/sys/gnu/i386/fpemul/fpu_trig.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: fpu_trig.c,v 1.3 1994/04/29 21:16:25 gclarkii Exp $ + * $Id: fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c index 5839e57c26847..957ea4e2eeba0 100644 --- a/sys/gnu/i386/fpemul/get_address.c +++ b/sys/gnu/i386/fpemul/get_address.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: get_address.c,v 1.2 1994/04/29 21:16:26 gclarkii Exp $ + * $Id: get_address.c,v 1.3 1994/06/10 07:44:29 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c index e45b67ecefd8e..0537a1106abbf 100644 --- a/sys/gnu/i386/fpemul/load_store.c +++ b/sys/gnu/i386/fpemul/load_store.c @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: load_store.c,v 1.3 1994/06/10 07:44:30 rich Exp $ + * $Id: load_store.c,v 1.4 1994/09/21 22:22:46 bde Exp $ * */ diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h index 4dc90b83a9846..031d391595b56 100644 --- a/sys/gnu/i386/fpemul/math_emu.h +++ b/sys/gnu/i386/fpemul/math_emu.h @@ -1,6 +1,6 @@ /* * - * $Id:$ + * $Id: math_emu.h,v 1.2 1994/04/29 21:23:24 gclarkii Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c index b7e81f241f1c8..d4da1bb815270 100644 --- a/sys/gnu/i386/fpemul/poly_2xm1.c +++ b/sys/gnu/i386/fpemul/poly_2xm1.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_2xm1.c,v 1.2 1994/04/29 21:23:25 gclarkii Exp $ + * $Id: poly_2xm1.c,v 1.3 1994/06/10 07:44:32 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c index 179049fcfb10b..f597ed9af43e1 100644 --- a/sys/gnu/i386/fpemul/poly_atan.c +++ b/sys/gnu/i386/fpemul/poly_atan.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_atan.c,v 1.3 1994/04/29 21:23:26 gclarkii Exp $ + * $Id: poly_atan.c,v 1.4 1994/06/10 07:44:34 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s index 3ac5bf06fe1bb..dce95ed82aae1 100644 --- a/sys/gnu/i386/fpemul/poly_div.s +++ b/sys/gnu/i386/fpemul/poly_div.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_div.s,v 1.2 1994/04/29 21:23:27 gclarkii Exp $ + * $Id: poly_div.s,v 1.3 1994/06/10 07:44:36 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c index 0607c1609d283..7c44103fd0499 100644 --- a/sys/gnu/i386/fpemul/poly_l2.c +++ b/sys/gnu/i386/fpemul/poly_l2.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_l2.c,v 1.4 1994/04/30 16:47:08 gclarkii Exp $ + * $Id: poly_l2.c,v 1.5 1994/06/10 07:44:38 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s index c0f5d0fc5ba9b..be5a136a12997 100644 --- a/sys/gnu/i386/fpemul/poly_mul64.s +++ b/sys/gnu/i386/fpemul/poly_mul64.s @@ -59,7 +59,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_mul64.s,v 1.2 1994/04/29 21:23:29 gclarkii Exp $ + * $Id: poly_mul64.s,v 1.3 1994/06/10 07:44:39 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c index a1aa11c1ca661..7c6751eb77ab2 100644 --- a/sys/gnu/i386/fpemul/poly_sin.c +++ b/sys/gnu/i386/fpemul/poly_sin.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_sin.c,v 1.4 1994/06/10 07:44:41 rich Exp $ + * $Id: poly_sin.c,v 1.5 1994/08/31 04:45:22 davidg Exp $ * */ diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c index 6098c814b42f0..58e3c904b148c 100644 --- a/sys/gnu/i386/fpemul/poly_tan.c +++ b/sys/gnu/i386/fpemul/poly_tan.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: poly_tan.c,v 1.4 1994/06/10 07:44:42 rich Exp $ + * $Id: poly_tan.c,v 1.5 1995/05/30 07:57:52 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s index f54c729fe6fdf..8f48ff4183ae2 100644 --- a/sys/gnu/i386/fpemul/polynomial.s +++ b/sys/gnu/i386/fpemul/polynomial.s @@ -64,7 +64,7 @@ * W. Metzenthen June 1994. * * - * $Id: polynomial.s,v 1.2 1994/04/29 21:23:31 gclarkii Exp $ + * $Id: polynomial.s,v 1.3 1994/06/10 07:44:43 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c index a122452f19f9f..ff8b0ea37c2e2 100644 --- a/sys/gnu/i386/fpemul/reg_add_sub.c +++ b/sys/gnu/i386/fpemul/reg_add_sub.c @@ -55,7 +55,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_add_sub.c,v 1.2 1994/04/29 21:30:15 gclarkii Exp $ + * $Id: reg_add_sub.c,v 1.3 1994/06/10 07:44:44 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c index 52623f72711a3..606567186d7bc 100644 --- a/sys/gnu/i386/fpemul/reg_compare.c +++ b/sys/gnu/i386/fpemul/reg_compare.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_compare.c,v 1.4 1994/08/31 04:45:23 davidg Exp $ + * $Id: reg_compare.c,v 1.5 1995/05/30 07:57:54 rgrimes Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h index 6e4ffa86d78e3..d64a3d55f91bd 100644 --- a/sys/gnu/i386/fpemul/reg_constant.h +++ b/sys/gnu/i386/fpemul/reg_constant.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_constant.h,v 1.2 1994/04/29 21:30:18 gclarkii Exp $ + * $Id: reg_constant.h,v 1.3 1994/06/10 07:44:49 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s index 5de5a466c49f1..8f7357530b7e5 100644 --- a/sys/gnu/i386/fpemul/reg_div.s +++ b/sys/gnu/i386/fpemul/reg_div.s @@ -60,7 +60,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_div.s,v 1.2 1994/04/29 21:30:19 gclarkii Exp $ + * $Id: reg_div.s,v 1.3 1994/06/10 07:44:50 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c index 8fde12fd18d47..f89882cb58848 100644 --- a/sys/gnu/i386/fpemul/reg_ld_str.c +++ b/sys/gnu/i386/fpemul/reg_ld_str.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_ld_str.c,v 1.4 1994/08/31 04:45:24 davidg Exp $ + * $Id: reg_ld_str.c,v 1.5 1994/09/21 22:22:48 bde Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c index b51e9fcf2ed7d..5924e5e75df20 100644 --- a/sys/gnu/i386/fpemul/reg_mul.c +++ b/sys/gnu/i386/fpemul/reg_mul.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_mul.c,v 1.2 1994/04/29 21:30:21 gclarkii Exp $ + * $Id: reg_mul.c,v 1.3 1994/06/10 07:44:53 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s index 6f9dd7c9693a7..37b080e0271bd 100644 --- a/sys/gnu/i386/fpemul/reg_norm.s +++ b/sys/gnu/i386/fpemul/reg_norm.s @@ -61,7 +61,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_norm.s,v 1.2 1994/04/29 21:30:22 gclarkii Exp $ + * $Id: reg_norm.s,v 1.3 1994/06/10 07:44:54 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s index 99a2a8aa352eb..7490bbb31d7e2 100644 --- a/sys/gnu/i386/fpemul/reg_round.s +++ b/sys/gnu/i386/fpemul/reg_round.s @@ -65,7 +65,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_round.s,v 1.2 1994/04/29 21:30:23 gclarkii Exp $ + * $Id: reg_round.s,v 1.3 1994/06/10 07:44:55 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s index 86c84753e679f..35b5025643d72 100644 --- a/sys/gnu/i386/fpemul/reg_u_add.s +++ b/sys/gnu/i386/fpemul/reg_u_add.s @@ -62,7 +62,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_add.s,v 1.2 1994/04/29 21:34:23 gclarkii Exp $ + * $Id: reg_u_add.s,v 1.3 1994/06/10 07:44:56 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s index 4952923886a20..7f61b057fd786 100644 --- a/sys/gnu/i386/fpemul/reg_u_div.s +++ b/sys/gnu/i386/fpemul/reg_u_div.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_div.s,v 1.2 1994/04/29 21:34:24 gclarkii Exp $ + * $Id: reg_u_div.s,v 1.3 1994/06/10 07:44:57 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s index 798f2046c8ebc..328d2b07da56b 100644 --- a/sys/gnu/i386/fpemul/reg_u_mul.s +++ b/sys/gnu/i386/fpemul/reg_u_mul.s @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_mul.s,v 1.2 1994/04/29 21:34:25 gclarkii Exp $ + * $Id: reg_u_mul.s,v 1.3 1994/06/10 07:44:58 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s index 3161e190284b2..7d6d8961669e7 100644 --- a/sys/gnu/i386/fpemul/reg_u_sub.s +++ b/sys/gnu/i386/fpemul/reg_u_sub.s @@ -61,7 +61,7 @@ * W. Metzenthen June 1994. * * - * $Id: reg_u_sub.s,v 1.2 1994/04/29 21:34:26 gclarkii Exp $ + * $Id: reg_u_sub.s,v 1.3 1994/06/10 07:44:59 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h index 75b87b4757d1c..e54b36415c9d2 100644 --- a/sys/gnu/i386/fpemul/status_w.h +++ b/sys/gnu/i386/fpemul/status_w.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: status_w.h,v 1.2 1994/04/29 21:34:27 gclarkii Exp $ + * $Id: status_w.h,v 1.3 1994/06/10 07:45:01 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h index 9c08aeda7e2fa..40c4513175a35 100644 --- a/sys/gnu/i386/fpemul/version.h +++ b/sys/gnu/i386/fpemul/version.h @@ -54,7 +54,7 @@ * W. Metzenthen June 1994. * * - * $Id: version.h,v 1.2 1994/04/29 21:34:28 gclarkii Exp $ + * $Id: version.h,v 1.3 1994/06/10 07:45:02 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s index 9de9464485975..2044a682141e1 100644 --- a/sys/gnu/i386/fpemul/wm_shrx.s +++ b/sys/gnu/i386/fpemul/wm_shrx.s @@ -62,7 +62,7 @@ * W. Metzenthen June 1994. * * - * $Id: wm_shrx.s,v 1.2 1994/04/29 21:34:29 gclarkii Exp $ + * $Id: wm_shrx.s,v 1.3 1994/06/10 07:45:03 rich Exp $ * */ diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s index b1bc03b2a9336..cbe0451f5f461 100644 --- a/sys/gnu/i386/fpemul/wm_sqrt.s +++ b/sys/gnu/i386/fpemul/wm_sqrt.s @@ -60,7 +60,7 @@ * W. Metzenthen June 1994. * * - * $Id: wm_sqrt.s,v 1.2 1994/04/29 21:34:30 gclarkii Exp $ + * $Id: wm_sqrt.s,v 1.3 1994/06/10 07:45:04 rich Exp $ * */ diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 2dc4ce0724635..92284b66d0b19 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.2.2.3 1996/06/16 11:50:38 bde Exp $ + * dgb.c $Id: dgb.c,v 1.2.2.4 1996/06/16 11:54:16 bde Exp $ * * Digiboard driver. * diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h index a7898af2341c4..39c3301ccb5dc 100644 --- a/sys/gnu/i386/isa/dgreg.h +++ b/sys/gnu/i386/isa/dgreg.h @@ -1,5 +1,5 @@ /*- - * dgreg.h $Id: dgreg.h,v 1.1.2.1 1995/10/07 04:28:06 davidg Exp $ + * dgreg.h $Id: dgreg.h,v 1.1.2.2 1996/06/16 11:50:40 bde Exp $ * * Digiboard driver. * diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c index 12e2e0507c81a..55efa30874549 100644 --- a/sys/gnu/i386/isa/nic3008.c +++ b/sys/gnu/i386/isa/nic3008.c @@ -1,6 +1,6 @@ -static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.7 1995/09/08 11:06:46 bde Exp $"; +static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.6.4.1 1995/09/14 07:08:44 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.7 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.6.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.7 1995/09/08 11:06:46 bde E * ******************************************************************************* * $Log: nic3008.c,v $ + * Revision 1.6.4.1 1995/09/14 07:08:44 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.7 1995/09/08 11:06:46 bde * Fix benign type mismatches in devsw functions. 82 out of 299 devsw * functions were wrong. diff --git a/sys/gnu/i386/isa/nic3008.h b/sys/gnu/i386/isa/nic3008.h index da82696bde351..c14a9cb9456ae 100644 --- a/sys/gnu/i386/isa/nic3008.h +++ b/sys/gnu/i386/isa/nic3008.h @@ -1,4 +1,4 @@ -static char nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/02/14 15:00:12 jkh Exp $"; /******************************************************************************* * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ * @@ -10,6 +10,15 @@ static char nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr E * ******************************************************************************* * $Log: nic3008.h,v $ + * Revision 1.1 1995/02/14 15:00:12 jkh + * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. + * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. + * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and + * Juergen Krause <jkr@saarlink.de> + * + * This is only one part - the rest to follow in a couple of hours. + * This part is a benign import, since it doesn't affect anything else. + * * ******************************************************************************/ diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c index dad9c1df6e916..4102a69ef2fc3 100644 --- a/sys/gnu/i386/isa/nic3009.c +++ b/sys/gnu/i386/isa/nic3009.c @@ -1,6 +1,6 @@ -static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.7 1995/09/08 11:06:47 bde Exp $"; +static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.6.4.1 1995/09/14 07:08:45 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.7 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.6.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.7 1995/09/08 11:06:47 bde E * ******************************************************************************* * $Log: nic3009.c,v $ + * Revision 1.6.4.1 1995/09/14 07:08:45 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.7 1995/09/08 11:06:47 bde * Fix benign type mismatches in devsw functions. 82 out of 299 devsw * functions were wrong. diff --git a/sys/gnu/i386/isa/nic3009.h b/sys/gnu/i386/isa/nic3009.h index 223619f6a5ca6..12cbbeb9857a9 100644 --- a/sys/gnu/i386/isa/nic3009.h +++ b/sys/gnu/i386/isa/nic3009.h @@ -1,4 +1,4 @@ -static char nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/02/14 15:00:16 jkh Exp $"; /******************************************************************************* * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ * @@ -10,6 +10,15 @@ static char nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr E * ******************************************************************************* * $Log: nic3009.h,v $ + * Revision 1.1 1995/02/14 15:00:16 jkh + * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. + * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. + * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and + * Juergen Krause <jkr@saarlink.de> + * + * This is only one part - the rest to follow in a couple of hours. + * This part is a benign import, since it doesn't affect anything else. + * * ******************************************************************************/ diff --git a/sys/gnu/i386/isa/niccyreg.h b/sys/gnu/i386/isa/niccyreg.h index a9d832849ea0a..b70b48a230d12 100644 --- a/sys/gnu/i386/isa/niccyreg.h +++ b/sys/gnu/i386/isa/niccyreg.h @@ -1,4 +1,4 @@ -static char nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/02/14 15:00:19 jkh Exp $"; /******************************************************************************* * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ * @@ -10,6 +10,15 @@ static char nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jk * ******************************************************************************* * $Log: niccyreg.h,v $ + * Revision 1.1 1995/02/14 15:00:19 jkh + * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. + * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. + * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and + * Juergen Krause <jkr@saarlink.de> + * + * This is only one part - the rest to follow in a couple of hours. + * This part is a benign import, since it doesn't affect anything else. + * * ******************************************************************************/ diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c index 280023d017a64..8241ddad68113 100644 --- a/sys/gnu/isdn/if_ii.c +++ b/sys/gnu/isdn/if_ii.c @@ -1,6 +1,6 @@ -static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.2 1995/02/15 06:28:26 jkh Exp $"; +static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.3 1995/05/30 07:58:00 rgrimes Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.3 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.2 1995/02/15 06:28:26 jkh Exp * ******************************************************************************* * $Log: if_ii.c,v $ + * Revision 1.3 1995/05/30 07:58:00 rgrimes + * Remove trailing whitespace. + * * Revision 1.2 1995/02/15 06:28:26 jkh * Fix up include paths, nuke some warnings. * diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c index 361cc7a95af79..f0f778b263061 100644 --- a/sys/gnu/isdn/iispy.c +++ b/sys/gnu/isdn/iispy.c @@ -1,6 +1,6 @@ -static char _ispyid[] = "@(#)$Id: iispy.c,v 1.4 1995/09/08 11:06:56 bde Exp $"; +static char _ispyid[] = "@(#)$Id: iispy.c,v 1.3.4.1 1995/09/14 07:08:52 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.4 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.3.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char _ispyid[] = "@(#)$Id: iispy.c,v 1.4 1995/09/08 11:06:56 bde Exp * ******************************************************************************* * $Log: iispy.c,v $ + * Revision 1.3.4.1 1995/09/14 07:08:52 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.4 1995/09/08 11:06:56 bde * Fix benign type mismatches in devsw functions. 82 out of 299 devsw * functions were wrong. diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c index b22ae7bb11f8e..3793992eaa783 100644 --- a/sys/gnu/isdn/iitel.c +++ b/sys/gnu/isdn/iitel.c @@ -1,6 +1,6 @@ -static char _itelid[] = "@(#)$Id: iitel.c,v 1.5 1995/09/08 11:06:57 bde Exp $"; +static char _itelid[] = "@(#)$Id: iitel.c,v 1.3.4.1 1995/09/14 07:08:53 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.5 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.3.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char _itelid[] = "@(#)$Id: iitel.c,v 1.5 1995/09/08 11:06:57 bde Exp * ******************************************************************************* * $Log: iitel.c,v $ + * Revision 1.3.4.1 1995/09/14 07:08:53 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.5 1995/09/08 11:06:57 bde * Fix benign type mismatches in devsw functions. 82 out of 299 devsw * functions were wrong. diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c index f579291ab631b..562879f905597 100644 --- a/sys/gnu/isdn/iitty.c +++ b/sys/gnu/isdn/iitty.c @@ -1,6 +1,6 @@ -static char _ittyid[] = "@(#)$Id: iitty.c,v 1.11 1995/07/31 21:28:42 bde Exp $"; +static char _ittyid[] = "@(#)$Id: iitty.c,v 1.5.4.1 1995/09/14 07:08:54 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.11 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.5.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char _ittyid[] = "@(#)$Id: iitty.c,v 1.11 1995/07/31 21:28:42 bde Exp * ******************************************************************************* * $Log: iitty.c,v $ + * Revision 1.5.4.1 1995/09/14 07:08:54 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.11 1995/07/31 21:28:42 bde * Use tsleep() instead of ttysleep() to wait for carrier since a generation * change isn't an error. diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c index 0010b6a6c5856..be3ef158e2a43 100644 --- a/sys/gnu/isdn/isdn.c +++ b/sys/gnu/isdn/isdn.c @@ -1,6 +1,6 @@ -static char _isdnid[] = "@(#)$Id: isdn.c,v 1.5 1995/09/08 11:06:58 bde Exp $"; +static char _isdnid[] = "@(#)$Id: isdn.c,v 1.4.4.1 1995/09/14 07:08:56 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.5 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.4.4.1 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,13 @@ static char _isdnid[] = "@(#)$Id: isdn.c,v 1.5 1995/09/08 11:06:58 bde Exp $ * ******************************************************************************* * $Log: isdn.c,v $ + * Revision 1.4.4.1 1995/09/14 07:08:56 davidg + * Brought in changes from main branch: + * 1) Bruce and Andrey's tty fixes + * 2) many of Bruce's prototype and function argument fixes/corrections + * 3) Bruce's version of the Cyclades driver + * 4) Improvements to the RISCom/8 driver + * * Revision 1.5 1995/09/08 11:06:58 bde * Fix benign type mismatches in devsw functions. 82 out of 299 devsw * functions were wrong. diff --git a/sys/gnu/isdn/isdn_ioctl.h b/sys/gnu/isdn/isdn_ioctl.h index e0475d1812c7b..b6a0bd23e1481 100644 --- a/sys/gnu/isdn/isdn_ioctl.h +++ b/sys/gnu/isdn/isdn_ioctl.h @@ -1,6 +1,6 @@ -static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/02/14 15:00:35 jkh Exp $"; +static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.2 1995/03/28 07:54:45 bde Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,11 @@ static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/02/14 15:00 * ******************************************************************************* * $Log: isdn_ioctl.h,v $ + * Revision 1.2 1995/03/28 07:54:45 bde + * Add and move declarations to fix all of the warnings from `gcc -Wimplicit' + * (except in netccitt, netiso and netns) that I didn't notice when I fixed + * "all" such warnings before. + * * Revision 1.1 1995/02/14 15:00:35 jkh * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. diff --git a/sys/i386/Makefile b/sys/i386/Makefile index 4ad5a34556fb8..755a53cc45671 100644 --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 7.3 (Berkeley) 6/9/91 -# $Id$ +# $Id: Makefile,v 1.2 1993/10/16 19:15:20 rgrimes Exp $ # Makefile for i386 tags file diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 4aa7a4c3acb0b..8d964bd5313a0 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -14,7 +14,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.12.4.14 1996/06/04 17:51:21 nate Exp $ + * $Id: apm.c,v 1.12.4.15 1996/06/06 00:08:47 nate Exp $ */ #include "apm.h" diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile index 3cc1f9d5e00ab..adb25629ec95b 100644 --- a/sys/i386/apm/apm_init/Makefile +++ b/sys/i386/apm/apm_init/Makefile @@ -12,7 +12,7 @@ # # Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) # -# $Id: Makefile,v 1.3 1995/02/17 02:22:30 phk Exp $ +# $Id: Makefile,v 1.4 1995/05/30 07:58:11 rgrimes Exp $ # OBJS = apm_init.o real_prot.o table.o diff --git a/sys/i386/apm/apm_init/apm_init.S b/sys/i386/apm/apm_init/apm_init.S index 393af1c0a0cc9..9167504ec0d33 100644 --- a/sys/i386/apm/apm_init/apm_init.S +++ b/sys/i386/apm/apm_init/apm_init.S @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_init.S,v 1.4.4.2 1996/03/12 21:28:18 nate Exp $ + * $Id: apm_init.S,v 1.4.4.3 1996/04/18 19:26:18 nate Exp $ */ /* diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c index 09c98f450ff19..e9b6384fea9c1 100644 --- a/sys/i386/apm/apm_init/bin2asm.c +++ b/sys/i386/apm/apm_init/bin2asm.c @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: bin2asm.c,v 1.3 1995/02/17 02:22:33 phk Exp $ + * $Id: bin2asm.c,v 1.4 1995/05/30 07:58:13 rgrimes Exp $ */ #include <stdio.h> diff --git a/sys/i386/apm/apm_init/real_prot.S b/sys/i386/apm/apm_init/real_prot.S index fb2d5a7b138fd..989c449ec2aa5 100644 --- a/sys/i386/apm/apm_init/real_prot.S +++ b/sys/i386/apm/apm_init/real_prot.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:13 rpd - * $Id: real_prot.S,v 1.1.8.1 1996/03/11 06:45:37 nate Exp $ + * $Id: real_prot.S,v 1.1.8.2 1996/03/11 21:42:52 nate Exp $ */ diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h index 16fcd823d9de5..621924821431f 100644 --- a/sys/i386/apm/apm_init/real_prot.h +++ b/sys/i386/apm/apm_init/real_prot.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $Id: real_prot.h,v 1.4 1996/01/30 22:53:13 mpp Exp $ + * $Id: real_prot.h,v 1.3.4.1 1996/03/05 04:53:49 nate Exp $ */ /* diff --git a/sys/i386/apm/apm_init/rmaouthdr b/sys/i386/apm/apm_init/rmaouthdr index 47838b0693521..9dc9057ef123f 100644 --- a/sys/i386/apm/apm_init/rmaouthdr +++ b/sys/i386/apm/apm_init/rmaouthdr @@ -1,6 +1,6 @@ #!/bin/csh -f # # from: Mach, Revision 2.2 92/04/04 11:36:01 rpd -# $Id: rmaouthdr,v 1.3 1993/10/16 19:11:37 rgrimes Exp $ +# $Id: rmaouthdr,v 1.1 1994/10/01 02:55:53 davidg Exp $ # dd if=$1 of=$2 ibs=32 skip=1 obs=1024b diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c index b50d60fe803ac..f4d0733487ce4 100644 --- a/sys/i386/apm/apm_init/table.c +++ b/sys/i386/apm/apm_init/table.c @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: table.c,v 1.3 1995/02/17 02:22:34 phk Exp $ + * $Id: table.c,v 1.4 1995/05/30 07:58:18 rgrimes Exp $ */ #include <apm_bios.h> diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h index f5e67efec461b..90874e1a3276f 100644 --- a/sys/i386/apm/apm_setup.h +++ b/sys/i386/apm/apm_setup.h @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_setup.h,v 1.3 1995/02/17 02:22:22 phk Exp $ + * $Id: apm_setup.h,v 1.4 1995/05/30 07:58:08 rgrimes Exp $ */ extern u_long apm_version; diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s index e33260f59f1eb..f31648f7bad19 100644 --- a/sys/i386/apm/apm_setup.s +++ b/sys/i386/apm/apm_setup.s @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_setup.s,v 1.5 1995/02/17 02:22:23 phk Exp $ + * $Id: apm_setup.s,v 1.5.4.1 1996/03/11 06:45:27 nate Exp $ */ #include "apm.h" diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile index 60b0adcab79ef..025d4c77ffcaa 100644 --- a/sys/i386/boot/Makefile +++ b/sys/i386/boot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.25 1995/04/15 08:24:33 phk Exp $ +# $Id: Makefile,v 1.25.4.1 1996/11/08 05:21:01 jkh Exp $ SUBDIR= biosboot netboot dosboot kzipboot rawboot diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 3fab7d4cc633c..a66252521a454 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.51 1996/11/02 02:24:30 pst Exp $ +# $Id: Makefile,v 1.30.4.3 1996/11/12 12:42:05 jkh Exp $ # PROG= boot diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD index 793762e2bd7bf..863bedd56e602 100644 --- a/sys/i386/boot/biosboot/README.386BSD +++ b/sys/i386/boot/biosboot/README.386BSD @@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct disktab and bootblock files on it so that if it doesn't work, you can re-disklabel from the floppy. -$Id: README.386BSD,v 1.7 1996/07/12 05:17:37 bde Exp $ +$Id: README.386BSD,v 1.3.4.2 1996/11/12 12:42:10 jkh Exp $ diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH index cb6232936e281..9de108123bd2d 100644 --- a/sys/i386/boot/biosboot/README.MACH +++ b/sys/i386/boot/biosboot/README.MACH @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:33:55 rpd - * $Id$ + * $Id: README.MACH,v 1.3 1993/10/16 19:11:26 rgrimes Exp $ */ ********NOTE: This is not all relevant to the 386BSD version********** diff --git a/sys/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial index 8ace5051afc06..8f415452f91aa 100644 --- a/sys/i386/boot/biosboot/README.serial +++ b/sys/i386/boot/biosboot/README.serial @@ -161,4 +161,4 @@ CAVEATS: from the new kernel. -$Id: README.serial,v 1.5 1996/04/13 11:57:18 jkh Exp $ +$Id: README.serial,v 1.3.4.2 1996/11/12 12:42:16 jkh Exp $ diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S index e689817466268..6621972444277 100644 --- a/sys/i386/boot/biosboot/asm.S +++ b/sys/i386/boot/biosboot/asm.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:13 rpd - * $Id: asm.S,v 1.9 1996/03/08 07:27:52 bde Exp $ + * $Id: asm.S,v 1.6.4.2 1996/11/12 12:42:28 jkh Exp $ */ diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h index e279ac9d404df..1865e479c208d 100644 --- a/sys/i386/boot/biosboot/asm.h +++ b/sys/i386/boot/biosboot/asm.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $Id: asm.h,v 1.6 1996/07/12 05:42:01 bde Exp $ + * $Id: asm.h,v 1.4.4.1 1996/11/12 12:42:32 jkh Exp $ */ #define S_ARG0 4(%esp) diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S index 33055a80eadf3..b3c5d691cc288 100644 --- a/sys/i386/boot/biosboot/bios.S +++ b/sys/i386/boot/biosboot/bios.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $Id: bios.S,v 1.6 1996/11/11 14:03:33 bde Exp $ + * $Id: bios.S,v 1.4.6.2 1996/11/12 12:42:37 jkh Exp $ */ /* diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index c070f2c4b305b..d82fa20451578 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.60 1996/10/08 22:41:34 bde Exp $ + * $Id: boot.c,v 1.44.2.6 1996/11/12 12:42:42 jkh Exp $ */ diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h index 7724634fdd043..358170353c980 100644 --- a/sys/i386/boot/biosboot/boot.h +++ b/sys/i386/boot/biosboot/boot.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd - * $Id: boot.h,v 1.14 1996/10/08 22:25:19 bde Exp $ + * $Id: boot.h,v 1.10.4.2 1996/11/12 12:42:47 jkh Exp $ */ #include <sys/param.h> diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S index b27218875b798..d1269cffad565 100644 --- a/sys/i386/boot/biosboot/boot2.S +++ b/sys/i386/boot/biosboot/boot2.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:26 rpd - * $Id: boot2.S,v 1.9 1996/09/04 18:28:36 julian Exp $ + * $Id: boot2.S,v 1.6.4.1 1996/11/12 12:42:52 jkh Exp $ */ #include "asm.h" diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c index 14cd9f952ff08..6e81649296793 100644 --- a/sys/i386/boot/biosboot/disk.c +++ b/sys/i386/boot/biosboot/disk.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $Id: disk.c,v 1.22 1996/10/08 22:31:31 bde Exp $ + * $Id: disk.c,v 1.13.4.4 1996/11/12 12:43:03 jkh Exp $ */ /* diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c index fd8531e22484b..d91affe8f3deb 100644 --- a/sys/i386/boot/biosboot/io.c +++ b/sys/i386/boot/biosboot/io.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.19 1996/04/30 23:43:25 bde Exp $ + * $Id: io.c,v 1.14.4.2 1996/11/12 12:43:12 jkh Exp $ */ #include "boot.h" diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c index acba42ef9fefe..7aa3bbd2631fc 100644 --- a/sys/i386/boot/biosboot/probe_keyboard.c +++ b/sys/i386/boot/biosboot/probe_keyboard.c @@ -42,7 +42,7 @@ * * This grody hack brought to you by Bill Paul (wpaul@ctr.columbia.edu) * - * $Id: probe_keyboard.c,v 1.7 1996/09/26 20:52:13 pst Exp $ + * $Id: probe_keyboard.c,v 1.5.4.1 1996/11/12 12:43:19 jkh Exp $ */ #ifdef PROBE_KEYBOARD diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S index 356f82ee8d0db..37127eb9d0a06 100644 --- a/sys/i386/boot/biosboot/serial.S +++ b/sys/i386/boot/biosboot/serial.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $Id: serial.S,v 1.4 1996/11/02 02:24:39 pst Exp $ + * $Id: serial.S,v 1.3.4.1 1996/11/12 12:43:25 jkh Exp $ */ /* diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S index ecde7be65348d..e102ba19497f0 100644 --- a/sys/i386/boot/biosboot/start.S +++ b/sys/i386/boot/biosboot/start.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:29 rpd - * $Id: start.S,v 1.8 1996/07/12 05:42:02 bde Exp $ + * $Id: start.S,v 1.5.8.2 1996/11/12 12:43:27 jkh Exp $ */ /* diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c index 6a82f5ec3c7a3..69f0727795092 100644 --- a/sys/i386/boot/biosboot/sys.c +++ b/sys/i386/boot/biosboot/sys.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $Id: sys.c,v 1.16 1996/09/24 08:05:51 bde Exp $ + * $Id: sys.c,v 1.9.4.3 1996/11/12 12:43:30 jkh Exp $ */ #include "boot.h" diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c index d93743f770bde..227c9ad1d1d47 100644 --- a/sys/i386/boot/biosboot/table.c +++ b/sys/i386/boot/biosboot/table.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:43 rpd - * $Id: table.c,v 1.13 1996/09/14 07:12:02 bde Exp $ + * $Id: table.c,v 1.7.4.4 1996/11/12 12:43:39 jkh Exp $ */ /* diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile index 4646bbb0c229a..9e308f9a87b1a 100644 --- a/sys/i386/boot/dosboot/Makefile +++ b/sys/i386/boot/dosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/03/28 19:22:43 phk Exp $ +# $Id: Makefile,v 1.2 1995/05/30 07:58:41 rgrimes Exp $ # MPROG= fbsdboot.exe diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h index 4acad948f68e2..66662e62e39c1 100644 --- a/sys/i386/boot/dosboot/ansi.h +++ b/sys/i386/boot/dosboot/ansi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ansi.h 7.1 (Berkeley) 3/9/91 - * $Id: ansi.h,v 1.2 1993/10/16 14:39:05 rgrimes Exp $ + * $Id: ansi.h,v 1.2 1995/04/27 18:22:12 phk Exp $ */ #ifndef _ANSI_H_ diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c index 8482279bea24d..07de5b2baa658 100644 --- a/sys/i386/boot/dosboot/boot.c +++ b/sys/i386/boot/dosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.9.2.1 1994/05/01 05:14:49 rgrimes Exp $ + * $Id: boot.c,v 1.2 1995/04/27 18:22:13 phk Exp $ */ diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h index 322610f6ab0b9..c7c7939aef8c6 100644 --- a/sys/i386/boot/dosboot/boot.h +++ b/sys/i386/boot/dosboot/boot.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd - * $Id: boot.h,v 1.3 1993/10/16 19:11:32 rgrimes Exp $ + * $Id: boot.h,v 1.2 1995/04/27 18:22:14 phk Exp $ */ #include "types.h" diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h index 8315158db1cb8..484c24968da38 100644 --- a/sys/i386/boot/dosboot/bootinfo.h +++ b/sys/i386/boot/dosboot/bootinfo.h @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.h,v 1.3 1994/11/18 05:26:52 phk Exp $ + * $Id: bootinfo.h,v 1.2 1995/04/27 18:22:15 phk Exp $ */ #ifndef _MACHINE_BOOTINFO_H_ diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h index 09995d4a391d3..263d2169c87c5 100644 --- a/sys/i386/boot/dosboot/cdefs.h +++ b/sys/i386/boot/dosboot/cdefs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)cdefs.h 8.1 (Berkeley) 6/2/93 - * $Id: cdefs.h,v 1.6 1993/10/16 17:16:24 rgrimes Exp $ + * $Id: cdefs.h,v 1.2 1995/04/27 18:22:15 phk Exp $ */ #ifndef _CDEFS_H_ diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h index adfac172282e7..0f676346f46a2 100644 --- a/sys/i386/boot/dosboot/dinode.h +++ b/sys/i386/boot/dosboot/dinode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)dinode.h 7.10 (Berkeley) 5/8/91 - * $Id: dinode.h,v 1.5 1993/12/19 22:51:07 alm Exp $ + * $Id: dinode.h,v 1.2 1995/04/27 18:22:16 phk Exp $ */ #ifndef _UFS_DINODE_H_ diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h index bc02fde23d7e2..6bb49d0b103e9 100644 --- a/sys/i386/boot/dosboot/dir.h +++ b/sys/i386/boot/dosboot/dir.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)dir.h 7.3 (Berkeley) 2/5/91 - * $Id: dir.h,v 1.2 1993/10/16 17:16:31 rgrimes Exp $ + * $Id: dir.h,v 1.2 1995/04/27 18:22:17 phk Exp $ */ /* diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c index 0a5fcec9b86fc..7460fe4ff2fd4 100644 --- a/sys/i386/boot/dosboot/disk.c +++ b/sys/i386/boot/dosboot/disk.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $Id: disk.c,v 1.4 1994/02/22 22:59:40 rgrimes Exp $ + * $Id: disk.c,v 1.2 1995/04/27 18:22:17 phk Exp $ */ #include <stdio.h> #include <memory.h> diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h index c155df5783982..99d23cd959681 100644 --- a/sys/i386/boot/dosboot/disklabe.h +++ b/sys/i386/boot/dosboot/disklabe.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.1 (Berkeley) 6/2/93 - * $Id: disklabel.h,v 1.8 1994/11/14 13:08:44 bde Exp $ + * $Id: disklabe.h,v 1.2 1995/04/27 18:22:18 phk Exp $ */ #ifndef _SYS_DISKLABEL_H_ diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h index 33f1c5373ae60..15fd0fa89ba4f 100644 --- a/sys/i386/boot/dosboot/dkbad.h +++ b/sys/i386/boot/dosboot/dkbad.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dkbad.h 8.1 (Berkeley) 6/2/93 - * $Id: dkbad.h,v 1.5 1995/04/15 23:21:28 bde Exp $ + * $Id: dkbad.h,v 1.2 1995/04/27 18:22:19 phk Exp $ */ #ifndef _SYS_DKBAD_H_ diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h index ff7dad5b10bf6..2d60bac9ad40c 100644 --- a/sys/i386/boot/dosboot/endian.h +++ b/sys/i386/boot/dosboot/endian.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $Id: endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp $ + * $Id: endian.h,v 1.2 1995/04/27 18:22:21 phk Exp $ */ #ifndef _MACHINE_ENDIAN_H_ diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h index 6f6a9e97ee1ca..45e5c58d0e2af 100644 --- a/sys/i386/boot/dosboot/exec.h +++ b/sys/i386/boot/dosboot/exec.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 1/21/94 - * $Id: exec.h,v 1.9 1994/10/09 21:50:57 sos Exp $ + * $Id: exec.h,v 1.2 1995/04/27 18:22:22 phk Exp $ */ #ifndef _SYS_EXEC_H_ diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h index 68ccd98040f22..9db12c9051615 100644 --- a/sys/i386/boot/dosboot/fs.h +++ b/sys/i386/boot/dosboot/fs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fs.h 7.12 (Berkeley) 5/8/91 - * $Id: fs.h,v 1.6 1993/12/19 22:51:09 alm Exp $ + * $Id: fs.h,v 1.2 1995/04/27 18:22:25 phk Exp $ */ #ifndef _UFS_FS_H_ diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h index dde841e1ea834..c8ae79b4256ea 100644 --- a/sys/i386/boot/dosboot/imgact.h +++ b/sys/i386/boot/dosboot/imgact.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id: imgact_aout.h,v 1.1 1994/09/24 21:09:18 davidg Exp $ + * $Id: imgact.h,v 1.2 1995/04/27 18:22:26 phk Exp $ */ #ifndef _IMGACT_AOUT_H_ diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h index 9f9310b0416e0..843cd8b57e02b 100644 --- a/sys/i386/boot/dosboot/inode.h +++ b/sys/i386/boot/dosboot/inode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)inode.h 7.17 (Berkeley) 5/8/91 - * $Id: inode.h,v 1.6 1993/12/19 00:55:37 wollman Exp $ + * $Id: inode.h,v 1.2 1995/04/27 18:22:27 phk Exp $ */ #ifndef _UFS_INODE_H_ diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h index dbaf8f2b28ab1..7b043382bb2c3 100644 --- a/sys/i386/boot/dosboot/mexec.h +++ b/sys/i386/boot/dosboot/mexec.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id: exec.h,v 1.5 1994/09/24 21:36:38 davidg Exp $ + * $Id: mexec.h,v 1.2 1995/04/27 18:22:28 phk Exp $ */ #ifndef _EXEC_H_ diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h index 67882bfb70b38..d24cf4e36e202 100644 --- a/sys/i386/boot/dosboot/param.h +++ b/sys/i386/boot/dosboot/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.16 1994/09/18 22:05:22 bde Exp $ + * $Id: param.h,v 1.2 1995/04/27 18:22:28 phk Exp $ */ #ifndef _MACHINE_PARAM_H_ diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h index e1d72077748d8..a7be1041bc684 100644 --- a/sys/i386/boot/dosboot/quota.h +++ b/sys/i386/boot/dosboot/quota.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)quota.h 7.9 (Berkeley) 2/22/91 - * $Id: quota.h,v 1.3 1993/11/25 01:38:27 wollman Exp $ + * $Id: quota.h,v 1.2 1995/04/27 18:22:31 phk Exp $ */ #ifndef _QUOTA_ diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h index 51b5f1f98f756..63b67f41f23dd 100644 --- a/sys/i386/boot/dosboot/reboot.h +++ b/sys/i386/boot/dosboot/reboot.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reboot.h 8.1 (Berkeley) 6/2/93 - * $Id: reboot.h,v 1.7 1994/11/26 09:08:40 phk Exp $ + * $Id: reboot.h,v 1.2 1995/04/27 18:22:32 phk Exp $ */ #ifndef _SYS_REBOOT_H_ diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c index 172545cc7235b..a15ab92ec7da9 100644 --- a/sys/i386/boot/dosboot/sys.c +++ b/sys/i386/boot/dosboot/sys.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $Id: sys.c,v 1.3 1993/10/16 19:11:39 rgrimes Exp $ + * $Id: sys.c,v 1.2 1995/04/27 18:22:33 phk Exp $ */ #include <stdio.h> #include <string.h> diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h index 007dbc615fcc7..99e832d87c612 100644 --- a/sys/i386/boot/dosboot/syslimit.h +++ b/sys/i386/boot/dosboot/syslimit.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)syslimits.h 7.4 (Berkeley) 2/4/91 - * $Id: syslimits.h,v 1.4 1994/01/20 22:57:32 davidg Exp $ + * $Id: syslimit.h,v 1.2 1995/04/27 18:22:34 phk Exp $ */ #ifndef _SYS_SYSLIMITS_H_ diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h index 6331d6932ff92..facbfb176ce50 100644 --- a/sys/i386/boot/dosboot/sysparam.h +++ b/sys/i386/boot/dosboot/sysparam.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.2 (Berkeley) 1/21/94 - * $Id: param.h,v 1.5 1994/09/01 05:12:51 davidg Exp $ + * $Id: sysparam.h,v 1.2 1995/04/27 18:22:35 phk Exp $ */ #ifndef _SYS_PARAM_H_ diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h index 77d83731065ec..ebebca5d65329 100644 --- a/sys/i386/boot/dosboot/types.h +++ b/sys/i386/boot/dosboot/types.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.4 (Berkeley) 1/21/94 - * $Id: types.h,v 1.4 1994/09/25 15:56:25 davidg Exp $ + * $Id: types.h,v 1.2 1995/04/27 18:22:36 phk Exp $ */ #ifndef _SYS_TYPES_H_ diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile index d24eb59bc767e..ce95244feb050 100644 --- a/sys/i386/boot/kzipboot/Makefile +++ b/sys/i386/boot/kzipboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1995/10/06 02:57:22 peter Exp $ +# $Id: Makefile,v 1.2.4.5 1996/11/12 13:44:20 jkh Exp $ PROG= kztail.o kzhead.o BINMODE = 444 # target is a relocatable object diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c index 9ebfe5d3ae2c2..47678602110ce 100644 --- a/sys/i386/boot/netboot/3c509.c +++ b/sys/i386/boot/netboot/3c509.c @@ -18,7 +18,7 @@ Author: Martin Renters. 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su) -$Id: 3c509.c,v 1.1 1995/04/12 20:14:56 martin Exp $ +$Id: 3c509.c,v 1.2 1995/05/30 07:58:52 rgrimes Exp $ ***************************************************************************/ diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile index 67afb4ff852f9..886994ebb03ab 100644 --- a/sys/i386/boot/rawboot/Makefile +++ b/sys/i386/boot/rawboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/10/15 16:26:05 bde Exp $ +# $Id: Makefile,v 1.3.4.1 1996/11/08 09:30:44 jkh Exp $ # PROG= boot diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 58479890fda76..8a7ab6deaa6e2 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.46.2.18 1996/07/16 08:53:04 davidg Exp $ +# $Id: GENERIC,v 1.46.2.19 1996/10/16 02:20:56 jkh Exp $ # machine "i386" diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index db3a9ff5bec54..8538559c600a2 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.184.4.26 1996/11/06 12:41:56 joerg Exp $ +# $Id: LINT,v 1.184.4.27 1996/11/10 11:21:15 asami Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 27017c1f6f2a7..affe102ea7116 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.64.4.2 1996/04/27 07:31:40 joerg Exp $ +# $Id: Makefile.i386,v 1.64.4.3 1996/05/02 21:43:04 joerg Exp $ # # Makefile for FreeBSD # diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386 index 904a399e93fa5..cc28d24e53590 100644 --- a/sys/i386/conf/devices.i386 +++ b/sys/i386/conf/devices.i386 @@ -1,6 +1,6 @@ # This file tells what major numbers the various possible swap devices have. # -# $Id: devices.i386,v 1.9 1995/08/19 15:59:25 joerg Exp $ +# $Id: devices.i386,v 1.8.4.1 1995/09/14 23:47:09 jkh Exp $ # wd 0 dk 1 diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 912488c5c1409..473ed61715198 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.98.4.11 1996/06/25 20:19:01 markm Exp $ +# $Id: files.i386,v 1.98.4.12 1996/11/04 22:15:55 guido Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386 index da1bacbddb90c..b5b97cbb63041 100644 --- a/sys/i386/conf/majors.i386 +++ b/sys/i386/conf/majors.i386 @@ -1,4 +1,4 @@ -$Id: majors.i386,v 1.2.2.2 1996/05/03 06:02:45 asami Exp $ +$Id: majors.i386,v 1.2.2.3 1996/06/23 23:24:30 peter Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c index a12514cf27d4b..972f0cbc40681 100644 --- a/sys/i386/eisa/3c5x9.c +++ b/sys/i386/eisa/3c5x9.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: 3c5x9.c,v 1.2 1996/02/28 17:18:55 gibbs Exp $ + * $Id: 3c5x9.c,v 1.2.2.1 1996/04/01 00:14:11 gibbs Exp $ */ #include "eisa.h" diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 2735d38feeec5..2bb1a00b7099b 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.45.2.2 1996/04/01 00:14:12 gibbs Exp $ + * $Id: aha1742.c,v 1.45.2.3 1996/05/21 23:33:36 dima Exp $ */ #include <sys/types.h> diff --git a/sys/i386/eisa/aic7770.c b/sys/i386/eisa/aic7770.c index 292c0d8b49d57..d5bb4c885b44b 100644 --- a/sys/i386/eisa/aic7770.c +++ b/sys/i386/eisa/aic7770.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7770.c,v 1.21.2.5 1996/10/06 16:42:11 gibbs Exp $ + * $Id: aic7770.c,v 1.21.2.6 1997/02/12 18:36:15 gibbs Exp $ */ #if defined(__FreeBSD__) diff --git a/sys/i386/eisa/bt74x.c b/sys/i386/eisa/bt74x.c index 462061c29c7bb..9812757f9d4b1 100644 --- a/sys/i386/eisa/bt74x.c +++ b/sys/i386/eisa/bt74x.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: bt74x.c,v 1.4 1996/01/31 18:02:18 gibbs Exp $ + * $Id: bt74x.c,v 1.2.2.1 1996/04/01 00:14:14 gibbs Exp $ */ #include "eisa.h" diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c index 79f68dcf61203..70f1a13768ab7 100644 --- a/sys/i386/eisa/eisaconf.c +++ b/sys/i386/eisa/eisaconf.c @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.c,v 1.15 1996/01/31 18:46:36 gibbs Exp $ + * $Id: eisaconf.c,v 1.2.4.2 1996/04/01 00:14:15 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h index c9c4a31d5f2ac..0a59b7cffe3fe 100644 --- a/sys/i386/eisa/eisaconf.h +++ b/sys/i386/eisa/eisaconf.h @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: eisaconf.h,v 1.8 1996/01/30 22:53:51 mpp Exp $ + * $Id: eisaconf.h,v 1.2.4.2 1996/04/01 00:14:16 gibbs Exp $ */ #ifndef _I386_EISA_EISACONF_H_ diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 3d305f7700c5d..b56fe39860540 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.33.4.2 1996/06/02 19:24:05 joerg Exp $ + * $Id: autoconf.c,v 1.33.4.4 1996/06/05 19:48:59 nate Exp $ */ /* diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index f894c18ed7f9e..d0d653e361834 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.85.4.8 1996/06/23 23:24:32 peter Exp $ + * $Id: conf.c,v 1.85.4.9 1996/06/25 20:19:22 markm Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index 9834b88281594..ac2700d4d0fb7 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.28.4.1 1995/08/23 05:17:52 davidg Exp $ + * $Id: cons.c,v 1.28.4.2 1996/11/15 23:40:41 jkh Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h index d99c3e5b06ea3..25f73db5d18ff 100644 --- a/sys/i386/i386/cons.h +++ b/sys/i386/i386/cons.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.h 7.2 (Berkeley) 5/9/91 - * $Id: cons.h,v 1.8 1995/04/23 12:55:55 bde Exp $ + * $Id: cons.h,v 1.9 1995/04/24 16:43:01 bde Exp $ */ #ifndef _MACHINE_CONS_H_ diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 8ce7365a7ac91..5ec95baa4632b 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.8 1995/01/29 02:38:15 bde Exp $ + * $Id: db_disasm.c,v 1.9 1995/05/30 07:59:20 rgrimes Exp $ */ /* diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 8daa0a27aa320..16a62024fbfec 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_interface.c,v 1.13 1995/04/08 21:31:53 joerg Exp $ + * $Id: db_interface.c,v 1.14 1995/05/30 07:59:22 rgrimes Exp $ */ /* diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 059ea01ceb38f..5e91dd8f40047 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.11 1995/05/30 07:59:23 rgrimes Exp $ + * $Id: db_trace.c,v 1.11.4.1 1996/01/30 09:19:18 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/dkbad.c b/sys/i386/i386/dkbad.c index cc70487ae3048..0e963fc9f6a00 100644 --- a/sys/i386/i386/dkbad.c +++ b/sys/i386/i386/dkbad.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)dkbad.c 5.4 (Berkeley) 1/19/91 - * $Id: dkbad.c,v 1.3 1993/12/19 00:50:01 wollman Exp $ + * $Id: dkbad.c,v 1.4 1994/08/13 03:49:38 wollman Exp $ */ diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 613a58383626c..14e33991a532c 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.9.2.2 1996/01/13 10:46:22 davidg Exp $ + * $Id: exception.s,v 1.9.2.3 1996/01/30 09:19:25 davidg Exp $ */ #include "npx.h" /* NNPX */ diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index a5261849d80e0..552cc9a336c10 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.26 1995/05/25 07:41:18 davidg Exp $ + * $Id: genassym.c,v 1.27 1995/05/30 07:59:25 rgrimes Exp $ */ #include <stdio.h> diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c index 1764a58da93bb..4c79e22ff5518 100644 --- a/sys/i386/i386/in_cksum.c +++ b/sys/i386/i386/in_cksum.c @@ -32,7 +32,7 @@ * * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 - * $Id: in_cksum.c,v 1.6 1994/08/13 03:49:39 wollman Exp $ + * $Id: in_cksum.c,v 1.7 1995/05/30 07:59:31 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 9fbfdcee20042..98e1e20e39211 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.52.4.5 1996/11/14 15:55:40 jkh Exp $ + * $Id: locore.s,v 1.52.4.6 1997/02/05 05:27:14 davidg Exp $ */ /* diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 55dd56f4685ac..facc2a94abe0c 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.128.4.9 1996/10/16 02:16:00 jkh Exp $ + * $Id: machdep.c,v 1.128.4.10 1996/11/13 12:03:17 jkh Exp $ */ #include "npx.h" diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h index 453a903554a62..a29ebdebe5562 100644 --- a/sys/i386/i386/math_emu.h +++ b/sys/i386/i386/math_emu.h @@ -3,7 +3,7 @@ * * (C) 1991 Linus Torvalds * - * $Id$ + * $Id: math_emu.h,v 1.2 1993/10/16 14:15:02 rgrimes Exp $ */ #ifndef _LINUX_MATH_EMU_H #define _LINUX_MATH_EMU_H diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c index 392a18950eb8c..330c6bcd572fa 100644 --- a/sys/i386/i386/math_emulate.c +++ b/sys/i386/i386/math_emulate.c @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $Id: math_emulate.c,v 1.12 1995/05/30 07:59:35 rgrimes Exp $ + * $Id: math_emulate.c,v 1.12.4.1 1995/08/23 07:20:29 davidg Exp $ */ /* diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 6ac1b456fcec3..6f76383078e88 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.9.8.2 1995/09/20 13:04:07 davidg Exp $ + * $Id: mem.c,v 1.9.8.3 1996/06/25 20:19:31 markm Exp $ */ /* diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s index 3986ca2648815..149a29b71c8c8 100644 --- a/sys/i386/i386/microtime.s +++ b/sys/i386/i386/microtime.s @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.7 1994/11/05 23:53:46 bde Exp $ + * $Id: microtime.s,v 1.7.8.1 1996/07/02 12:46:28 davidg Exp $ */ #include <machine/asmacros.h> diff --git a/sys/i386/i386/ns_cksum.c b/sys/i386/i386/ns_cksum.c index 142c9f827eec1..402b56fb69c11 100644 --- a/sys/i386/i386/ns_cksum.c +++ b/sys/i386/i386/ns_cksum.c @@ -32,7 +32,7 @@ * * from: @(#)ns_cksum.c 7.7 (Berkeley) 4/29/91 * from NetBSD: ns_cksum.c,v 1.2 1993/05/22 07:59:55 cgd Exp - * $Id: ns_cksum.c,v 1.2 1993/12/19 00:50:07 wollman Exp $ + * $Id: ns_cksum.c,v 1.3 1994/08/13 03:49:43 wollman Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index c3e2561af38cd..537c533118a31 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.58.4.6 1996/06/26 06:18:10 davidg Exp $ + * $Id: pmap.c,v 1.58.4.7 1997/02/05 05:27:15 davidg Exp $ */ /* diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c index 1b51d06a6eef2..d29baa2dfa8e0 100644 --- a/sys/i386/i386/procfs_machdep.c +++ b/sys/i386/i386/procfs_machdep.c @@ -37,7 +37,7 @@ * @(#)procfs_machdep.c 8.3 (Berkeley) 1/27/94 * * From: - * $Id: procfs_machdep.c,v 1.3 1995/01/14 13:20:09 bde Exp $ + * $Id: procfs_machdep.c,v 1.4 1995/03/16 18:11:29 bde Exp $ */ /* diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index db0fa03c5e4ed..3bca98aa65426 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: support.s,v 1.21 1995/03/11 03:49:50 phk Exp $ + * $Id: support.s,v 1.22 1995/05/02 05:20:26 davidg Exp $ */ #include "assym.s" /* system definitions */ diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c index a33796bec850e..36770b553c738 100644 --- a/sys/i386/i386/swapgeneric.c +++ b/sys/i386/i386/swapgeneric.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91 - * $Id: swapgeneric.c,v 1.10.4.2 1996/06/22 13:03:56 joerg Exp $ + * $Id: swapgeneric.c,v 1.10.4.3 1996/06/24 14:30:32 joerg Exp $ */ #include <sys/param.h> diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index 7586cf0c77b34..4406d73dd7ec6 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.20.4.7 1996/03/19 17:06:22 nate Exp $ + * $Id: swtch.s,v 1.20.4.8 1996/06/27 00:46:20 jdp Exp $ */ #include "npx.h" /* for NNPX */ diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw index a2193bab8d197..aae5c07d6bbd5 100644 --- a/sys/i386/i386/symbols.raw +++ b/sys/i386/i386/symbols.raw @@ -1,6 +1,6 @@ # @(#)symbols.raw 7.6 (Berkeley) 5/8/91 # -# $Id: symbols.raw,v 1.4 1994/10/09 07:34:30 davidg Exp $ +# $Id: symbols.raw,v 1.4.8.1 1995/08/23 07:24:58 davidg Exp $ # diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 3c4f1cc264c31..f68d0d4c03027 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $Id: sys_machdep.c,v 1.8 1995/03/10 08:13:07 davidg Exp $ + * $Id: sys_machdep.c,v 1.9 1995/05/30 07:59:40 rgrimes Exp $ * */ diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 489c37b09ddf0..6b58731d0672a 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.53.2.4 1996/01/13 10:46:30 davidg Exp $ + * $Id: trap.c,v 1.53.2.5 1996/06/27 16:44:29 jdp Exp $ */ /* diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 2cccfad8d2eda..0b00fbc653db9 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (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: userconfig.c,v 1.28.4.7 1996/11/13 12:07:38 jkh Exp $ + ** $Id: userconfig.c,v 1.28.4.8 1996/11/15 08:10:10 jkh Exp $ **/ /** @@ -2222,7 +2222,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.28.4.7 1996/11/13 12:07:38 jkh Exp $ + * $Id: userconfig.c,v 1.28.4.8 1996/11/15 08:10:10 jkh Exp $ */ #include "scbus.h" diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 623e000125f20..5338c5a544cd0 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.39.4.3 1996/06/20 01:55:54 davidg Exp $ + * $Id: vm_machdep.c,v 1.39.4.4 1996/06/20 08:08:29 davidg Exp $ */ #include "npx.h" diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h index 0a25b84ee5840..468908376a94d 100644 --- a/sys/i386/ibcs2/coff.h +++ b/sys/i386/ibcs2/coff.h @@ -26,7 +26,7 @@ * (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: coff.h,v 1.1 1994/10/12 19:37:16 sos Exp $ + * $Id: coff.h,v 1.1 1994/10/14 08:53:14 sos Exp $ */ #ifndef _COFF_H diff --git a/sys/i386/ibcs2/ibcs2.h b/sys/i386/ibcs2/ibcs2.h index 8e2573bc52d2f..197823f495111 100644 --- a/sys/i386/ibcs2/ibcs2.h +++ b/sys/i386/ibcs2/ibcs2.h @@ -26,7 +26,7 @@ * (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: ibcs2.h,v 1.4 1995/05/30 07:59:50 rgrimes Exp $ + * $Id: ibcs2.h,v 1.4.4.1 1996/02/22 19:20:44 peter Exp $ */ /* trace all iBCS2 system calls */ diff --git a/sys/i386/ibcs2/ibcs2_dummy.c b/sys/i386/ibcs2/ibcs2_dummy.c index 7a7c10275fafe..9fba1318f7429 100644 --- a/sys/i386/ibcs2/ibcs2_dummy.c +++ b/sys/i386/ibcs2/ibcs2_dummy.c @@ -26,7 +26,7 @@ * (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: ibcs2_dummy.c,v 1.1 1994/10/14 08:52:59 sos Exp $ + * $Id: ibcs2_dummy.c,v 1.2 1995/05/30 07:59:51 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_file.c b/sys/i386/ibcs2/ibcs2_file.c index c6217582a1797..5e160419cf435 100644 --- a/sys/i386/ibcs2/ibcs2_file.c +++ b/sys/i386/ibcs2/ibcs2_file.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_file.c,v 1.2 1994/12/14 22:03:48 sos Exp $ + * $Id: ibcs2_file.c,v 1.3 1995/05/30 07:59:53 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 2f2a6cb8a67cf..1f5beda9da16b 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -26,7 +26,7 @@ * (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: ibcs2_ioctl.c,v 1.3 1994/10/23 19:19:42 sos Exp $ + * $Id: ibcs2_ioctl.c,v 1.4 1995/05/30 07:59:54 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c index e2e5a5b81fcf5..c267249feb790 100644 --- a/sys/i386/ibcs2/ibcs2_ipc.c +++ b/sys/i386/ibcs2/ibcs2_ipc.c @@ -25,7 +25,7 @@ * (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: ibcs2_ipc.c,v 1.1 1994/10/14 08:53:04 sos Exp $ + * $Id: ibcs2_ipc.c,v 1.2 1995/05/30 07:59:56 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c index a6c9dbd09593b..493e71097ff99 100644 --- a/sys/i386/ibcs2/ibcs2_isc.c +++ b/sys/i386/ibcs2/ibcs2_isc.c @@ -26,7 +26,7 @@ * (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: ibcs2_isc.c,v 1.3 1995/04/30 11:30:12 ache Exp $ + * $Id: ibcs2_isc.c,v 1.4 1995/05/30 07:59:58 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 742f211fd0560..57bafc162e3e7 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_misc.c,v 1.4 1995/05/02 17:14:38 ache Exp $ + * $Id: ibcs2_misc.c,v 1.5 1995/05/30 07:59:59 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c index 3171c2c2ea5a7..ab8d2898004af 100644 --- a/sys/i386/ibcs2/ibcs2_signal.c +++ b/sys/i386/ibcs2/ibcs2_signal.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_signal.c,v 1.1 1994/10/14 08:53:07 sos Exp $ + * $Id: ibcs2_signal.c,v 1.2 1995/05/30 08:00:06 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c index a1a52ad50851d..a8c22fdf06200 100644 --- a/sys/i386/ibcs2/ibcs2_socksys.c +++ b/sys/i386/ibcs2/ibcs2_socksys.c @@ -28,7 +28,7 @@ * (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: ibcs2_socksys.c,v 1.2 1994/10/17 22:13:08 sos Exp $ + * $Id: ibcs2_socksys.c,v 1.3 1995/05/30 08:00:07 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h index fc5b2e2fa9633..5229872397b68 100644 --- a/sys/i386/ibcs2/ibcs2_socksys.h +++ b/sys/i386/ibcs2/ibcs2_socksys.h @@ -28,7 +28,7 @@ * (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: ibcs2_socksys.h,v 1.2 1994/10/17 22:13:10 sos Exp $ + * $Id: ibcs2_socksys.h,v 1.3 1995/05/30 08:00:09 rgrimes Exp $ */ struct ss_call { diff --git a/sys/i386/ibcs2/ibcs2_stats.c b/sys/i386/ibcs2/ibcs2_stats.c index eee1ef4ca155a..642ec2dada962 100644 --- a/sys/i386/ibcs2/ibcs2_stats.c +++ b/sys/i386/ibcs2/ibcs2_stats.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ibcs2_stats.c,v 1.1 1994/10/14 08:53:09 sos Exp $ + * $Id: ibcs2_stats.c,v 1.2 1995/05/30 08:00:11 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c index 23ce9ce927cb8..3d7fdfd7b5ef4 100644 --- a/sys/i386/ibcs2/ibcs2_sysent.c +++ b/sys/i386/ibcs2/ibcs2_sysent.c @@ -26,7 +26,7 @@ * (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: ibcs2_sysent.c,v 1.1 1994/10/14 08:53:10 sos Exp $ + * $Id: ibcs2_sysent.c,v 1.2 1995/05/30 08:00:12 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c index 611ad1080a77d..786a8e00f40c2 100644 --- a/sys/i386/ibcs2/ibcs2_sysi86.c +++ b/sys/i386/ibcs2/ibcs2_sysi86.c @@ -25,7 +25,7 @@ * (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: ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp $ + * $Id: ibcs2_sysi86.c,v 1.2 1995/05/30 08:00:14 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c index 3bbe7e7c9e710..cb41d65b12de4 100644 --- a/sys/i386/ibcs2/ibcs2_xenix.c +++ b/sys/i386/ibcs2/ibcs2_xenix.c @@ -26,7 +26,7 @@ * (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: ibcs2_xenix.c,v 1.4 1995/05/02 13:14:59 ache Exp $ + * $Id: ibcs2_xenix.c,v 1.5 1995/05/30 08:00:15 rgrimes Exp $ */ #include <i386/ibcs2/ibcs2.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 58ffb1b4e94e9..b4c4f065795af 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,7 @@ * (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: imgact_coff.c,v 1.4.4.1 1995/08/31 10:00:11 davidg Exp $ + * $Id: imgact_coff.c,v 1.4.4.2 1995/09/15 08:36:10 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h index a902d997fda4e..3e9a12bd6daab 100644 --- a/sys/i386/include/ansi.h +++ b/sys/i386/include/ansi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $Id: ansi.h,v 1.7.4.1 1995/10/01 06:29:18 davidg Exp $ + * $Id: ansi.h,v 1.7.4.4 1996/06/05 19:49:02 nate Exp $ */ #ifndef _MACHINE_ANSI_H_ diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index 8460ad2dc2981..52fca790d44e3 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -12,7 +12,7 @@ * * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_bios.h,v 1.5.4.2 1996/03/13 00:42:56 nate Exp $ + * $Id: apm_bios.h,v 1.5.4.3 1996/04/23 16:09:02 nate Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h index ff966ccc36afe..06404992a115a 100644 --- a/sys/i386/include/apm_segments.h +++ b/sys/i386/include/apm_segments.h @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_segments.h,v 1.4 1995/05/30 08:00:25 rgrimes Exp $ + * $Id: apm_segments.h,v 1.4.4.1 1996/03/11 06:45:43 nate Exp $ */ #ifndef _MACHINE_APM_SEGMENTS_H diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index b2a6dc839f2e2..aa9bbe215fec0 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asmacros.h,v 1.4 1994/08/19 11:20:11 jkh Exp $ + * $Id: asmacros.h,v 1.5 1994/09/08 12:25:18 bde Exp $ */ #ifndef _MACHINE_ASMACROS_H_ diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h index d0b471f4ee5af..919b6b205be23 100644 --- a/sys/i386/include/bootinfo.h +++ b/sys/i386/include/bootinfo.h @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.h,v 1.4 1995/01/25 21:40:32 bde Exp $ + * $Id: bootinfo.h,v 1.5 1995/05/30 08:00:26 rgrimes Exp $ */ #ifndef _MACHINE_BOOTINFO_H_ diff --git a/sys/i386/include/cdk.h b/sys/i386/include/cdk.h index f49aa32cf16c8..909e1b5a01890 100644 --- a/sys/i386/include/cdk.h +++ b/sys/i386/include/cdk.h @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: cdk.h,v 1.2 1996/05/04 08:42:13 peter Exp $ */ /*****************************************************************************/ diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h index f332eebcfb19c..676d0dc659644 100644 --- a/sys/i386/include/comstats.h +++ b/sys/i386/include/comstats.h @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: comstats.h,v 1.2 1996/05/04 08:42:14 peter Exp $ */ /*****************************************************************************/ diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h index faa17d12332c7..4ae03493d093f 100644 --- a/sys/i386/include/cons.h +++ b/sys/i386/include/cons.h @@ -3,6 +3,6 @@ * needs to access these functions. In the mean time, just include the * header where it sits. * - * $Id$ + * $Id: cons.h,v 1.2 1994/08/02 07:38:41 davidg Exp $ */ #include <i386/i386/cons.h> diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index 870c5de887eca..ec465ea8a5878 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -25,7 +25,7 @@ * (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: console.h,v 1.18 1995/01/28 22:15:30 sos Exp $ + * $Id: console.h,v 1.19 1995/05/30 08:00:28 rgrimes Exp $ */ #ifndef _CONSOLE_H_ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 58a5ab6778ba5..8075d30cc14a0 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.19 1994/12/03 10:18:24 bde Exp $ + * $Id: cpu.h,v 1.20 1995/05/04 07:50:06 davidg Exp $ */ #ifndef _MACHINE_CPU_H_ diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 4880e4c8ebf15..52139b057ca22 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.37.4.3 1995/12/20 17:06:35 nate Exp $ + * $Id: cpufunc.h,v 1.37.4.4 1996/01/13 10:46:38 davidg Exp $ */ /* diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h index 52d8e20512242..83ac156181c84 100644 --- a/sys/i386/include/cputypes.h +++ b/sys/i386/include/cputypes.h @@ -24,7 +24,7 @@ * (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: cputypes.h,v 1.2 1993/11/07 17:42:49 wollman Exp $ + * $Id: cputypes.h,v 1.3 1994/09/04 19:59:23 pst Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h index cae2a45e191b9..369f7f76b556d 100644 --- a/sys/i386/include/db_machdep.h +++ b/sys/i386/include/db_machdep.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id: db_machdep.h,v 1.7 1995/01/14 10:34:52 bde Exp $ + * $Id: db_machdep.h,v 1.8 1995/05/30 08:00:34 rgrimes Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ diff --git a/sys/i386/include/devconf.h b/sys/i386/include/devconf.h index b6c4a321c9716..7ae5cb583e7d5 100644 --- a/sys/i386/include/devconf.h +++ b/sys/i386/include/devconf.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devconf.h,v 1.9 1995/05/30 08:00:37 rgrimes Exp $ + * $Id: devconf.h,v 1.9.4.1 1996/01/04 08:53:03 gibbs Exp $ */ /* * devconf.h - machine-dependent device configuration table diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index ac60e4c73d207..14d1cd737e0ec 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $Id: endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp $ + * $Id: endian.h,v 1.6 1995/02/12 08:31:31 jkh Exp $ */ #ifndef _MACHINE_ENDIAN_H_ diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h index c08283f7384a6..65241472837fe 100644 --- a/sys/i386/include/exec.h +++ b/sys/i386/include/exec.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id: exec.h,v 1.4 1994/08/09 14:39:56 jkh Exp $ + * $Id: exec.h,v 1.5 1994/09/24 21:36:38 davidg Exp $ */ #ifndef _EXEC_H_ diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h index fb5967e6eadcb..3024ca2b3dd3d 100644 --- a/sys/i386/include/float.h +++ b/sys/i386/include/float.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $Id: float.h,v 1.4 1993/10/16 14:39:16 rgrimes Exp $ + * $Id: float.h,v 1.5 1993/11/07 17:42:53 wollman Exp $ */ #ifndef _MACHINE_FLOAT_H_ diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h index 69cb204c835cd..65d4df8d095d1 100644 --- a/sys/i386/include/floatingpoint.h +++ b/sys/i386/include/floatingpoint.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 - * $Id: floatingpoint.h,v 1.5 1994/08/04 19:16:36 wollman Exp $ + * $Id: floatingpoint.h,v 1.6 1994/09/20 22:26:37 bde Exp $ */ #ifndef _FLOATINGPOINT_H_ diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h index 9bee6edd2d13b..0c89e9ee83d40 100644 --- a/sys/i386/include/frame.h +++ b/sys/i386/include/frame.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $Id: frame.h,v 1.9 1994/05/25 08:56:02 rgrimes Exp $ + * $Id: frame.h,v 1.10 1995/03/16 18:11:42 bde Exp $ */ #ifndef _MACHINE_FRAME_H_ diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h index d36ede3cbd1e8..055f15e9e0d55 100644 --- a/sys/i386/include/ieeefp.h +++ b/sys/i386/include/ieeefp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $Id: ieeefp.h,v 1.1 1994/08/04 19:16:37 wollman Exp $ + * $Id: ieeefp.h,v 1.2 1994/08/05 14:36:04 wollman Exp $ */ /* diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h index a330664c85790..c9e289f3c4344 100644 --- a/sys/i386/include/ioctl_ctx.h +++ b/sys/i386/include/ioctl_ctx.h @@ -7,7 +7,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use * - * $Id: ioctl_ctx.h,v 1.1 1994/10/01 17:59:38 davidg Exp $ + * $Id: ioctl_ctx.h,v 1.2 1995/05/30 08:00:40 rgrimes Exp $ */ /* diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h index 67329399ad848..eb9adca9ba180 100644 --- a/sys/i386/include/ioctl_fd.h +++ b/sys/i386/include/ioctl_fd.h @@ -24,7 +24,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $Id: ioctl_fd.h,v 1.6 1994/09/25 18:41:21 joerg Exp $ + * $Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp $ */ #ifndef _IOCTL_FD_H diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h index 773fa9c700c67..f60f2e765c1af 100644 --- a/sys/i386/include/ipl.h +++ b/sys/i386/include/ipl.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ipl.h,v 1.2 1994/08/02 07:38:49 davidg Exp $ */ #ifndef _ISA_IPL_H_ diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h index c71216f7afff1..85dff93060bb4 100644 --- a/sys/i386/include/limits.h +++ b/sys/i386/include/limits.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $Id: limits.h,v 1.8 1994/08/02 07:38:50 davidg Exp $ + * $Id: limits.h,v 1.9 1995/02/03 21:49:18 bde Exp $ */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h index a203c7d69d54e..2a58a87eb1fe2 100644 --- a/sys/i386/include/lpt.h +++ b/sys/i386/include/lpt.h @@ -11,7 +11,7 @@ * * Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za> * - * $Id: lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp $ + * $Id: lpt.h,v 1.3 1995/05/30 08:00:41 rgrimes Exp $ */ #ifndef _LPT_PRINTER_H_ diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index 34854b05c1b2e..7592c61602eaa 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: md_var.h,v 1.2 1995/03/28 07:55:08 bde Exp $ + * $Id: md_var.h,v 1.3 1995/05/30 08:00:43 rgrimes Exp $ */ #ifndef _MACHINE_MD_VAR_H_ diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h index 95a66e474c6dc..bbd99a544cee5 100644 --- a/sys/i386/include/mouse.h +++ b/sys/i386/include/mouse.h @@ -19,7 +19,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mouse.h,v 1.1 1994/05/17 14:05:31 jkh Exp $ + * $Id: mouse.h,v 1.1 1994/09/09 11:27:31 dfr Exp $ */ struct mouseinfo { diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h index e8347e677541c..e56ef7f854006 100644 --- a/sys/i386/include/mtpr.h +++ b/sys/i386/include/mtpr.h @@ -1,4 +1,4 @@ /* * Unused in 386BSD port - * $Id$ + * $Id: mtpr.h,v 1.2 1993/10/16 14:39:21 rgrimes Exp $ */ diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h index e56fdc216e2b4..62290efd43bc6 100644 --- a/sys/i386/include/npx.h +++ b/sys/i386/include/npx.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $Id: npx.h,v 1.6 1994/11/05 22:59:09 bde Exp $ + * $Id: npx.h,v 1.7 1995/01/03 03:57:46 bde Exp $ */ /* diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 716c19b64b749..33ddb6f96b8e9 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.18 1995/02/19 10:36:17 gpalmer Exp $ + * $Id: param.h,v 1.19 1995/05/25 07:41:27 davidg Exp $ */ #ifndef _MACHINE_PARAM_H_ diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h index 9e64a3f13307c..31a203cc852da 100644 --- a/sys/i386/include/pc/display.h +++ b/sys/i386/include/pc/display.h @@ -1,7 +1,7 @@ /* * IBM PC display definitions * - * $Id$ + * $Id: display.h,v 1.2 1993/10/16 14:40:55 rgrimes Exp $ */ /* Color attributes for foreground text */ diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h index ea221c7954a50..63c6c3f724b9f 100644 --- a/sys/i386/include/pc/msdos.h +++ b/sys/i386/include/pc/msdos.h @@ -3,7 +3,7 @@ * [obtained from mtools -wfj] * how to decipher DOS disk structures in coexisting with DOS * - * $Id$ + * $Id: msdos.h,v 1.2 1993/10/16 14:40:57 rgrimes Exp $ */ #define MSECTOR_SIZE 512 /* MSDOS sector size in bytes */ diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h index d887334702813..25d9f3b2f71a8 100644 --- a/sys/i386/include/pcaudioio.h +++ b/sys/i386/include/pcaudioio.h @@ -25,7 +25,7 @@ * (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: pcaudioio.h,v 1.3 1994/09/29 08:31:39 sos Exp $ + * $Id: pcaudioio.h,v 1.4 1995/05/30 08:00:44 rgrimes Exp $ */ #ifndef _PCAUDIOIO_H_ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 537ef5d531bfd..0a93d245327e9 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $Id: pcb.h,v 1.8 1994/12/03 10:02:55 bde Exp $ + * $Id: pcb.h,v 1.8.4.1 1996/01/29 12:31:01 davidg Exp $ */ #ifndef _I386_PCB_H_ diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 8cd0362a9c92d..d30e019ca6db8 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $Id: pmap.h,v 1.26 1995/05/30 08:00:48 rgrimes Exp $ + * $Id: pmap.h,v 1.26.4.1 1995/09/08 04:23:52 davidg Exp $ */ #ifndef _MACHINE_PMAP_H_ diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h index 77b66664a3739..0104a5688300c 100644 --- a/sys/i386/include/proc.h +++ b/sys/i386/include/proc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $Id: proc.h,v 1.4 1994/05/25 08:56:29 rgrimes Exp $ + * $Id: proc.h,v 1.4.8.1 1996/04/10 05:27:11 nate Exp $ */ #ifndef _MACHINE_PROC_H_ diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 9fe27ec5eda85..49919f327cb05 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.3 1994/08/21 04:55:29 paul Exp $ + * $Id: profile.h,v 1.4 1994/09/15 16:27:14 paul Exp $ */ #ifndef _I386_MACHINE_PROFILE_H_ diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h index 3d96dbc52495f..8f9ec93948ec8 100644 --- a/sys/i386/include/psl.h +++ b/sys/i386/include/psl.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 - * $Id: psl.h,v 1.5 1994/08/10 03:51:18 wollman Exp $ + * $Id: psl.h,v 1.6 1995/01/14 13:20:25 bde Exp $ */ #ifndef _MACHINE_PSL_H_ diff --git a/sys/i386/include/pte.h b/sys/i386/include/pte.h index b68f71610ccaf..2778280ea121a 100644 --- a/sys/i386/include/pte.h +++ b/sys/i386/include/pte.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pte.h 5.5 (Berkeley) 5/9/91 - * $Id: pte.h,v 1.7 1994/09/04 23:10:25 davidg Exp $ + * $Id: pte.h,v 1.8 1995/05/30 08:00:49 rgrimes Exp $ */ #ifndef _MACHINE_PTE_H_ diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h index 0892b83e2606c..548ecc4952231 100644 --- a/sys/i386/include/ptrace.h +++ b/sys/i386/include/ptrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $Id$ + * $Id: ptrace.h,v 1.2 1994/08/02 07:38:57 davidg Exp $ */ /* diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h index 8d91cbf028d1a..49839e865687a 100644 --- a/sys/i386/include/random.h +++ b/sys/i386/include/random.h @@ -1,7 +1,7 @@ /* * random.h -- A strong random number generator * - * $Id: random.h,v 1.5 1996/06/14 11:01:04 asami Exp $ + * $Id: random.h,v 1.6 1996/06/17 16:47:39 bde Exp $ * * Version 0.95, last modified 18-Oct-95 * diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index 9fc18148ff368..e81c0dd8bf2b5 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $Id: reg.h,v 1.9 1994/10/02 17:31:29 phk Exp $ + * $Id: reg.h,v 1.10 1995/01/14 10:41:41 bde Exp $ */ #ifndef _MACHINE_REG_H_ diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h index 7f9cfad64a27d..be61d3e4bb093 100644 --- a/sys/i386/include/reloc.h +++ b/sys/i386/include/reloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reloc.h 8.1 (Berkeley) 6/10/93 - * $Id: reloc.h,v 1.3 1994/08/09 14:39:57 jkh Exp $ + * $Id: reloc.h,v 1.4 1994/08/21 04:55:30 paul Exp $ */ #ifndef _I386_MACHINE_RELOC_H_ diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h index dcac309481a7a..1e2fd1dcdbeeb 100644 --- a/sys/i386/include/segments.h +++ b/sys/i386/include/segments.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $ + * $Id: segments.h,v 1.9 1995/05/30 08:00:50 rgrimes Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h index bc02927c15aa7..2b25c6a5bb0ea 100644 --- a/sys/i386/include/si.h +++ b/sys/i386/include/si.h @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.h,v 1.6 1995/11/28 02:07:31 peter Exp $ + * $Id: si.h,v 1.4.2.1 1996/02/23 21:00:55 peter Exp $ */ /* diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h index 093278f1399a0..89914bf9e6d6a 100644 --- a/sys/i386/include/signal.h +++ b/sys/i386/include/signal.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $Id: signal.h,v 1.3 1994/08/02 07:39:01 davidg Exp $ + * $Id: signal.h,v 1.4 1994/08/21 04:55:30 paul Exp $ */ #ifndef _I386_MACHINE_SIGNAL_H_ diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h index f097e4807cf85..b5bd693039b8b 100644 --- a/sys/i386/include/speaker.h +++ b/sys/i386/include/speaker.h @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * $Id: speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp $ */ #ifndef _SPEAKER_H_ diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h index 75cc79dae89bf..a06b5a9d2771d 100644 --- a/sys/i386/include/specialreg.h +++ b/sys/i386/include/specialreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $ + * $Id: specialreg.h,v 1.7 1995/05/30 08:00:54 rgrimes Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ diff --git a/sys/i386/include/spl.h b/sys/i386/include/spl.h index d4fef242202ae..8c871f7e15d60 100644 --- a/sys/i386/include/spl.h +++ b/sys/i386/include/spl.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: spl.h,v 1.8.4.2 1995/12/20 17:29:53 nate Exp $ + * $Id: spl.h,v 1.8.4.3 1996/01/03 17:12:01 davidg Exp $ */ #ifndef _MACHINE_IPL_H_ diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h index 0fce3ee8f4331..3eb6000c856fa 100644 --- a/sys/i386/include/stdarg.h +++ b/sys/i386/include/stdarg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 - * $Id: stdarg.h,v 1.5 1994/08/02 07:39:09 davidg Exp $ + * $Id: stdarg.h,v 1.6 1995/01/24 16:22:52 ache Exp $ */ #ifndef _STDARG_H_ diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h index 746cef1011fe4..4414a66eb779e 100644 --- a/sys/i386/include/sysarch.h +++ b/sys/i386/include/sysarch.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: sysarch.h,v 1.4 1994/08/02 07:39:11 davidg Exp $ */ /* diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h index e1ead777f3482..30debd1ebd742 100644 --- a/sys/i386/include/trap.h +++ b/sys/i386/include/trap.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.h 5.4 (Berkeley) 5/9/91 - * $Id: trap.h,v 1.3 1993/11/07 17:43:15 wollman Exp $ + * $Id: trap.h,v 1.4 1995/01/14 13:20:26 bde Exp $ */ #ifndef _MACHINE_TRAP_H_ diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h index fd07e357ffd83..db0f55dc23cea 100644 --- a/sys/i386/include/tss.h +++ b/sys/i386/include/tss.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $ + * $Id: tss.h,v 1.5 1995/05/30 08:00:57 rgrimes Exp $ */ #ifndef _MACHINE_TSS_H_ diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index 78ce8d568ffcb..c15dbd455914b 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $Id$ + * $Id: types.h,v 1.4 1994/08/02 07:39:13 davidg Exp $ */ #ifndef _MACHTYPES_H_ diff --git a/sys/i386/include/ultrasound.h b/sys/i386/include/ultrasound.h index 42d968850c141..e14efe213a2bc 100644 --- a/sys/i386/include/ultrasound.h +++ b/sys/i386/include/ultrasound.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ultrasound.h,v 1.3 1994/08/02 07:39:15 davidg Exp $ */ /* diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h index fa6c9a7a95410..ee128f280f77a 100644 --- a/sys/i386/include/varargs.h +++ b/sys/i386/include/varargs.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $Id$ + * $Id: varargs.h,v 1.2 1994/08/02 07:39:17 davidg Exp $ */ #ifndef _VARARGS_H_ diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h index 8ff3b451fcc24..c5a5def1d08e4 100644 --- a/sys/i386/include/vmparam.h +++ b/sys/i386/include/vmparam.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $Id: vmparam.h,v 1.17 1995/01/09 16:04:44 davidg Exp $ + * $Id: vmparam.h,v 1.18 1995/05/25 07:41:28 davidg Exp $ */ diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le index 32dcc280c77cd..9144f495ae448 100644 --- a/sys/i386/isa/README.le +++ b/sys/i386/isa/README.le @@ -1,4 +1,4 @@ -$Id: README.le,v 1.1 1994/10/01 20:15:43 wollman Exp $ +$Id: README.le,v 1.2 1994/11/13 21:19:18 nate Exp $ ---------------- diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 729b31d63821c..57f46cf483f03 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.56 1996/03/10 07:04:42 gibbs Exp $ + * $Id: aha1542.c,v 1.45.4.3 1996/04/01 00:19:33 gibbs Exp $ */ /* diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index 70918b1fea65d..935e966eccc4a 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -31,7 +31,7 @@ */ /* - * $Id: aic6360.c,v 1.9.4.1 1995/08/31 06:36:03 davidg Exp $ + * $Id: aic6360.c,v 1.9.4.2 1996/04/01 00:19:37 gibbs Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index 4e994d9a98ffc..e91e1a55c8b60 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * $Id: asc.c,v 1.4 1995/09/08 18:30:33 julian Exp $ + * $Id: asc.c,v 1.5 1995/09/08 19:01:28 julian Exp $ */ #include "asc.h" diff --git a/sys/i386/isa/ascreg.h b/sys/i386/isa/ascreg.h index a1a7393de651a..092a2d2fa1da1 100644 --- a/sys/i386/isa/ascreg.h +++ b/sys/i386/isa/ascreg.h @@ -31,7 +31,7 @@ */ /* - * $Id:$ + * $Id: ascreg.h,v 1.2 1995/09/08 18:30:34 julian Exp $ */ /*** Registers (base=3EB): ************/ diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c index a95bf6735ff05..2d81a9c2f8d6a 100644 --- a/sys/i386/isa/bt5xx-445.c +++ b/sys/i386/isa/bt5xx-445.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt5xx-445.c,v 1.3 1996/03/31 03:06:20 gibbs Exp $ + * $Id: bt5xx-445.c,v 1.2.2.1 1996/04/01 00:19:38 gibbs Exp $ */ /* diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index d29fe9d664913..cbdeda0aecb28 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.35.2.1 1995/09/12 05:55:35 davidg Exp $ + * $Id: clock.c,v 1.35.2.2 1996/04/22 19:48:26 nate Exp $ */ /* diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index 5fa567e579cc5..727a7464a8b64 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -8,7 +8,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: ctx.c,v 1.7 1995/09/08 11:07:34 bde Exp $ + * $Id: ctx.c,v 1.6.4.1 1995/09/14 07:09:05 davidg Exp $ */ /* diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h index 043bb15426562..e6acbab14230d 100644 --- a/sys/i386/isa/ctxreg.h +++ b/sys/i386/isa/ctxreg.h @@ -7,7 +7,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use * - * $Id: ctxreg.h,v 1.1 1994/10/01 17:59:42 davidg Exp $ + * $Id: ctxreg.h,v 1.2 1995/05/30 08:01:28 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 5371b1def106a..355155809a862 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.7.4.2 1995/10/11 02:42:42 davidg Exp $ + * $Id: cy.c,v 1.7.4.3 1996/01/29 04:44:13 bde Exp $ */ #include "cy.h" diff --git a/sys/i386/isa/cyreg.h b/sys/i386/isa/cyreg.h index 8df7294c9a944..463a354046208 100644 --- a/sys/i386/isa/cyreg.h +++ b/sys/i386/isa/cyreg.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * $Id: cyreg.h,v 1.1 1995/07/05 12:15:51 bde Exp $ */ /* diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c index 210d56867ffbb..9276b145452ef 100644 --- a/sys/i386/isa/diskslice_machdep.c +++ b/sys/i386/isa/diskslice_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.14.4.1 1995/09/12 07:19:45 davidg Exp $ + * $Id: diskslice_machdep.c,v 1.14.4.2 1996/11/04 18:28:57 jkh Exp $ */ #include <stddef.h> diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c index 07b2516b93281..712b7748e3581 100644 --- a/sys/i386/isa/elink.c +++ b/sys/i386/isa/elink.c @@ -26,7 +26,7 @@ * (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: elink.c,v 1.4 1995/02/26 05:14:46 bde Exp $ + * $Id: elink.c,v 1.5 1995/05/30 08:01:36 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h index 93a5dac6f5cea..aff636cf10baf 100644 --- a/sys/i386/isa/elink.h +++ b/sys/i386/isa/elink.h @@ -26,7 +26,7 @@ * (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: elink.h,v 1.1 1994/05/25 20:06:43 ats Exp $ + * $Id: elink.h,v 1.1 1994/08/24 22:32:42 ats Exp $ */ #define ELINK_ID_PORT 0x100 diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 84bd526d7c454..5c21f168ff8a6 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.62.2.2 1996/06/25 17:39:20 joerg Exp $ + * $Id: fd.c,v 1.62.2.3 1996/07/02 19:58:11 bde Exp $ * */ diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h index 0216b7aa2e2ed..a907ae690e670 100644 --- a/sys/i386/isa/fdc.h +++ b/sys/i386/isa/fdc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fdc.h,v 1.4 1994/10/10 01:12:26 phk Exp $ + * $Id: fdc.h,v 1.5 1995/01/06 15:19:41 joerg Exp $ * */ diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h index aef83574199a8..133abf2cf681c 100644 --- a/sys/i386/isa/fdreg.h +++ b/sys/i386/isa/fdreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: fdreg.h,v 1.7 1994/09/25 18:42:23 joerg Exp $ + * $Id: fdreg.h,v 1.8 1994/09/25 23:37:38 phk Exp $ */ /* diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c index a56a84f432f78..4c49d2e5f983a 100644 --- a/sys/i386/isa/ft.c +++ b/sys/i386/isa/ft.c @@ -17,7 +17,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * ft.c - QIC-40/80 floppy tape driver - * $Id: ft.c,v 1.21 1995/05/06 19:34:28 joerg Exp $ + * $Id: ft.c,v 1.22 1995/05/30 08:01:41 rgrimes Exp $ * * 01/19/95 ++sg * Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x. diff --git a/sys/i386/isa/ic/cd1400.h b/sys/i386/isa/ic/cd1400.h index 4ed6ea669d1c6..0718271184054 100644 --- a/sys/i386/isa/ic/cd1400.h +++ b/sys/i386/isa/ic/cd1400.h @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cd1400.h,v 1.2 1995/07/05 12:15:40 bde Exp $ + * $Id: cd1400.h,v 1.1.4.1 1995/09/14 07:09:41 davidg Exp $ */ /* diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h index 84ee90f08e625..b69cd2846e9d9 100644 --- a/sys/i386/isa/ic/i8042.h +++ b/sys/i386/isa/ic/i8042.h @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: i8042.h,v 1.2 1993/10/16 13:48:47 rgrimes Exp $ */ #define KBSTATP 0x64 /* kbd controller status port (I) */ diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h index 5493ca8eb44ee..e14959bce62e1 100644 --- a/sys/i386/isa/ic/i8237.h +++ b/sys/i386/isa/ic/i8237.h @@ -1,7 +1,7 @@ /* * Intel 8237 DMA Controller * - * $Id: i8237.h,v 1.3 1994/11/01 17:26:47 ache Exp $ + * $Id: i8237.h,v 1.4 1995/05/30 08:03:34 rgrimes Exp $ */ #define DMA37MD_SINGLE 0x40 /* single pass mode */ diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h index 577313d81e5a2..eb98b255504c9 100644 --- a/sys/i386/isa/ic/i82586.h +++ b/sys/i386/isa/ic/i82586.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: i82586.h,v 1.1 1993/10/12 06:53:10 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h index 4eee86f6aa622..cb79b6244a010 100644 --- a/sys/i386/isa/ic/lemac.h +++ b/sys/i386/isa/ic/lemac.h @@ -21,7 +21,7 @@ * (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: lemac.h,v 1.1 1994/08/12 06:51:12 davidg Exp $ + * $Id: lemac.h,v 1.2 1995/05/30 08:03:36 rgrimes Exp $ */ #ifndef _LEMAC_H_ #define _LEMAC_H_ diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h index 810e825bd66ec..5cf1e73feeee6 100644 --- a/sys/i386/isa/ic/nec765.h +++ b/sys/i386/isa/ic/nec765.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)nec765.h 7.1 (Berkeley) 5/9/91 - * $Id: nec765.h,v 1.3 1994/09/17 16:56:10 davidg Exp $ + * $Id: nec765.h,v 1.4 1995/01/06 15:20:00 joerg Exp $ */ /* diff --git a/sys/i386/isa/ic/ns16450.h b/sys/i386/isa/ic/ns16450.h index aa6280df57d15..988bc31bb3d43 100644 --- a/sys/i386/isa/ic/ns16450.h +++ b/sys/i386/isa/ic/ns16450.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns16450.h 7.1 (Berkeley) 5/9/91 - * $Id$ + * $Id: ns16450.h,v 1.2 1993/10/16 13:48:51 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h index ff59757a5f73a..50e704482e78f 100644 --- a/sys/i386/isa/ic/ns16550.h +++ b/sys/i386/isa/ic/ns16550.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns16550.h 7.1 (Berkeley) 5/9/91 - * $Id$ + * $Id: ns16550.h,v 1.2 1993/10/16 13:48:52 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/ic/scd1400.h b/sys/i386/isa/ic/scd1400.h index c651a3014ad79..632fc6b6abe1f 100644 --- a/sys/i386/isa/ic/scd1400.h +++ b/sys/i386/isa/ic/scd1400.h @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: scd1400.h,v 1.2 1996/05/04 08:53:27 peter Exp $ */ /*****************************************************************************/ diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index a68269b0801ab..943f92ad249a5 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.6 1994/09/18 23:18:32 bde Exp $ + * $Id: icu.h,v 1.7 1994/10/01 02:56:11 davidg Exp $ */ /* diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s index 4d81d12c97e32..9ca95470bfdd7 100644 --- a/sys/i386/isa/icu.s +++ b/sys/i386/isa/icu.s @@ -36,7 +36,7 @@ * * @(#)icu.s 7.2 (Berkeley) 5/21/91 * - * $Id: icu.s,v 1.22.4.1 1995/09/15 08:41:12 davidg Exp $ + * $Id: icu.s,v 1.22.4.2 1996/03/12 05:49:56 nate Exp $ */ /* diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 3a03f0ff891ee..11b7071f8146a 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.73.4.5 1996/03/31 15:55:01 joerg Exp $ + * $Id: if_ed.c,v 1.73.4.6 1996/04/08 01:29:18 davidg Exp $ */ /* diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h index 430fa9393602d..29edf2e71fc51 100644 --- a/sys/i386/isa/if_edreg.h +++ b/sys/i386/isa/if_edreg.h @@ -6,7 +6,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: if_edreg.h,v 1.17 1995/01/23 19:06:08 davidg Exp $ + * $Id: if_edreg.h,v 1.18 1995/05/30 08:02:00 rgrimes Exp $ */ /* * National Semiconductor DS8390 NIC register definitions diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c index ec02037d12308..a88f03a9a2e69 100644 --- a/sys/i386/isa/if_eg.c +++ b/sys/i386/isa/if_eg.c @@ -27,7 +27,7 @@ * (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: if_eg.c,v 1.3 1995/04/12 20:47:47 wollman Exp $ + * $Id: if_eg.c,v 1.4 1995/05/30 08:02:02 rgrimes Exp $ */ /* To do: diff --git a/sys/i386/isa/if_egreg.h b/sys/i386/isa/if_egreg.h index c4647a0bfcca1..7bca983243d8b 100644 --- a/sys/i386/isa/if_egreg.h +++ b/sys/i386/isa/if_egreg.h @@ -27,7 +27,7 @@ * (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: if_egreg.h,v 1.1 1995/04/08 09:39:36 phk Exp $ + * $Id: if_egreg.h,v 1.2 1995/05/30 08:02:03 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index 0571a8a62e2c9..d08aefd4dfd90 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.13.2.1 1995/06/09 18:12:09 davidg Exp $ + * $Id: if_el.c,v 1.14 1995/06/11 19:31:25 rgrimes Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h index 4d7859dd71c6f..7529b967a591d 100644 --- a/sys/i386/isa/if_elreg.h +++ b/sys/i386/isa/if_elreg.h @@ -4,7 +4,7 @@ * of the software, derivative works or modified versions, and any * portions thereof. * - * $Id$ + * $Id: if_elreg.h,v 1.2 1994/08/02 07:39:34 davidg Exp $ */ /* 3COM Etherlink 3C501 Register Definitions */ diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index 22987d85c28c0..6f9f2b5194edf 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -38,7 +38,7 @@ */ /* - * $Id: if_ep.c,v 1.28.4.6 1996/07/13 10:51:10 davidg Exp $ + * $Id: if_ep.c,v 1.28.4.7 1996/07/16 00:15:17 davidg Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h index 0b17636fab325..2b161e9ec97a0 100644 --- a/sys/i386/isa/if_epreg.h +++ b/sys/i386/isa/if_epreg.h @@ -31,7 +31,7 @@ */ /* - * $Id: if_epreg.h,v 1.11 1996/02/06 18:50:42 wollman Exp $ + * $Id: if_epreg.h,v 1.8.4.1 1996/04/01 00:19:40 gibbs Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 146c89b0daddc..5ee49426d04aa 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.25 1995/08/16 16:12:32 bde Exp $ + * $Id: if_ie.c,v 1.24.4.1 1995/09/12 06:17:26 davidg Exp $ */ /* diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h index 4bf87fcbb5974..2a9eabf8d98e4 100644 --- a/sys/i386/isa/if_ie507.h +++ b/sys/i386/isa/if_ie507.h @@ -1,5 +1,5 @@ /* - * $Id: if_ie507.h,v 1.1 1994/05/25 20:06:49 ats Exp $ + * $Id: if_ie507.h,v 1.1 1994/08/24 22:32:44 ats Exp $ * Definitions for 3C507 */ diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h index 3588b84140580..e3e2bd2f33c2f 100644 --- a/sys/i386/isa/if_iereg.h +++ b/sys/i386/isa/if_iereg.h @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: if_iereg.h,v 1.1 1993/10/12 06:52:34 rgrimes Exp $ * definitions for AT&T StarLAN 10 etc... */ diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c index cd7ca39c84606..ac69b1b40141c 100644 --- a/sys/i386/isa/if_ix.c +++ b/sys/i386/isa/if_ix.c @@ -28,7 +28,7 @@ * (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: if_ix.c,v 1.9 1995/10/05 03:01:13 davidg Exp $ + * $Id: if_ix.c,v 1.7.4.1 1995/10/07 12:01:40 davidg Exp $ */ #include "ix.h" diff --git a/sys/i386/isa/if_ixreg.h b/sys/i386/isa/if_ixreg.h index 3dd4903986c09..b2a7416526f9d 100644 --- a/sys/i386/isa/if_ixreg.h +++ b/sys/i386/isa/if_ixreg.h @@ -28,7 +28,7 @@ * (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: if_ixreg.h,v 1.5 1995/05/10 15:19:29 rgrimes Exp $ + * $Id: if_ixreg.h,v 1.6 1995/05/30 08:02:17 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 9ba179abd636c..294958a4ccbe9 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,7 +21,7 @@ * (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: if_le.c,v 1.17.4.1 1995/08/19 23:24:14 davidg Exp $ + * $Id: if_le.c,v 1.17.4.2 1996/06/25 18:29:28 joerg Exp $ */ /* diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index b1de9e69f5b30..ce5fd2df677d7 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.16 1995/05/24 20:33:42 davidg Exp $ + * $Id: if_ze.c,v 1.17 1995/05/30 08:02:27 rgrimes Exp $ */ #include "ze.h" diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index c70ca560dec55..7496b0487668f 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.6.4.3 1996/03/11 06:39:52 nate Exp $ + * $Id: if_zp.c,v 1.6.4.4 1996/06/04 21:42:29 nate Exp $ */ /*- * TODO: diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h index a1eb1f54f4e63..6a0b66dbe84e6 100644 --- a/sys/i386/isa/if_zpreg.h +++ b/sys/i386/isa/if_zpreg.h @@ -21,7 +21,7 @@ * (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: if_zpreg.h,v 1.1 1995/02/17 02:22:53 phk Exp $ + * $Id: if_zpreg.h,v 1.2 1995/05/30 08:02:33 rgrimes Exp $ */ /************************************************************************** * * diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 7b035a039db69..fda838f19ba27 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.50.4.3 1996/03/06 23:20:42 bde Exp $ + * $Id: isa.c,v 1.50.4.4 1996/04/01 00:19:40 gibbs Exp $ */ /* diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h index 2f3b7cc774742..573c0de69f4d6 100644 --- a/sys/i386/isa/isa.h +++ b/sys/i386/isa/isa.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $Id: isa.h,v 1.16 1995/09/08 03:14:00 julian Exp $ + * $Id: isa.h,v 1.14.4.1 1995/09/12 06:22:36 davidg Exp $ */ #ifndef _I386_ISA_ISA_H_ diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index abcdf5fb1d4b4..80e500270b63f 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.23 1995/05/11 07:41:52 jkh Exp $ + * $Id: isa_device.h,v 1.23.4.1 1996/01/04 08:54:13 gibbs Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ diff --git a/sys/i386/isa/iso8859.font b/sys/i386/isa/iso8859.font index 0553a6bc2104c..1eb5bb89e47f6 100644 --- a/sys/i386/isa/iso8859.font +++ b/sys/i386/isa/iso8859.font @@ -25,7 +25,7 @@ * (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$ + * $Id: iso8859.font,v 1.6 1994/09/29 08:29:19 sos Exp $ */ char font_8x8[256*8] = { diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 154607f623ca9..49ff8909606a5 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: istallion.c,v 1.4 1996/06/18 01:22:25 bde Exp $ + * $Id: istallion.c,v 1.4.2.1 1996/06/23 23:24:34 peter Exp $ */ /*****************************************************************************/ diff --git a/sys/i386/isa/kbd.h b/sys/i386/isa/kbd.h index d34b6340675ee..5fc218d7e5ad5 100644 --- a/sys/i386/isa/kbd.h +++ b/sys/i386/isa/kbd.h @@ -1,7 +1,7 @@ /* * Keyboard definitions * from: unknown origin, 386BSD 0.1 - * $Id: kbd.h,v 1.3 1993/11/07 17:44:33 wollman Exp $ + * $Id: kbd.h,v 1.4 1995/05/30 08:02:38 rgrimes Exp $ */ #ifndef _I386_ISA_KBD_H_ diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h index a76105381ae78..437e267cad928 100644 --- a/sys/i386/isa/kbdtables.h +++ b/sys/i386/isa/kbdtables.h @@ -25,7 +25,7 @@ * (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: kbdtables.h,v 1.28 1995/03/27 19:41:11 sos Exp $ + * $Id: kbdtables.h,v 1.29 1995/03/28 21:30:13 sos Exp $ */ #define SET8 0x80 /* set eight bit on */ diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index f17c49adf6894..52a2f37a852d3 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.30.4.8 1996/03/04 16:03:15 phk Exp $ + * $Id: lpt.c,v 1.30.4.9 1996/04/15 17:14:12 joerg Exp $ */ /* diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h index 9e10ba91a5107..bc5566f35fef2 100644 --- a/sys/i386/isa/lptreg.h +++ b/sys/i386/isa/lptreg.h @@ -6,7 +6,7 @@ * William Jolitz. * * form: @(#)lptreg.h 1.1 (Berkeley) 12/19/90 - * $Id$ + * $Id: lptreg.h,v 1.2 1993/10/16 13:46:12 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 04e5edb675954..c82eedc42bbfa 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.46 1995/09/08 11:07:48 bde Exp $ + * $Id: mcd.c,v 1.44.4.2 1995/09/14 07:09:19 davidg Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h index d5ece62169e7c..a350b4c6c911f 100644 --- a/sys/i386/isa/mcdreg.h +++ b/sys/i386/isa/mcdreg.h @@ -41,7 +41,7 @@ * the manufacturer or anyone else might provide better documentation, * so this file (and the driver) will then have a better quality. * - * $Id: mcdreg.h,v 1.7 1995/01/30 06:44:40 ache Exp $ + * $Id: mcdreg.h,v 1.8 1995/05/30 08:02:45 rgrimes Exp $ */ #ifndef MCD_H diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 8606c6435cc5f..3cae2d31f5702 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.12.4.2 1996/06/02 19:00:18 joerg Exp $ + * $Id: mse.c,v 1.12.4.4 1996/06/05 19:49:04 nate Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index e83a7aa301d45..48de333382e8e 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.23 1995/05/30 08:02:51 rgrimes Exp $ + * $Id: npx.c,v 1.23.4.1 1996/01/13 10:46:51 davidg Exp $ */ #include "npx.h" diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 28c237eb7f846..41a47191b0ce6 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -25,7 +25,7 @@ * (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: pcaudio.c,v 1.13.4.1 1995/09/14 07:09:21 davidg Exp $ + * $Id: pcaudio.c,v 1.13.4.2 1996/06/09 14:25:45 joerg Exp $ */ #include "pca.h" diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index a35c8b51d498d..55c23f9d8ae71 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.8.4.6 1996/06/26 04:36:43 davidg Exp $ +** $Id: pcibus.c,v 1.8.4.7 1996/08/05 19:25:41 se Exp $ ** ** pci bus subroutines for i386 architecture. ** diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c index fba64a8f22e68..6d51101007eb8 100644 --- a/sys/i386/isa/random_machdep.c +++ b/sys/i386/isa/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.9 1996/06/17 16:47:43 bde Exp $ + * $Id: random_machdep.c,v 1.9.2.1 1996/06/26 06:24:25 markm Exp $ * * Version 0.95, last modified 18-Oct-95 * diff --git a/sys/i386/isa/readMBR.c b/sys/i386/isa/readMBR.c index 751572346df44..ba82273119fbc 100644 --- a/sys/i386/isa/readMBR.c +++ b/sys/i386/isa/readMBR.c @@ -15,7 +15,7 @@ * written by julian elischer (julian@tfs.com) * * @(#)readMBR.c 8.5 (tfs) 1/21/94 - * $Id: readMBR.c,v 1.4 1994/11/14 13:22:41 bde Exp $ + * $Id: readMBR.c,v 1.5 1995/05/30 08:03:00 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h index 5e144fcee7988..b1205f66ecd44 100644 --- a/sys/i386/isa/rtc.h +++ b/sys/i386/isa/rtc.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)rtc.h 7.1 (Berkeley) 5/12/91 - * $Id: rtc.h,v 1.7 1994/12/04 20:22:20 joerg Exp $ + * $Id: rtc.h,v 1.7.4.1 1996/06/25 17:39:21 joerg Exp $ */ #ifndef _I386_ISA_RTC_H_ diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index fee6a4be6a0de..a44b28bf9164f 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.6 1995/09/08 11:07:55 bde Exp $ */ +/* $Id: scd.c,v 1.5.4.1 1995/09/14 07:09:27 davidg Exp $ */ /* Please send any comments to micke@dynas.se */ diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h index 6929992429168..ce70b0e42af24 100644 --- a/sys/i386/isa/scdreg.h +++ b/sys/i386/isa/scdreg.h @@ -25,7 +25,7 @@ * (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: scdreg.h,v 1.3 1995/02/06 22:35:07 jkh Exp $ + * $Id: scdreg.h,v 1.1 1995/03/24 18:33:02 jkh Exp $ * */ diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index cf1870c4ec8f6..4325631ea11cd 100644 --- a/sys/i386/isa/seagate.c +++ b/sys/i386/isa/seagate.c @@ -60,7 +60,7 @@ * that category, with the possible exception of scanners and * some of the older MO drives. * - * $Id: seagate.c,v 1.8.4.2 1995/08/31 06:36:08 davidg Exp $ + * $Id: seagate.c,v 1.8.4.3 1996/04/01 00:19:42 gibbs Exp $ */ /* diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 2adc3319f4e09..b9f1d984e88b4 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.c,v 1.9.2.5 1996/07/01 11:01:58 peter Exp $ */ #ifndef lint diff --git a/sys/i386/isa/si_code.c b/sys/i386/isa/si_code.c index 8a48531866d55..264d044d9e81d 100644 --- a/sys/i386/isa/si_code.c +++ b/sys/i386/isa/si_code.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si_code.c,v 1.1 1995/08/10 08:10:57 peter Exp $ + * $Id: si_code.c,v 1.1.2.1 1996/05/05 17:57:44 peter Exp $ */ /* diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 10b37be237e0a..b3261b4fed49b 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.99.4.4 1996/11/07 17:53:06 bde Exp $ + * $Id: sio.c,v 1.99.4.5 1996/11/15 23:36:37 jkh Exp $ */ #include "sio.h" diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h index d43bcdf02ee94..8648f12a62288 100644 --- a/sys/i386/isa/sioreg.h +++ b/sys/i386/isa/sioreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 - * $Id: sioreg.h,v 1.2 1993/10/16 19:17:18 rgrimes Exp $ + * $Id: sioreg.h,v 1.3 1995/01/20 07:34:18 wpaul Exp $ */ diff --git a/sys/i386/isa/sireg.h b/sys/i386/isa/sireg.h index 6a8dd4fc88f8c..9628d01ef3718 100644 --- a/sys/i386/isa/sireg.h +++ b/sys/i386/isa/sireg.h @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: sireg.h,v 1.1 1995/08/09 13:13:47 peter Exp $ */ /* diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc index 24dc73203ebca..0aeeb782693cd 100644 --- a/sys/i386/isa/sound/sound.doc +++ b/sys/i386/isa/sound/sound.doc @@ -1,4 +1,4 @@ -$Id: sound.doc,v 1.4 1995/09/01 19:09:10 jkh Exp $ +$Id: sound.doc,v 1.3.4.1 1995/09/14 23:37:16 jkh Exp $ Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system. See also /sys/i386/conf/LINT. diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 6cff1ed0e6915..d23caee766f1b 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.29 1995/09/08 19:57:13 bde Exp $ + * $Id: soundcard.c,v 1.26.4.1 1995/09/14 23:37:21 jkh Exp $ */ #include "sound_config.h" diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index 1d85e7a4acc0b..722b409e5ca44 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.14 1995/05/30 08:03:09 rgrimes Exp $ + * $Id: spkr.c,v 1.14.4.1 1995/09/14 07:09:30 davidg Exp $ */ #include "speaker.h" diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 93c0eff5ca440..caf9b6c0e39d8 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.3 1996/06/12 04:26:36 gpalmer Exp $ + * $Id: stallion.c,v 1.3.2.1 1996/06/23 23:24:36 peter Exp $ */ /*****************************************************************************/ diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 18c20b62be880..e135e339f5017 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (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: syscons.c,v 1.117.4.15 1996/11/15 23:36:39 jkh Exp $ + * $Id: syscons.c,v 1.117.4.16 1997/02/05 05:41:50 davidg Exp $ */ #include "sc.h" diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h index 22d0d63106d93..5f97aeeaf1b18 100644 --- a/sys/i386/isa/syscons.h +++ b/sys/i386/isa/syscons.h @@ -25,7 +25,7 @@ * (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: syscons.h,v 1.9.4.1 1995/09/14 07:09:34 davidg Exp $ + * $Id: syscons.h,v 1.9.4.2 1996/11/10 16:57:43 nate Exp $ */ #ifndef _I386_ISA_SYSCONS_H_ diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h index 5742f6601493e..4609bb29ca0e7 100644 --- a/sys/i386/isa/timerreg.h +++ b/sys/i386/isa/timerreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp - * $Id$ + * $Id: timerreg.h,v 1.2 1993/10/16 13:46:26 rgrimes Exp $ */ /* diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 59c152fb770f2..72f5274cc52cc 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.33.4.4 1996/04/01 00:19:43 gibbs Exp $ + * $Id: ultra14f.c,v 1.33.4.5 1996/05/21 23:33:48 dima Exp $ */ #include <sys/types.h> diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 165e127001570..5586529f95bb0 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.12 1995/04/15 21:32:18 bde Exp $ + * $Id: vector.s,v 1.12.4.1 1996/11/08 13:39:42 jkh Exp $ */ #include <i386/isa/icu.h> diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index b0ef45b11848d..c5e2a61267ef7 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.81.4.1 1995/10/02 08:14:31 davidg Exp $ + * $Id: wd.c,v 1.81.4.2 1995/10/22 23:14:38 davidg Exp $ */ /* TODO: diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index 1674923447c91..18c21bc1b4cc7 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wdreg.h,v 1.7 1995/02/26 01:15:29 bde Exp $ + * $Id: wdreg.h,v 1.8 1995/03/22 05:23:01 davidg Exp $ */ /* diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index c20224963aea3..eb65346b43f13 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.17.4.1 1995/09/14 07:09:39 davidg Exp $ + * $Id: wt.c,v 1.17.4.2 1996/06/25 17:45:54 joerg Exp $ * */ diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h index e7b9ba2feb84a..ec1080633f7e7 100644 --- a/sys/i386/isa/wtreg.h +++ b/sys/i386/isa/wtreg.h @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wtreg.h,v 1.6 1996/01/08 12:46:15 joerg Exp $ + * $Id: wtreg.h,v 1.5.4.1 1996/06/25 17:45:55 joerg Exp $ * */ diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 276e8ce8788e1..91c0761040089 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,7 @@ * (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: imgact_linux.c,v 1.1 1995/06/25 17:32:32 sos Exp $ + * $Id: imgact_linux.c,v 1.1.4.1 1995/08/31 10:00:29 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 9d13bd156057d..5c3059fa05ef1 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -25,7 +25,7 @@ * (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: linux.h,v 1.3 1995/06/08 13:50:52 sos Exp $ + * $Id: linux.h,v 1.1 1995/06/25 17:32:32 sos Exp $ */ #ifndef LINUX_H diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c index 462fe4e98038a..1add645fe076b 100644 --- a/sys/i386/linux/linux_dummy.c +++ b/sys/i386/linux/linux_dummy.c @@ -25,7 +25,7 @@ * (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: linux_dummy.c,v 1.1 1995/06/25 17:32:33 sos Exp $ + * $Id: linux_dummy.c,v 1.1.4.1 1996/03/04 19:48:38 peter Exp $ */ #include <sys/param.h> diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c index 646101db81130..0184ae1fe595b 100644 --- a/sys/i386/linux/linux_file.c +++ b/sys/i386/linux/linux_file.c @@ -25,7 +25,7 @@ * (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: linux_file.c,v 1.2 1995/08/28 00:50:08 swallace Exp $ + * $Id: linux_file.c,v 1.1.4.1 1995/10/07 12:23:53 davidg Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_generic.c b/sys/i386/linux/linux_generic.c index 7704ceed654ef..3fd0ce6531d50 100644 --- a/sys/i386/linux/linux_generic.c +++ b/sys/i386/linux/linux_generic.c @@ -25,7 +25,7 @@ * (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: linux_generic.c,v 1.1 1995/06/25 17:32:34 sos Exp $ + * $Id: linux_generic.c,v 1.1.4.1 1996/02/22 19:20:46 peter Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c index 12adff4a18a85..ab8e099bb6d92 100644 --- a/sys/i386/linux/linux_ioctl.c +++ b/sys/i386/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (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: linux_ioctl.c,v 1.2 1995/06/07 21:27:57 sos Exp $ + * $Id: linux_ioctl.c,v 1.1 1995/06/25 17:32:35 sos Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c index b38b229c691f5..e014a3c8b8092 100644 --- a/sys/i386/linux/linux_ipc.c +++ b/sys/i386/linux/linux_ipc.c @@ -25,7 +25,7 @@ * (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: linux_ipc.c,v 1.2 1995/06/07 21:27:57 sos Exp $ + * $Id: linux_ipc.c,v 1.1 1995/06/25 17:32:36 sos Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index b1dba290d8458..1a681ab441e56 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (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: linux_misc.c,v 1.1.4.1 1995/10/07 12:31:18 davidg Exp $ + * $Id: linux_misc.c,v 1.1.4.2 1996/03/04 19:46:16 peter Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c index 528bb62d2aa3b..2d04e0c8f3b51 100644 --- a/sys/i386/linux/linux_signal.c +++ b/sys/i386/linux/linux_signal.c @@ -25,7 +25,7 @@ * (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: linux_signal.c,v 1.2 1995/06/07 21:27:57 sos Exp $ + * $Id: linux_signal.c,v 1.1 1995/06/25 17:32:40 sos Exp $ */ #include <sys/param.h> diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c index 9267063a7f7e1..b0297c52fdab7 100644 --- a/sys/i386/linux/linux_socket.c +++ b/sys/i386/linux/linux_socket.c @@ -25,7 +25,7 @@ * (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: linux_socket.c,v 1.2 1995/06/07 21:27:57 sos Exp $ + * $Id: linux_socket.c,v 1.1 1995/06/25 17:32:41 sos Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/linux/linux_stats.c b/sys/i386/linux/linux_stats.c index 1dbfcf11e64bf..97fe9c62c3a9b 100644 --- a/sys/i386/linux/linux_stats.c +++ b/sys/i386/linux/linux_stats.c @@ -25,7 +25,7 @@ * (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: linux_stats.c,v 1.3 1995/06/08 13:50:52 sos Exp $ + * $Id: linux_stats.c,v 1.1 1995/06/25 17:32:42 sos Exp $ */ #include <sys/param.h> diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 015d49a6d9499..8936c15cebd26 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -25,7 +25,7 @@ * (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: linux_sysent.c,v 1.3 1995/06/08 13:50:52 sos Exp $ + * $Id: linux_sysent.c,v 1.1 1995/06/25 17:32:43 sos Exp $ */ #include <i386/linux/linux.h> diff --git a/sys/i386/scsi/93cx6.c b/sys/i386/scsi/93cx6.c index 9224f40a049df..d77d3d6d0e058 100644 --- a/sys/i386/scsi/93cx6.c +++ b/sys/i386/scsi/93cx6.c @@ -18,7 +18,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: 93cx6.c,v 1.1.2.4 1996/06/08 07:10:43 gibbs Exp $ + * $Id: 93cx6.c,v 1.1.2.5 1997/02/12 18:38:59 gibbs Exp $ */ /* diff --git a/sys/i386/scsi/93cx6.h b/sys/i386/scsi/93cx6.h index 2590e3034a46e..e7031b99c18d0 100644 --- a/sys/i386/scsi/93cx6.h +++ b/sys/i386/scsi/93cx6.h @@ -20,7 +20,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: 93cx6.h,v 1.1.2.3 1996/06/08 07:10:44 gibbs Exp $ + * $Id: 93cx6.h,v 1.1.2.4 1997/02/12 18:39:00 gibbs Exp $ */ #include <sys/param.h> diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index 7349175301878..1859d65b547db 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.c,v 1.29.2.30 1997/02/18 19:53:23 gibbs Exp $ + * $Id: aic7xxx.c,v 1.29.2.31 1997/02/19 01:02:21 gibbs Exp $ */ /* * TODO: diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h index 6222c91e81553..558a5f5f6897b 100644 --- a/sys/i386/scsi/aic7xxx.h +++ b/sys/i386/scsi/aic7xxx.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.h,v 1.10.2.12 1997/02/12 18:39:03 gibbs Exp $ + * $Id: aic7xxx.h,v 1.10.2.13 1997/02/18 04:27:08 gibbs Exp $ */ #ifndef _AIC7XXX_H_ diff --git a/sys/i386/scsi/bt.c b/sys/i386/scsi/bt.c index 288b8e2389429..e24f014269d75 100644 --- a/sys/i386/scsi/bt.c +++ b/sys/i386/scsi/bt.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt.c,v 1.8 1996/03/10 07:11:45 gibbs Exp $ + * $Id: bt.c,v 1.3.2.4 1996/04/01 00:23:16 gibbs Exp $ */ /* diff --git a/sys/i386/scsi/btreg.h b/sys/i386/scsi/btreg.h index 177dd4d418cdd..a2539da41f98f 100644 --- a/sys/i386/scsi/btreg.h +++ b/sys/i386/scsi/btreg.h @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: btreg.h,v 1.3 1996/01/30 22:56:45 mpp Exp $ + * $Id: btreg.h,v 1.2.2.1 1996/04/01 00:23:17 gibbs Exp $ */ #ifndef _BTREG_H_ diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO index de414974103bd..353600b9d4e28 100644 --- a/sys/isofs/cd9660/TODO +++ b/sys/isofs/cd9660/TODO @@ -1,4 +1,4 @@ -# $Id: TODO,v 1.1.1.1 1994/05/24 10:04:12 rgrimes Exp $ +# $Id: TODO,v 1.2 1995/01/16 17:03:23 joerg Exp $ 1) should understand "older", original High Sierra ("CDROM001") type diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c index 32439ce96abfc..bccaa6e8afd43 100644 --- a/sys/isofs/cd9660/cd9660_bmap.c +++ b/sys/isofs/cd9660/cd9660_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94 - * $Id$ + * $Id: cd9660_bmap.c,v 1.2 1994/08/02 07:41:15 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index 22fd911af37aa..6de968d6874d5 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -38,7 +38,7 @@ * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_lookup.c,v 1.7.4.1 1995/10/26 09:16:53 davidg Exp $ + * $Id: cd9660_lookup.c,v 1.7.4.2 1995/11/12 10:40:34 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index e6429b81ead19..0c28cec21de1d 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_node.c,v 1.11 1995/05/30 08:04:59 rgrimes Exp $ + * $Id: cd9660_node.c,v 1.11.4.1 1996/06/12 03:41:35 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h index 1e593a28c20b3..4b625e888d0cf 100644 --- a/sys/isofs/cd9660/cd9660_node.h +++ b/sys/isofs/cd9660/cd9660_node.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_node.h 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_node.h,v 1.4 1995/01/16 17:03:25 joerg Exp $ + * $Id: cd9660_node.h,v 1.5 1995/03/16 18:12:16 bde Exp $ */ /* diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index dca8983016975..de78072b906d9 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_rrip.c,v 1.6 1995/01/16 17:03:26 joerg Exp $ + * $Id: cd9660_rrip.c,v 1.7 1995/05/30 08:05:00 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h index bc9429cbc5eea..48b12badc4022 100644 --- a/sys/isofs/cd9660/cd9660_rrip.h +++ b/sys/isofs/cd9660/cd9660_rrip.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.h 8.1 (Berkeley) 1/21/94 - * $Id: cd9660_rrip.h,v 1.2 1994/08/02 07:41:30 davidg Exp $ + * $Id: cd9660_rrip.h,v 1.3 1995/01/16 17:03:26 joerg Exp $ */ typedef struct { diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c index ed832098cebc3..b9cbb9d4eb279 100644 --- a/sys/isofs/cd9660/cd9660_util.c +++ b/sys/isofs/cd9660/cd9660_util.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_util.c 8.1 (Berkeley) 1/21/94 - * $Id: cd9660_util.c,v 1.4 1995/05/30 08:05:02 rgrimes Exp $ + * $Id: cd9660_util.c,v 1.4.4.1 1995/08/20 02:26:03 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index afa08f473811a..692cc039fc74b 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94 - * $Id: cd9660_vfsops.c,v 1.12 1995/05/19 03:25:35 davidg Exp $ + * $Id: cd9660_vfsops.c,v 1.13 1995/05/30 08:05:03 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index e17e1d9e6b9eb..b4bf370954446 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94 - * $Id: cd9660_vnops.c,v 1.14.4.1 1995/11/12 10:40:36 davidg Exp $ + * $Id: cd9660_vnops.c,v 1.14.4.2 1996/06/25 18:30:21 joerg Exp $ */ #include <sys/param.h> diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h index 406572e42e0ce..12c0f1fbfb825 100644 --- a/sys/isofs/cd9660/iso.h +++ b/sys/isofs/cd9660/iso.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.2 (Berkeley) 1/23/94 - * $Id: iso.h,v 1.4 1995/01/16 17:03:29 joerg Exp $ + * $Id: iso.h,v 1.5 1995/05/30 08:05:06 rgrimes Exp $ */ #define ISODCL(from, to) (to - from + 1) diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h index 031aaa37358bf..610c84cb2e4f2 100644 --- a/sys/isofs/cd9660/iso_rrip.h +++ b/sys/isofs/cd9660/iso_rrip.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso_rrip.h 8.2 (Berkeley) 1/23/94 - * $Id$ + * $Id: iso_rrip.h,v 1.2 1994/08/02 07:41:40 davidg Exp $ */ diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index a09e4848a08d6..4f223d3c824b5 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,5 +1,5 @@ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 -# $Id$ +# $Id: Make.tags.inc,v 1.2 1994/08/02 07:41:47 davidg Exp $ # Common files for "make tags". # Included by the Makefile for each architecture. diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index d6ac72bb8496a..e25a65fd1ff48 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.14.2.2 1995/09/08 13:25:45 davidg Exp $ + * $Id: imgact_aout.c,v 1.14.2.3 1996/04/08 01:28:06 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 1fb4c9213b047..2040d856913b3 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: imgact_gzip.c,v 1.13 1995/03/16 18:12:27 bde Exp $ + * $Id: imgact_gzip.c,v 1.14 1995/05/30 08:05:18 rgrimes Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c index 37423d25685c8..5a81657b049cf 100644 --- a/sys/kern/imgact_shell.c +++ b/sys/kern/imgact_shell.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_shell.c,v 1.6.8.1 1995/09/08 13:25:46 davidg Exp $ + * $Id: imgact_shell.c,v 1.6.8.2 1996/04/08 01:28:08 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index 862418bbcd5d1..6f7e1e39e96fe 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -7,7 +7,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: inflate.c,v 1.4 1994/10/22 11:40:28 phk Exp $ + * $Id: inflate.c,v 1.5 1995/04/15 06:54:13 phk Exp $ * * */ diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index eca015b20b954..2fb2f37e21e9c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.25 1995/05/19 03:26:43 davidg Exp $ + * $Id: init_main.c,v 1.25.4.1 1996/02/22 11:09:58 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 06c21139f3fb7..31184e93a761c 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.15.4.1 1996/03/21 20:25:56 phk Exp $ + * created from $Id: init_sysent.c,v 1.22.4.1 1996/03/21 20:29:51 phk Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index c6c2b42472113..b3afd4a1ed851 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_acct.c 8.1 (Berkeley) 6/14/93 - * $Id: kern_acct.c,v 1.6 1994/10/02 17:35:09 phk Exp $ + * $Id: kern_acct.c,v 1.6.8.1 1995/08/20 02:51:59 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 7a6d79b5fc051..a84e9a5a0ed5a 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ + * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $ */ /* Portions of this software are covered by the following: */ diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 07cec1b7d13ca..f3d230d51e3ac 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.9 1995/03/28 07:56:26 bde Exp $ + * $Id: kern_descrip.c,v 1.10 1995/05/30 08:05:21 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_devconf.c b/sys/kern/kern_devconf.c index bcdf87e23ad4f..5d4fc47b7682d 100644 --- a/sys/kern/kern_devconf.c +++ b/sys/kern/kern_devconf.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_devconf.c,v 1.9 1995/04/13 15:33:14 wollman Exp $ + * $Id: kern_devconf.c,v 1.10 1995/05/30 08:05:23 rgrimes Exp $ */ /* diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 52362105719f3..18e0fbe52ee24 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -259,9 +259,7 @@ interpret: p->p_ucred->cr_groups[0] = attr.va_gid; p->p_flag |= P_SUGID; } else { - if (p->p_ucred->cr_uid == p->p_cred->p_ruid && - p->p_ucred->cr_gid == p->p_cred->p_rgid) - p->p_flag &= ~P_SUGID; + p->p_flag &= ~P_SUGID; } /* diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 646103059b319..d3459bffb5ce5 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.15 1995/05/30 08:05:25 rgrimes Exp $ + * $Id: kern_exit.c,v 1.15.4.1 1996/06/14 02:26:10 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 56b460d3d4e2b..a96bffb810c14 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $Id: kern_fork.c,v 1.12.4.2 1996/05/02 12:09:04 davidg Exp $ + * $Id: kern_fork.c,v 1.12.4.3 1997/02/17 10:58:02 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index d89e2ca450528..c3d96cc5ed4e9 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $Id: kern_ktrace.c,v 1.5 1994/10/02 17:35:15 phk Exp $ + * $Id: kern_ktrace.c,v 1.6 1995/05/30 08:05:28 rgrimes Exp $ */ #ifdef KTRACE diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 113ea1a3d98c2..845e0e75f5172 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.13.4.2 1996/05/31 01:41:54 alex Exp $ + * $Id: kern_lkm.c,v 1.13.4.4 1996/06/05 19:49:10 nate Exp $ */ /* diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 261c47f9efea5..026434d424d1e 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 - * $Id: kern_lockf.c,v 1.3 1994/10/25 11:27:51 davidg Exp $ + * $Id: kern_lockf.c,v 1.4 1995/05/30 08:05:31 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index de7827dbdd5de..fd8988a8de49a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.12 1995/05/30 08:05:33 rgrimes Exp $ + * $Id: kern_malloc.c,v 1.12.4.1 1996/01/29 11:20:25 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 3292ff5bf31b6..3f46bb2045095 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: kern_physio.c,v 1.11.4.3 1996/06/26 06:58:12 davidg Exp $ + * $Id: kern_physio.c,v 1.11.4.4 1996/06/26 07:39:31 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 4175417bfb5e6..a4b69e2012c2d 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.4 (Berkeley) 1/4/94 - * $Id: kern_proc.c,v 1.10 1995/05/30 08:05:37 rgrimes Exp $ + * $Id: kern_proc.c,v 1.10.4.1 1996/06/04 02:46:07 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 95124be933b87..8890ffdfaf51a 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_prot.c,v 1.11.4.3 1996/05/30 01:24:38 davidg Exp $ + * $Id: kern_prot.c,v 1.11.4.5 1996/06/05 19:49:11 nate Exp $ */ /* diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 1c9401f23ac3f..6ce6c614bbd78 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.12 1995/05/30 08:05:39 rgrimes Exp $ + * $Id: kern_resource.c,v 1.12.4.1 1996/07/02 12:49:34 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fedd285285df6..45d2d550ad22c 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.11.4.1 1996/01/31 13:12:27 davidg Exp $ + * $Id: kern_sig.c,v 1.11.4.2 1996/10/19 01:07:38 davidg Exp $ */ #define SIGPROP /* include signal properties table */ diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index a89ad533fc599..ae7e6492fb276 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $Id: kern_subr.c,v 1.7 1995/04/30 05:11:46 davidg Exp $ + * $Id: kern_subr.c,v 1.8 1995/05/08 23:11:12 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 7785ca61f2b76..ccd3b73456fac 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_synch.c,v 1.11 1995/05/30 08:05:44 rgrimes Exp $ + * $Id: kern_synch.c,v 1.11.4.1 1996/01/31 13:12:29 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 0d337878d167d..1b9826e3c4cab 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.25.4.6 1996/06/04 02:46:09 davidg Exp $ + * $Id: kern_sysctl.c,v 1.25.4.7 1996/09/19 08:18:03 pst Exp $ */ /* diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 7828751e67dc8..ef7a575b676aa 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.8 1995/05/30 08:05:47 rgrimes Exp $ + * $Id: kern_time.c,v 1.8.4.1 1995/08/24 03:46:26 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 02c1b299b3a8e..fd49dc18ae6db 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $Id: kern_xxx.c,v 1.10.4.1 1995/08/24 03:50:12 davidg Exp $ + * $Id: kern_xxx.c,v 1.10.4.2 1995/09/12 08:06:48 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index abe49ba9cbc26..df512d6f0174f 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -1,6 +1,6 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $Id: makesyscalls.sh,v 1.11 1995/02/14 19:22:29 sos Exp $ +# $Id: makesyscalls.sh,v 1.12 1995/03/16 18:12:39 bde Exp $ set -e diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index f48ce99f0a37c..e22bf276adfc5 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -41,7 +41,7 @@ * * @(#)subr_autoconf.c 8.1 (Berkeley) 6/10/93 * - * $Id$ + * $Id: subr_autoconf.c,v 1.2 1994/08/02 07:42:26 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 618f4f40564a8..b6b2099ba7481 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.13 1995/05/24 23:33:42 davidg Exp $ + * $Id: subr_diskslice.c,v 1.14 1995/05/30 08:05:51 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 0e4145a3d0b71..3184cf78f39c8 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.8 1995/05/30 08:05:52 rgrimes Exp $ + * $Id: subr_log.c,v 1.8.4.1 1995/08/11 04:02:25 davidg Exp $ */ /* diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 10fd0ecc04d95..d46a456299a95 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.13.4.2 1995/09/12 08:09:31 davidg Exp $ + * $Id: subr_prf.c,v 1.13.4.3 1996/03/21 20:29:52 phk Exp $ */ #include <sys/param.h> diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 3c8ef387223e2..bf64fa556948b 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.5 1995/01/29 03:03:23 bde Exp $ + * $Id: subr_prof.c,v 1.6 1995/03/16 18:12:41 bde Exp $ */ #include <sys/param.h> diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index 0bc6f4cc4eb52..202ce5c19dbcb 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -54,7 +54,7 @@ * functioning of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: subr_rlist.c,v 1.9 1995/03/16 18:12:41 bde Exp $ + * $Id: subr_rlist.c,v 1.10 1995/05/30 08:05:54 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index e866b8aaf9089..883b367c65bb1 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_xxx.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: subr_xxx.c,v 1.3 1994/08/02 07:42:36 davidg Exp $ */ /* diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index d4641221b98a4..f1c8be51f71ac 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $Id: sys_generic.c,v 1.12 1995/04/13 18:24:33 davidg Exp $ + * $Id: sys_generic.c,v 1.13 1995/05/30 08:05:56 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 4a01c60cdfb25..c9d3dd912010b 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sys_process.c,v 1.13 1995/05/12 21:39:48 davidg Exp $ + * $Id: sys_process.c,v 1.14 1995/05/30 08:05:58 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 92cbedc4b5045..8224b1852b642 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $Id: sys_socket.c,v 1.4 1994/10/02 17:35:25 phk Exp $ + * $Id: sys_socket.c,v 1.5 1995/05/30 08:05:59 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 52e46e2540fbb..9d595565c21ac 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.15.4.1 1996/03/21 20:25:56 phk Exp $ + * created from $Id: syscalls.c,v 1.19.4.1 1996/03/21 20:29:52 phk Exp $ */ char *syscallnames[] = { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 910b9984be51c..98c525c3d41e0 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ - $Id: syscalls.master,v 1.15 1995/04/23 12:20:52 ache Exp $ + $Id: syscalls.master,v 1.15.4.1 1996/03/21 20:25:56 phk Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index f0e907b903d98..74dd28d5bbb5e 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: sysv_ipc.c,v 1.1 1994/09/13 14:46:55 dfr Exp $ */ /* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */ /* diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 4444f6e6acf4a..665ddabb8c594 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,4 +1,4 @@ -/* $Id: sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp $ */ +/* $Id: sysv_msg.c,v 1.4 1995/05/30 08:06:01 rgrimes Exp $ */ /* * Implementation of SVID messages diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 0be0e34745173..eded79afa801e 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $Id: sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp $ */ +/* $Id: sysv_sem.c,v 1.5 1995/05/30 08:06:02 rgrimes Exp $ */ /* * Implementation of SVID semaphores diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index ee0d92b533c8f..1a59b995aafe2 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.5.4.1 1995/12/04 02:29:40 jkh Exp $ */ +/* $Id: sysv_shm.c,v 1.5.4.2 1995/12/26 16:05:08 joerg Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d0baeab12eec2..6a1215628f659 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.46.2.2 1995/11/03 08:01:04 davidg Exp $ + * $Id: tty.c,v 1.46.2.3 1996/01/03 17:59:21 davidg Exp $ */ /*- diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index bb16ea53b54d0..705e07a105b13 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $Id: tty_compat.c,v 1.17 1995/08/02 12:53:14 ache Exp $ + * $Id: tty_compat.c,v 1.13.4.1 1995/09/14 07:10:02 davidg Exp $ */ /* diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 14186e3e7ecb7..9b259d4db3b47 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty_conf.c 8.4 (Berkeley) 1/21/94 - * $Id: tty_conf.c,v 1.7 1995/07/29 13:35:34 bde Exp $ + * $Id: tty_conf.c,v 1.6.4.1 1995/09/14 07:10:03 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 6bd2056d84b33..ad784efe16967 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_pty.c,v 1.11.4.4 1996/04/12 07:45:07 bde Exp $ + * $Id: tty_pty.c,v 1.11.4.5 1996/06/08 01:40:08 davidg Exp $ */ /* diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 6e0693ded37e1..2987bc1d1e937 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subr.c,v 1.10.4.3 1995/11/03 08:05:05 davidg Exp $ + * $Id: tty_subr.c,v 1.10.4.4 1996/04/08 01:28:10 davidg Exp $ */ /* diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c index 8f4c84c66383c..cd9d4a512af64 100644 --- a/sys/kern/tty_tb.c +++ b/sys/kern/tty_tb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tb.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: tty_tb.c,v 1.2 1994/08/02 07:42:55 davidg Exp $ */ #include "tb.h" diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 9fe7f33e0b90d..2d25e4716052c 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_tty.c,v 1.4 1994/12/04 01:46:13 ache Exp $ + * $Id: tty_tty.c,v 1.5 1995/05/30 08:06:19 rgrimes Exp $ */ /* diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index f387f998af177..8fc6a9ea92a52 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 - * $Id: uipc_domain.c,v 1.5 1995/05/11 00:13:04 wollman Exp $ + * $Id: uipc_domain.c,v 1.6 1995/05/11 00:16:44 wollman Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index d71ff9f7db5ac..9e8a1bf9f3f70 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.8 1995/02/23 19:10:21 davidg Exp $ + * $Id: uipc_mbuf.c,v 1.9 1995/03/15 07:51:53 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c index 0b72465d1d6c0..31473f038bbb4 100644 --- a/sys/kern/uipc_proto.c +++ b/sys/kern/uipc_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_proto.c,v 1.2 1994/08/02 07:43:04 davidg Exp $ + * $Id: uipc_proto.c,v 1.3 1995/05/11 00:13:05 wollman Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5bbc948b4d6e0..fa64a67c18267 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.10.4.2 1996/05/31 08:04:11 peter Exp $ + * $Id: uipc_socket.c,v 1.10.4.4 1996/06/05 19:49:12 nate Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 21b7949681a72..8057d0f94c42b 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.5.4.4 1996/06/05 19:49:13 nate Exp $ + * $Id: uipc_socket2.c,v 1.5.4.5 1996/09/19 08:18:09 pst Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index fe888d1cec8f1..43c0be48a138e 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id: uipc_syscalls.c,v 1.6 1995/05/30 08:06:24 rgrimes Exp $ + * $Id: uipc_syscalls.c,v 1.6.4.1 1996/02/26 14:01:20 phk Exp $ */ #include <sys/param.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c8fdcf4108e60..7c01403363e2d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.9 1995/05/30 08:06:25 rgrimes Exp $ + * $Id: uipc_usrreq.c,v 1.9.4.1 1995/08/11 03:53:38 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 5f4a3a7fd5ee3..ac895fa5bb29d 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.46.4.8 1996/01/07 00:03:00 davidg Exp $ + * $Id: vfs_bio.c,v 1.46.4.9 1996/06/30 05:23:41 davidg Exp $ */ /* diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index a05b4a0d2ca34..227fb0a3d5147 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.3 (Berkeley) 8/22/94 - * $Id: vfs_cache.c,v 1.14 1995/04/15 00:49:35 davidg Exp $ + * $Id: vfs_cache.c,v 1.15 1995/05/30 08:06:28 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index c5b075528336d..238b4fa64d3d4 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.16 1995/05/30 08:06:30 rgrimes Exp $ + * $Id: vfs_cluster.c,v 1.16.4.1 1995/10/09 04:31:29 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 251d704e176cd..aef8b1b197a36 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.5 1994/09/21 03:46:47 wollman Exp $ + * $Id: vfs_conf.c,v 1.6 1994/11/12 01:47:43 phk Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index ad12721422418..4b7f85267c406 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.9 1994/10/20 00:48:28 wollman Exp $ + * $Id: vfs_init.c,v 1.10 1995/05/30 08:06:32 rgrimes Exp $ */ diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index b816d557d663d..bdf35aa1115ba 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 - * $Id: vfs_lookup.c,v 1.7.4.2 1995/09/12 08:39:06 davidg Exp $ + * $Id: vfs_lookup.c,v 1.7.4.3 1995/10/26 09:17:15 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7226efda22090..c4cd18ca22a95 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94 - * $Id: vfs_subr.c,v 1.30.4.2 1995/10/28 10:11:40 davidg Exp $ + * $Id: vfs_subr.c,v 1.30.4.3 1996/08/15 17:08:20 davidg Exp $ */ /* diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 1a3714eb23fa2..6fa7d939f9683 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.25.4.3 1995/10/26 09:17:19 davidg Exp $ + * $Id: vfs_syscalls.c,v 1.25.4.4 1996/01/16 13:09:33 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index b24031506e428..e5fa3c8835045 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.11.4.3 1995/08/24 05:29:36 davidg Exp $ + * $Id: vfs_vnops.c,v 1.11.4.4 1995/10/26 09:17:22 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh index 339e658943715..95f2e4a5a8718 100644 --- a/sys/kern/vnode_if.sh +++ b/sys/kern/vnode_if.sh @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.sh 8.1 (Berkeley) 6/10/93 -# $Id$ +# $Id: vnode_if.sh,v 1.2 1994/08/02 07:43:34 davidg Exp $ # # Script to produce VFS front-end sugar. diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 4e36675e58844..0f346a3769da0 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.3 (Berkeley) 2/3/94 -# $Id: vnode_if.src,v 1.2 1994/08/02 07:43:37 davidg Exp $ +# $Id: vnode_if.src,v 1.3 1994/09/28 16:45:12 dfr Exp $ # vop_lookup { IN struct vnode *dvp; diff --git a/sys/libkern/Makefile b/sys/libkern/Makefile index 60dc3a01ba126..c57dd896cab73 100644 --- a/sys/libkern/Makefile +++ b/sys/libkern/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 7.9 (Berkeley) 6/1/93 -# $Id: Makefile,v 1.8 1995/03/16 17:32:20 wollman Exp $ +# $Id: Makefile,v 1.9 1995/03/23 07:02:14 rgrimes Exp $ .undef NOPROFILE diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c index 38b9df95e66b7..ba34645b6c015 100644 --- a/sys/libkern/adddi3.c +++ b/sys/libkern/adddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: adddi3.c,v 1.2 1994/08/02 07:43:42 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c index 9f92718ea6708..879af8e02997c 100644 --- a/sys/libkern/anddi3.c +++ b/sys/libkern/anddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: anddi3.c,v 1.2 1994/08/02 07:43:44 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c index 74fa0fdcdbced..ea555137cc6bf 100644 --- a/sys/libkern/ashldi3.c +++ b/sys/libkern/ashldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ashldi3.c,v 1.2 1994/08/02 07:43:46 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c index 51b9da5fefdf8..d2e824e0fae6b 100644 --- a/sys/libkern/ashrdi3.c +++ b/sys/libkern/ashrdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ashrdi3.c,v 1.2 1994/08/02 07:43:48 davidg Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c index de9449b467177..54abcc74e6fe1 100644 --- a/sys/libkern/bcmp.c +++ b/sys/libkern/bcmp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: bcmp.c,v 1.2 1994/08/02 07:43:50 davidg Exp $ */ #include <string.h> diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c index 238bd4eb743ef..4d821c65e68ae 100644 --- a/sys/libkern/cmpdi2.c +++ b/sys/libkern/cmpdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: cmpdi2.c,v 1.2 1994/08/02 07:43:53 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c index f6687f9c9601e..bb45da43d5142 100644 --- a/sys/libkern/divdi3.c +++ b/sys/libkern/divdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: divdi3.c,v 1.2 1994/08/02 07:43:54 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c index 74e24502caeee..d657105c5727e 100644 --- a/sys/libkern/ffs.c +++ b/sys/libkern/ffs.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ffs.c,v 1.2 1994/08/02 07:43:57 davidg Exp $ */ #include <string.h> diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c index 2819cf8e5a0ae..58a11b3f653a0 100644 --- a/sys/libkern/iordi3.c +++ b/sys/libkern/iordi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: iordi3.c,v 1.2 1994/08/02 07:44:00 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c index 7a16e327ff2ce..2fabe9f3bb12d 100644 --- a/sys/libkern/locc.c +++ b/sys/libkern/locc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)locc.c 8.1 (Berkeley) 6/10/93 - * $Id: locc.c,v 1.2 1994/08/02 07:44:04 davidg Exp $ + * $Id: locc.c,v 1.3 1995/03/17 06:15:38 phk Exp $ */ #include <sys/libkern.h> diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c index 0aba85e008137..2290bb6c3bb8b 100644 --- a/sys/libkern/lshldi3.c +++ b/sys/libkern/lshldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: lshldi3.c,v 1.2 1994/08/02 07:44:06 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c index b93de210cec7e..abf38548a0067 100644 --- a/sys/libkern/lshrdi3.c +++ b/sys/libkern/lshrdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: lshrdi3.c,v 1.2 1994/08/02 07:44:08 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c index fc3625b1974d9..73273f48d17b4 100644 --- a/sys/libkern/mcount.c +++ b/sys/libkern/mcount.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mcount.c,v 1.3 1994/09/15 15:41:48 paul Exp $ + * $Id: mcount.c,v 1.4 1995/05/30 08:06:39 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c index efb6f92a5387a..d4ee276a5e8d0 100644 --- a/sys/libkern/moddi3.c +++ b/sys/libkern/moddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: moddi3.c,v 1.2 1994/08/02 07:44:11 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c index 96d100cbe712d..ed7cb8ea797ba 100644 --- a/sys/libkern/muldi3.c +++ b/sys/libkern/muldi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: muldi3.c,v 1.2 1994/08/02 07:44:13 davidg Exp $ + * $Id: muldi3.c,v 1.3 1995/05/30 08:06:41 rgrimes Exp $ */ #include "quad.h" diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c index c4065e218d036..7a6cccc932454 100644 --- a/sys/libkern/negdi2.c +++ b/sys/libkern/negdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: negdi2.c,v 1.2 1994/08/02 07:44:15 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c index f451088c35001..d276002eaec18 100644 --- a/sys/libkern/notdi2.c +++ b/sys/libkern/notdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: notdi2.c,v 1.2 1994/08/02 07:44:17 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c index a2a64c4a984f2..de2455cf11138 100644 --- a/sys/libkern/qdivrem.c +++ b/sys/libkern/qdivrem.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: qdivrem.c,v 1.2 1994/08/02 07:44:19 davidg Exp $ + * $Id: qdivrem.c,v 1.3 1995/05/30 08:06:42 rgrimes Exp $ */ /* diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h index dadd02c8a0f9d..ebbe4443367cf 100644 --- a/sys/libkern/quad.h +++ b/sys/libkern/quad.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)quad.h 8.1 (Berkeley) 6/4/93 - * $Id$ + * $Id: quad.h,v 1.2 1994/08/02 07:44:21 davidg Exp $ */ /* diff --git a/sys/libkern/random.c b/sys/libkern/random.c index 08d316ea5c6fd..a5b07f1cf0c25 100644 --- a/sys/libkern/random.c +++ b/sys/libkern/random.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)random.c 8.1 (Berkeley) 6/10/93 - * $Id: random.c,v 1.2 1994/08/02 07:44:23 davidg Exp $ + * $Id: random.c,v 1.3 1995/03/17 06:15:39 phk Exp $ */ #include <sys/libkern.h> diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c index bd661fbeb0653..341d8571766c7 100644 --- a/sys/libkern/rindex.c +++ b/sys/libkern/rindex.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: rindex.c,v 1.2 1994/08/02 07:44:25 davidg Exp $ */ #include <stddef.h> diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c index c44a6a62599ac..389c19f904dc7 100644 --- a/sys/libkern/scanc.c +++ b/sys/libkern/scanc.c @@ -32,7 +32,7 @@ * * @(#)scanc.c 8.1 (Berkeley) 6/10/93 * - * $Id: scanc.c,v 1.2 1994/08/02 07:44:27 davidg Exp $ + * $Id: scanc.c,v 1.3 1995/03/17 06:15:39 phk Exp $ */ #include <sys/libkern.h> diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c index 0663e44f6a764..c962901a11523 100644 --- a/sys/libkern/skpc.c +++ b/sys/libkern/skpc.c @@ -32,7 +32,7 @@ * * @(#)skpc.c 8.1 (Berkeley) 6/10/93 * - * $Id: skpc.c,v 1.2 1994/08/02 07:44:29 davidg Exp $ + * $Id: skpc.c,v 1.3 1995/03/17 06:15:40 phk Exp $ */ #include <sys/libkern.h> diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c index 07e79231ddb5f..06c24dabcd13c 100644 --- a/sys/libkern/strcat.c +++ b/sys/libkern/strcat.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: strcat.c,v 1.2 1994/08/02 07:44:31 davidg Exp $ */ #include <string.h> diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c index c9c397b57124d..fadd811bf9762 100644 --- a/sys/libkern/strcmp.c +++ b/sys/libkern/strcmp.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: strcmp.c,v 1.2 1994/08/02 07:44:33 davidg Exp $ */ #include <sys/cdefs.h> diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c index 2715720e3d23e..3da63196467d4 100644 --- a/sys/libkern/strcpy.c +++ b/sys/libkern/strcpy.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: strcpy.c,v 1.2 1994/08/02 07:44:36 davidg Exp $ */ #include <sys/cdefs.h> diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c index 1d1352c09e6b0..2f9d5da1daa56 100644 --- a/sys/libkern/strlen.c +++ b/sys/libkern/strlen.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: strlen.c,v 1.2 1994/08/02 07:44:38 davidg Exp $ */ #include <sys/cdefs.h> diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c index 8aea6908849d7..250989447f72b 100644 --- a/sys/libkern/strncpy.c +++ b/sys/libkern/strncpy.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: strncpy.c,v 1.2 1994/08/02 07:44:39 davidg Exp $ */ #include <sys/cdefs.h> diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c index cb54477a4d45c..25cf697d67da6 100644 --- a/sys/libkern/subdi3.c +++ b/sys/libkern/subdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: subdi3.c,v 1.2 1994/08/02 07:44:41 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c index 4aa3e50637dd7..a1a037975785e 100644 --- a/sys/libkern/ucmpdi2.c +++ b/sys/libkern/ucmpdi2.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ucmpdi2.c,v 1.2 1994/08/02 07:44:43 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c index f9a77ec432c72..7cb62e7b30a40 100644 --- a/sys/libkern/udivdi3.c +++ b/sys/libkern/udivdi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: udivdi3.c,v 1.2 1994/08/02 07:44:44 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c index ccd457d0adce7..14a5bc864cc3c 100644 --- a/sys/libkern/umoddi3.c +++ b/sys/libkern/umoddi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: umoddi3.c,v 1.2 1994/08/02 07:44:46 davidg Exp $ */ #include "quad.h" diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c index e49190902a22b..98b2a2bb2df37 100644 --- a/sys/libkern/xordi3.c +++ b/sys/libkern/xordi3.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: xordi3.c,v 1.2 1994/08/02 07:44:48 davidg Exp $ */ #include "quad.h" diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index d701c33152d83..64b2ea71790f2 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93 - * $Id: dead_vnops.c,v 1.5 1994/10/06 21:06:40 davidg Exp $ + * $Id: dead_vnops.c,v 1.6 1994/10/08 22:37:00 phk Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h index 4c682e7bd370c..ba022238ee049 100644 --- a/sys/miscfs/fdesc/fdesc.h +++ b/sys/miscfs/fdesc/fdesc.h @@ -35,7 +35,7 @@ * * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * - * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $ + * $Id: fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $ */ #ifdef KERNEL diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index f63a0cd2fff59..fe5eff822ff46 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $Id: fdesc_vfsops.c,v 1.5 1995/09/02 20:17:57 mpp Exp $ + * $Id: fdesc_vfsops.c,v 1.4.4.1 1995/09/12 08:48:25 davidg Exp $ */ /* diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 21f56778d2f64..7f1b7e440a3bf 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.9.4.1 1995/09/12 08:48:26 davidg Exp $ + * $Id: fdesc_vnops.c,v 1.9.4.2 1996/06/12 03:42:02 davidg Exp $ */ /* diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 3f2d8ef714e1e..21f8582e9fabc 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $ + * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $ */ extern int (**fifo_vnodeop_p)(); diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index f557ab13505f0..65112abb75124 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.9 1995/05/30 08:06:59 rgrimes Exp $ + * $Id: fifo_vnops.c,v 1.9.4.1 1995/09/28 13:32:03 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h index 2def608e55fc9..b96ee4cf19641 100644 --- a/sys/miscfs/kernfs/kernfs.h +++ b/sys/miscfs/kernfs/kernfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * $Id: kernfs.h,v 1.2 1994/08/02 07:44:59 davidg Exp $ */ #define _PATH_KERNFS "/kern" /* Default mountpoint */ diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 38760a11f399f..0d8d654adf7bb 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vfsops.c 8.4 (Berkeley) 1/21/94 - * $Id: kernfs_vfsops.c,v 1.9 1995/05/25 01:35:15 davidg Exp $ + * $Id: kernfs_vfsops.c,v 1.9.4.1 1996/06/12 03:42:06 davidg Exp $ */ /* diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index 4558ff76d709b..e2f2c39694809 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vnops.c 8.6 (Berkeley) 2/10/94 - * $Id: kernfs_vnops.c,v 1.10 1995/07/31 09:52:21 mpp Exp $ + * $Id: kernfs_vnops.c,v 1.8.4.1 1995/09/07 21:55:27 davidg Exp $ */ /* diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h index 14286ffeee0c7..6163735db5fed 100644 --- a/sys/miscfs/nullfs/null.h +++ b/sys/miscfs/nullfs/null.h @@ -35,7 +35,7 @@ * * @(#)null.h 8.2 (Berkeley) 1/21/94 * - * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $ + * $Id: null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp $ */ struct null_args { diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index 181145811c788..02c828eb6b373 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -35,7 +35,7 @@ * * @(#)null_subr.c 8.4 (Berkeley) 1/21/94 * - * $Id: null_subr.c,v 1.3 1994/10/02 17:48:14 phk Exp $ + * $Id: null_subr.c,v 1.3.8.1 1996/06/12 03:42:10 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index eb1a19231c7dd..6dfc42cf9932d 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -36,7 +36,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vfsops.c,v 1.6 1995/03/16 20:23:39 wollman Exp $ + * $Id: null_vfsops.c,v 1.7 1995/05/30 08:07:01 rgrimes Exp $ */ /* diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 464d15aa62464..34b3f3695e9a5 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -35,7 +35,7 @@ * * @(#)null_vnops.c 8.1 (Berkeley) 6/10/93 * - * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $ + * $Id: null_vnops.c,v 1.8 1995/05/30 08:07:03 rgrimes Exp $ */ /* diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h index 38d7ee0cdd279..00c99d3d62158 100644 --- a/sys/miscfs/portal/portal.h +++ b/sys/miscfs/portal/portal.h @@ -35,7 +35,7 @@ * * @(#)portal.h 8.4 (Berkeley) 1/21/94 * - * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $ + * $Id: portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $ */ struct portal_args { diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 46161e564884f..d5440b8048a96 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -35,7 +35,7 @@ * * @(#)portal_vfsops.c 8.6 (Berkeley) 1/21/94 * - * $Id: portal_vfsops.c,v 1.8 1995/05/30 08:07:05 rgrimes Exp $ + * $Id: portal_vfsops.c,v 1.8.4.1 1996/06/12 03:42:14 davidg Exp $ */ /* diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index 8782e741e868e..507f517c94a96 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.6 1995/05/30 08:07:06 rgrimes Exp $ + * $Id: portal_vnops.c,v 1.6.4.1 1996/06/12 03:42:16 davidg Exp $ */ /* diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README index 38811b3f6e3a3..7c54a04ec66ca 100644 --- a/sys/miscfs/procfs/README +++ b/sys/miscfs/procfs/README @@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself "attach". as before, the child will hit a breakpoint on the first instruction in any newly exec'd image. -$Id: README,v 3.1 1993/12/15 09:40:17 jsp Exp $ +$Id: README,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp $ diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h index dae1963a0a0ec..922b5b1a42f45 100644 --- a/sys/miscfs/procfs/procfs.h +++ b/sys/miscfs/procfs/procfs.h @@ -36,7 +36,7 @@ * * @(#)procfs.h 8.6 (Berkeley) 2/3/94 * - * $Id: procfs.h,v 1.5 1995/05/25 01:35:22 davidg Exp $ + * $Id: procfs.h,v 1.5.4.1 1996/07/02 13:55:15 davidg Exp $ */ /* diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index a9cbb49721f8e..9f40725654ef1 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -36,7 +36,7 @@ * * @(#)procfs_ctl.c 8.3 (Berkeley) 1/21/94 * - * $Id: procfs_ctl.c,v 1.6 1995/07/16 10:12:50 bde Exp $ + * $Id: procfs_ctl.c,v 1.5.4.1 1995/09/14 07:10:11 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c index 331a671279e26..eb6e7cdbc7a95 100644 --- a/sys/miscfs/procfs/procfs_fpregs.c +++ b/sys/miscfs/procfs/procfs_fpregs.c @@ -36,7 +36,7 @@ * * @(#)procfs_fpregs.c 8.1 (Berkeley) 1/27/94 * - * $Id: procfs_fpregs.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $ + * $Id: procfs_fpregs.c,v 1.2 1994/08/02 07:45:12 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index a015f5bc73cf2..bcc85a8a979e8 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.7.4.1 1996/06/18 08:36:18 davidg Exp $ + * $Id: procfs_mem.c,v 1.7.4.2 1996/07/02 01:58:38 davidg Exp $ */ /* diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c index a7699f29e123c..ca4b7d6920bc8 100644 --- a/sys/miscfs/procfs/procfs_note.c +++ b/sys/miscfs/procfs/procfs_note.c @@ -36,7 +36,7 @@ * * @(#)procfs_note.c 8.2 (Berkeley) 1/21/94 * - * $Id: procfs_note.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $ + * $Id: procfs_note.c,v 1.2 1994/08/02 07:45:16 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c index 8b0600a480d00..be9c579765e01 100644 --- a/sys/miscfs/procfs/procfs_regs.c +++ b/sys/miscfs/procfs/procfs_regs.c @@ -36,7 +36,7 @@ * * @(#)procfs_regs.c 8.3 (Berkeley) 1/27/94 * - * $Id: procfs_regs.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $ + * $Id: procfs_regs.c,v 1.2 1994/08/02 07:45:18 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c index 94fce3d737189..c3812c4bd1d3d 100644 --- a/sys/miscfs/procfs/procfs_status.c +++ b/sys/miscfs/procfs/procfs_status.c @@ -36,7 +36,7 @@ * * @(#)procfs_status.c 8.3 (Berkeley) 2/17/94 * - * $Id: procfs_status.c,v 1.4.4.1 1996/05/31 23:39:16 wosch Exp $ + * $Id: procfs_status.c,v 1.4.4.3 1996/06/05 19:49:23 nate Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c index 495836247fcf0..5b9a5abb0090e 100644 --- a/sys/miscfs/procfs/procfs_subr.c +++ b/sys/miscfs/procfs/procfs_subr.c @@ -36,7 +36,7 @@ * * @(#)procfs_subr.c 8.4 (Berkeley) 1/27/94 * - * $Id: procfs_subr.c,v 1.5.4.1 1996/06/12 03:42:19 davidg Exp $ + * $Id: procfs_subr.c,v 1.5.4.2 1996/07/02 13:55:16 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c index 4113063218c39..20d5ef4acd9e5 100644 --- a/sys/miscfs/procfs/procfs_vfsops.c +++ b/sys/miscfs/procfs/procfs_vfsops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_vfsops.c,v 1.9 1995/03/16 20:23:42 wollman Exp $ + * $Id: procfs_vfsops.c,v 1.10 1995/05/25 01:35:23 davidg Exp $ */ /* diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 182afadca3754..367f877788831 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94 * - * $Id: procfs_vnops.c,v 1.14.4.2 1995/09/12 08:52:41 davidg Exp $ + * $Id: procfs_vnops.c,v 1.14.4.3 1996/02/23 15:12:02 peter Exp $ */ /* diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index f3b88f026619a..142f703100341 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.11 1995/04/09 06:03:10 davidg Exp $ + * $Id: spec_vnops.c,v 1.11.4.1 1995/07/08 04:11:55 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index bc26f9d59d127..46d6ff393f8da 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)specdev.h 8.2 (Berkeley) 2/2/94 - * $Id$ + * $Id: specdev.h,v 1.2 1994/08/02 07:45:30 davidg Exp $ */ /* diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index 5be2e5eed4668..2490d8c2009a6 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -35,7 +35,7 @@ * * @(#)umap.h 8.3 (Berkeley) 1/21/94 * - * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $ + * $Id: umap.h,v 1.3 1995/05/30 08:07:15 rgrimes Exp $ */ #define MAPFILEENTRIES 64 diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index a65a5bb030099..fe002228cdfad 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -35,7 +35,7 @@ * * @(#)umap_subr.c 8.6 (Berkeley) 1/26/94 * - * $Id: umap_subr.c,v 1.4 1995/05/30 08:07:17 rgrimes Exp $ + * $Id: umap_subr.c,v 1.4.4.1 1996/06/12 03:42:25 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index 64f05bbd62d61..c67baec959aef 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -35,7 +35,7 @@ * * @(#)umap_vfsops.c 8.3 (Berkeley) 1/21/94 * - * $Id: umap_vfsops.c,v 1.7 1995/03/16 20:23:43 wollman Exp $ + * $Id: umap_vfsops.c,v 1.8 1995/05/30 08:07:18 rgrimes Exp $ */ /* diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index a82d1c6d327be..33812e76cb0b1 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94 - * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $ + * $Id: umap_vnops.c,v 1.9 1995/05/30 08:07:22 rgrimes Exp $ */ /* diff --git a/sys/miscfs/union/libc.opendir.c b/sys/miscfs/union/libc.opendir.c index 15e3a0ce76376..f3130ee7a5b25 100644 --- a/sys/miscfs/union/libc.opendir.c +++ b/sys/miscfs/union/libc.opendir.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: libc.opendir.c,v 1.2 1994/08/02 07:45:40 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h index 05fa4814086a7..bfa9eeae5b2b1 100644 --- a/sys/miscfs/union/union.h +++ b/sys/miscfs/union/union.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union.h 8.2 (Berkeley) 2/17/94 - * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $ + * $Id: union.h,v 1.3 1995/03/16 18:14:02 bde Exp $ */ struct union_args { diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 65149d3c58880..573038af5398d 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.4 (Berkeley) 2/17/94 - * $Id: union_subr.c,v 1.7 1995/08/17 11:53:50 bde Exp $ + * $Id: union_subr.c,v 1.6.4.1 1995/09/18 05:33:20 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index 670c7ce98d907..837bb6c94d373 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94 - * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $ + * $Id: union_vfsops.c,v 1.10 1995/05/30 08:07:26 rgrimes Exp $ */ /* diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 2d082db7642f0..36305d5b8f261 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.6 (Berkeley) 2/17/94 - * $Id: union_vnops.c,v 1.8 1994/11/04 14:41:46 davidg Exp $ + * $Id: union_vnops.c,v 1.8.8.1 1995/09/18 05:33:21 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h index f83b9ec0b1a19..73915dbb53e34 100644 --- a/sys/msdosfs/bootsect.h +++ b/sys/msdosfs/bootsect.h @@ -1,4 +1,4 @@ -/* $Id: bootsect.h,v 1.1 1994/09/19 15:41:36 dfr Exp $ */ +/* $Id: bootsect.h,v 1.2 1995/05/30 08:07:29 rgrimes Exp $ */ /* $NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $ */ /* diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h index 7618126c31013..b10a0efd55f88 100644 --- a/sys/msdosfs/bpb.h +++ b/sys/msdosfs/bpb.h @@ -1,4 +1,4 @@ -/* $Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */ +/* $Id: bpb.h,v 1.2 1995/05/30 08:07:30 rgrimes Exp $ */ /* $NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $ */ /* diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h index a7f2928ec8c5e..4d50522cb2566 100644 --- a/sys/msdosfs/denode.h +++ b/sys/msdosfs/denode.h @@ -1,4 +1,4 @@ -/* $Id: denode.h,v 1.4 1995/03/16 18:14:17 bde Exp $ */ +/* $Id: denode.h,v 1.5 1995/05/30 08:07:32 rgrimes Exp $ */ /* $NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $ */ /*- diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h index f4eecac02d977..6a82a32ea8d62 100644 --- a/sys/msdosfs/direntry.h +++ b/sys/msdosfs/direntry.h @@ -1,4 +1,4 @@ -/* $Id: direntry.h,v 1.1 1994/09/19 15:41:39 dfr Exp $ */ +/* $Id: direntry.h,v 1.2 1995/05/30 08:07:33 rgrimes Exp $ */ /* $NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $ */ /*- diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h index 3b043c14d2304..80a1f9a024335 100644 --- a/sys/msdosfs/fat.h +++ b/sys/msdosfs/fat.h @@ -1,4 +1,4 @@ -/* $Id: fat.h,v 1.2 1994/09/27 20:42:41 phk Exp $ */ +/* $Id: fat.h,v 1.3 1995/05/30 08:07:34 rgrimes Exp $ */ /* $NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c index 88999827db524..046c4a3e332e5 100644 --- a/sys/msdosfs/msdosfs_conv.c +++ b/sys/msdosfs/msdosfs_conv.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_conv.c,v 1.4 1995/03/29 18:48:06 ache Exp $ */ +/* $Id: msdosfs_conv.c,v 1.5 1995/05/30 08:07:36 rgrimes Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $ */ /* diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 0223ff2aaa0f7..2d82582f75205 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_denode.c,v 1.12 1995/05/30 08:07:37 rgrimes Exp $ */ +/* $Id: msdosfs_denode.c,v 1.12.4.1 1996/06/12 03:42:31 davidg Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c index b43f9595b6b55..514bfe7b224e5 100644 --- a/sys/msdosfs/msdosfs_fat.c +++ b/sys/msdosfs/msdosfs_fat.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_fat.c,v 1.6 1995/04/11 16:43:20 bde Exp $ */ +/* $Id: msdosfs_fat.c,v 1.7 1995/05/30 08:07:40 rgrimes Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c index a80e5ae7bac3c..da09cbba138ed 100644 --- a/sys/msdosfs/msdosfs_lookup.c +++ b/sys/msdosfs/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_lookup.c,v 1.3 1995/05/09 16:30:44 bde Exp $ */ +/* $Id: msdosfs_lookup.c,v 1.4 1995/05/30 08:07:41 rgrimes Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index 96f4d2a0007b2..939ea07e05bb0 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.7 1995/05/30 08:07:43 rgrimes Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.7.4.1 1996/04/03 23:39:26 gpalmer Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index c168d6a0c7b5f..901529ba0f166 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.17.2.4 1995/10/26 09:17:31 davidg Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.17.2.5 1996/07/02 18:40:22 bde Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h index 5309acbd08515..59d4010ec47e6 100644 --- a/sys/msdosfs/msdosfsmount.h +++ b/sys/msdosfs/msdosfsmount.h @@ -1,4 +1,4 @@ -/* $Id: msdosfsmount.h,v 1.2 1994/09/27 20:42:59 phk Exp $ */ +/* $Id: msdosfsmount.h,v 1.3 1995/05/30 08:07:47 rgrimes Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */ /*- diff --git a/sys/net/bpf.c b/sys/net/bpf.c index af8330c4c15c8..4f58c33f6eafd 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * - * $Id: bpf.c,v 1.7.4.4 1995/10/07 12:47:58 davidg Exp $ + * $Id: bpf.c,v 1.7.4.5 1996/06/08 06:14:15 davidg Exp $ */ #include "bpfilter.h" diff --git a/sys/net/bpf.h b/sys/net/bpf.h index d546b6415c5c1..f5ef5227169c4 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -37,7 +37,7 @@ * * @(#)bpf.h 8.1 (Berkeley) 6/10/93 * - * $Id: bpf.h,v 1.6 1995/09/08 11:08:55 bde Exp $ + * $Id: bpf.h,v 1.4.4.2 1995/09/14 07:10:16 davidg Exp $ */ #ifndef _NET_BPF_H_ diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h index 44dab52e0c9d7..a6312a501453a 100644 --- a/sys/net/bpf_compat.h +++ b/sys/net/bpf_compat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)bpf_compat.h 8.1 (Berkeley) 6/10/93 - * $Id: bpf_compat.h,v 1.2 1994/08/02 07:45:56 davidg Exp $ + * $Id: bpf_compat.h,v 1.3 1994/08/21 05:11:39 paul Exp $ */ #ifndef _NET_BPF_COMPAT_H_ diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 076f25577060a..95c2804a94e70 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -37,7 +37,7 @@ * * @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93 * - * $Id: bpf_filter.c,v 1.4 1995/04/01 01:46:27 davidg Exp $ + * $Id: bpf_filter.c,v 1.5 1995/05/30 08:07:56 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index a0cf3b3006a68..17358dedb3883 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -37,7 +37,7 @@ * * @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93 * - * $Id: bpfdesc.h,v 1.4 1994/08/21 05:11:39 paul Exp $ + * $Id: bpfdesc.h,v 1.4.8.1 1995/07/23 04:58:33 davidg Exp $ */ #ifndef _NET_BPFDESC_H_ diff --git a/sys/net/if.c b/sys/net/if.c index bc073fe3dbfd0..c730edc0dc898 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.3 (Berkeley) 1/4/94 - * $Id: if.c,v 1.15.4.1 1995/07/13 09:10:43 davidg Exp $ + * $Id: if.c,v 1.15.4.2 1996/06/24 22:04:11 gpalmer Exp $ */ #include <sys/param.h> diff --git a/sys/net/if.h b/sys/net/if.h index 802ff9aee721d..b4cab1413fc53 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.18 1995/05/30 08:07:59 rgrimes Exp $ + * $Id: if.h,v 1.18.4.1 1996/06/24 22:04:13 gpalmer Exp $ */ #ifndef _NET_IF_H_ diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 1515110943015..b3a2cd34465e2 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_arp.h 8.1 (Berkeley) 6/10/93 - * $Id: if_arp.h,v 1.4 1994/11/15 14:41:38 bde Exp $ + * $Id: if_arp.h,v 1.5 1994/11/16 02:15:05 phk Exp $ */ #ifndef _NET_IF_ARP_H_ diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c index 6afbca2a00a01..669a8f1644bb8 100644 --- a/sys/net/if_disc.c +++ b/sys/net/if_disc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_disc.c,v 1.4.4.1 1995/10/07 12:51:12 davidg Exp $ + * $Id: if_disc.c,v 1.4.4.2 1996/06/24 22:04:14 gpalmer Exp $ */ /* diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index e76b88ad1f67c..1dfed2de457ff 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_dl.h 8.1 (Berkeley) 6/10/93 - * $Id: if_dl.h,v 1.3 1994/08/21 05:11:41 paul Exp $ + * $Id: if_dl.h,v 1.4 1995/05/30 08:08:02 rgrimes Exp $ */ #ifndef _NET_IF_DL_H_ diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index a2d86ff3d542b..72414b207c4d4 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ethersubr.c,v 1.9.2.3 1996/06/05 19:49:24 nate Exp $ + * $Id: if_ethersubr.c,v 1.9.2.4 1996/06/24 22:04:16 gpalmer Exp $ */ #include <sys/param.h> diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 36743f0fa5f74..eda9602bf112b 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $Id: if_fddisubr.c,v 1.5.4.4 1996/06/24 22:04:18 gpalmer Exp $ + * $Id: if_fddisubr.c,v 1.5.4.5 1996/11/12 08:43:03 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h index da89ee7126f73..74e27fb4d00f6 100644 --- a/sys/net/if_llc.h +++ b/sys/net/if_llc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_llc.h 8.1 (Berkeley) 6/10/93 - * $Id: if_llc.h,v 1.2 1994/08/02 07:46:16 davidg Exp $ + * $Id: if_llc.h,v 1.3 1994/08/21 05:11:42 paul Exp $ */ #ifndef _NET_IF_LLC_H_ diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index de9f1ab247e51..936f2f970fef3 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_loop.c,v 1.10.4.2 1996/06/24 22:04:19 gpalmer Exp $ + * $Id: if_loop.c,v 1.10.4.3 1996/06/27 05:11:04 gpalmer Exp $ */ /* diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 2835d608e8eec..d96a7db8b5e01 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.14.2.4 1996/06/25 04:28:54 gpalmer Exp $ */ +/* $Id: if_ppp.c,v 1.14.2.5 1996/06/25 04:44:55 gpalmer Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ #include "ppp.h" diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h index 97df728e1a7e9..789a86075b346 100644 --- a/sys/net/if_ppp.h +++ b/sys/net/if_ppp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: if_ppp.h,v 1.2 1994/09/23 00:13:20 wollman Exp $ + * $Id: if_ppp.h,v 1.3 1995/05/30 08:08:09 rgrimes Exp $ */ #ifndef _IF_PPP_H_ diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 761650560eb96..ea7b55ed7ff4f 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 - * $Id: if_sl.c,v 1.20.4.3 1995/10/07 12:57:41 davidg Exp $ + * $Id: if_sl.c,v 1.20.4.4 1996/06/24 22:04:21 gpalmer Exp $ */ /* diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index ade190ff71576..e1506927c6113 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -32,7 +32,7 @@ * * @(#)if_slvar.h 8.3 (Berkeley) 2/1/94 * - * $Id: if_slvar.h,v 1.5 1995/03/30 20:43:32 ache Exp $ + * $Id: if_slvar.h,v 1.6 1995/05/30 08:08:13 rgrimes Exp $ */ #ifndef _NET_IF_SLVAR_H_ diff --git a/sys/net/if_types.h b/sys/net/if_types.h index 9a573612b2d4f..a02ecfdb1e2b9 100644 --- a/sys/net/if_types.h +++ b/sys/net/if_types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_types.h 8.2 (Berkeley) 4/20/94 - * $Id: if_types.h,v 1.3 1994/08/21 05:11:43 paul Exp $ + * $Id: if_types.h,v 1.4 1995/02/25 15:57:55 davidg Exp $ */ #ifndef _NET_IF_TYPES_H_ diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 35583483ce8fe..ab72a7382d342 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)netisr.h 8.1 (Berkeley) 6/10/93 - * $Id: netisr.h,v 1.5 1995/01/05 19:51:47 se Exp $ + * $Id: netisr.h,v 1.6 1995/05/11 00:13:10 wollman Exp $ */ #ifndef _NET_NETISR_H_ diff --git a/sys/net/pppcompress.c b/sys/net/pppcompress.c index c29894eb2b0ca..3c2dfd1c414ed 100644 --- a/sys/net/pppcompress.c +++ b/sys/net/pppcompress.c @@ -44,7 +44,7 @@ * so that the entire packet being decompressed doesn't have * to be in contiguous memory (just the compressed header). * - * $Id: pppcompress.c,v 1.4.4.1 1996/04/11 06:51:52 davidg Exp $ + * $Id: pppcompress.c,v 1.4.4.2 1996/04/11 21:01:38 davidg Exp $ */ #include <sys/types.h> diff --git a/sys/net/pppcompress.h b/sys/net/pppcompress.h index 93f3e510211df..99b8817071ccd 100644 --- a/sys/net/pppcompress.h +++ b/sys/net/pppcompress.h @@ -39,7 +39,7 @@ * - added sl_uncompress_tcp_part. * * From: slcompress.h 7.4 90/06/28 - * $Id: pppcompress.h,v 1.2 1994/09/23 00:13:22 wollman Exp $ + * $Id: pppcompress.h,v 1.3 1995/05/30 08:08:18 rgrimes Exp $ */ #ifndef _NET_PPPCOMPRESS_H_ diff --git a/sys/net/radix.c b/sys/net/radix.c index 7073d604c8f1e..e327827ea19e7 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)radix.c 8.4 (Berkeley) 11/2/94 - * $Id: radix.c,v 1.8 1995/04/28 23:01:34 pst Exp $ + * $Id: radix.c,v 1.9 1995/05/30 08:08:20 rgrimes Exp $ */ /* diff --git a/sys/net/radix.h b/sys/net/radix.h index 2384936cc56bf..118bb1acfb646 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)radix.h 8.2 (Berkeley) 10/31/94 - * $Id$ + * $Id: radix.h,v 1.8 1995/04/28 23:01:37 pst Exp $ */ #ifndef _RADIX_H_ diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index dfb08e41598c5..a918446d28159 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_cb.c,v 1.3 1994/10/08 22:38:24 phk Exp $ + * $Id: raw_cb.c,v 1.4 1995/05/30 08:08:21 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index e975432e21807..6f117344a7d86 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.h 8.1 (Berkeley) 6/10/93 - * $Id: raw_cb.h,v 1.2 1994/08/02 07:46:36 davidg Exp $ + * $Id: raw_cb.h,v 1.3 1994/08/21 05:11:46 paul Exp $ */ #ifndef _NET_RAW_CB_H_ diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index bf6f6bbdb4331..a55de12309f23 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_usrreq.c,v 1.5 1995/02/16 01:11:38 wollman Exp $ + * $Id: raw_usrreq.c,v 1.6 1995/05/30 08:08:22 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/net/route.c b/sys/net/route.c index a9d52f652beb9..de15fb40a9beb 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.2 (Berkeley) 11/15/93 - * $Id: route.c,v 1.23.4.2 1995/11/03 07:59:19 davidg Exp $ + * $Id: route.c,v 1.23.4.3 1996/06/08 02:02:03 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/net/route.h b/sys/net/route.h index e12f986986e8a..ad0e225285d70 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.3 (Berkeley) 4/19/94 - * $Id: route.h,v 1.13 1995/03/20 21:30:21 wollman Exp $ + * $Id: route.h,v 1.14 1995/05/30 08:08:26 rgrimes Exp $ */ #ifndef _NET_ROUTE_H_ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 7e65578dc12e4..95a0e3306cb55 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.5 (Berkeley) 11/2/94 - * $Id: rtsock.c,v 1.12 1995/05/15 22:57:53 davidg Exp $ + * $Id: rtsock.c,v 1.13 1995/05/30 08:08:31 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c index 1be07933aca62..51e72d4291013 100644 --- a/sys/net/slcompress.c +++ b/sys/net/slcompress.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)slcompress.c 8.2 (Berkeley) 4/16/94 - * $Id: slcompress.c,v 1.5 1995/05/30 08:08:33 rgrimes Exp $ + * $Id: slcompress.c,v 1.5.4.1 1996/04/11 06:51:53 davidg Exp $ */ /* diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 239f63327f137..710d845afae8c 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -35,7 +35,7 @@ * * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. - * $Id: slcompress.h,v 1.5 1994/08/22 14:16:36 bde Exp $ + * $Id: slcompress.h,v 1.6 1995/05/30 08:08:34 rgrimes Exp $ */ #ifndef _NET_SLCOMPRESS_H_ diff --git a/sys/net/slip.h b/sys/net/slip.h index d438d42a3c8be..6ccf58075b817 100644 --- a/sys/net/slip.h +++ b/sys/net/slip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)slip.h 8.1 (Berkeley) 2/12/94 - * $Id: slip.h,v 1.5 1995/04/28 18:47:29 ache Exp $ + * $Id: slip.h,v 1.6 1995/04/29 15:24:00 bde Exp $ */ #ifndef _NET_SLIP_H_ diff --git a/sys/netccitt/ccitt_proto.c b/sys/netccitt/ccitt_proto.c index b6b49b4579d82..7abd9412615b5 100644 --- a/sys/netccitt/ccitt_proto.c +++ b/sys/netccitt/ccitt_proto.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ccitt_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: ccitt_proto.c,v 1.2 1994/08/02 07:46:54 davidg Exp $ + * $Id: ccitt_proto.c,v 1.3 1995/05/11 00:13:13 wollman Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/dll.h b/sys/netccitt/dll.h index 005525b05f63a..01a69f805f72b 100644 --- a/sys/netccitt/dll.h +++ b/sys/netccitt/dll.h @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)dll.h 8.1 (Berkeley) 6/10/93 - * $Id: dll.h,v 1.3 1994/08/21 05:44:06 paul Exp $ + * $Id: dll.h,v 1.4 1995/05/30 08:08:37 rgrimes Exp $ */ #ifndef _NETCCITT_DLL_H_ diff --git a/sys/netccitt/hd_debug.c b/sys/netccitt/hd_debug.c index f368d420035ad..7ab44a2eabdbe 100644 --- a/sys/netccitt/hd_debug.c +++ b/sys/netccitt/hd_debug.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_debug.c 8.1 (Berkeley) 6/10/93 - * $Id: hd_debug.c,v 1.3 1995/02/15 06:29:42 jkh Exp $ + * $Id: hd_debug.c,v 1.4 1995/05/30 08:08:38 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/hd_input.c b/sys/netccitt/hd_input.c index 91fd2fe7bdfa9..2c4fdd532ca81 100644 --- a/sys/netccitt/hd_input.c +++ b/sys/netccitt/hd_input.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_input.c 8.1 (Berkeley) 6/10/93 - * $Id: hd_input.c,v 1.4 1995/05/11 19:26:39 rgrimes Exp $ + * $Id: hd_input.c,v 1.5 1995/05/30 08:08:40 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/hd_output.c b/sys/netccitt/hd_output.c index 903c27e507cad..cc1d41f576171 100644 --- a/sys/netccitt/hd_output.c +++ b/sys/netccitt/hd_output.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_output.c 8.1 (Berkeley) 6/10/93 - * $Id: hd_output.c,v 1.3 1995/02/15 06:29:44 jkh Exp $ + * $Id: hd_output.c,v 1.4 1995/05/30 08:08:42 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/hd_subr.c b/sys/netccitt/hd_subr.c index c379188a8ce09..4d0b32eefc27e 100644 --- a/sys/netccitt/hd_subr.c +++ b/sys/netccitt/hd_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: hd_subr.c,v 1.3 1995/02/15 06:29:45 jkh Exp $ + * $Id: hd_subr.c,v 1.4 1995/05/30 08:08:43 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/hd_timer.c b/sys/netccitt/hd_timer.c index 8764043c527ac..31520707f5dc1 100644 --- a/sys/netccitt/hd_timer.c +++ b/sys/netccitt/hd_timer.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: hd_timer.c,v 1.3 1995/02/15 06:29:46 jkh Exp $ + * $Id: hd_timer.c,v 1.4 1995/05/30 08:08:44 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h index 24679ac32f77f..ef87870821271 100644 --- a/sys/netccitt/hd_var.h +++ b/sys/netccitt/hd_var.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hd_var.h 8.1 (Berkeley) 6/10/93 - * $Id: hd_var.h,v 1.2 1994/08/02 07:47:10 davidg Exp $ + * $Id: hd_var.h,v 1.3 1994/08/21 05:44:06 paul Exp $ */ #ifndef _NETCCITT_HD_VAR_H_ diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h index f7fd79359b205..5ba875211180c 100644 --- a/sys/netccitt/hdlc.h +++ b/sys/netccitt/hdlc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)hdlc.h 8.1 (Berkeley) 6/10/93 - * $Id: hdlc.h,v 1.2 1994/08/02 07:47:12 davidg Exp $ + * $Id: hdlc.h,v 1.3 1994/08/21 05:44:07 paul Exp $ */ #ifndef _NETCCITT_HDLC_H_ diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c index 7b85f4a3ee14e..a48116031dd6e 100644 --- a/sys/netccitt/if_x25subr.c +++ b/sys/netccitt/if_x25subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_x25subr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_x25subr.c,v 1.5 1995/04/26 18:10:50 pst Exp $ + * $Id: if_x25subr.c,v 1.6 1995/05/30 08:08:46 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c index 18effc365c7ca..37d8ef6e7d987 100644 --- a/sys/netccitt/llc_input.c +++ b/sys/netccitt/llc_input.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_input.c 8.1 (Berkeley) 6/10/93 - * $Id: llc_input.c,v 1.3 1994/12/13 22:32:13 wollman Exp $ + * $Id: llc_input.c,v 1.4 1995/05/30 08:08:48 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/llc_output.c b/sys/netccitt/llc_output.c index 05cf9ae69975e..cb72e4f4095bd 100644 --- a/sys/netccitt/llc_output.c +++ b/sys/netccitt/llc_output.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_output.c 8.1 (Berkeley) 6/10/93 - * $Id: llc_output.c,v 1.3 1995/03/19 14:29:00 davidg Exp $ + * $Id: llc_output.c,v 1.4 1995/05/30 08:08:50 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c index 9699be643e21c..8f03f93220f71 100644 --- a/sys/netccitt/llc_subr.c +++ b/sys/netccitt/llc_subr.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: llc_subr.c,v 1.4 1995/05/11 19:26:40 rgrimes Exp $ + * $Id: llc_subr.c,v 1.5 1995/05/30 08:08:52 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/llc_timer.c b/sys/netccitt/llc_timer.c index 0714d51e3b94a..e96261102957a 100644 --- a/sys/netccitt/llc_timer.c +++ b/sys/netccitt/llc_timer.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: llc_timer.c,v 1.2 1994/08/02 07:47:23 davidg Exp $ + * $Id: llc_timer.c,v 1.3 1995/05/30 08:08:53 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h index 6de1aa28a02be..a36b8d9d7037e 100644 --- a/sys/netccitt/llc_var.h +++ b/sys/netccitt/llc_var.h @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)llc_var.h 8.1 (Berkeley) 6/10/93 - * $Id: llc_var.h,v 1.3 1994/08/21 05:44:08 paul Exp $ + * $Id: llc_var.h,v 1.4 1995/05/30 08:08:55 rgrimes Exp $ */ #ifndef _NETCCITT_LLC_VAR_H_ diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h index 50b9b091adcb9..053e1a4321578 100644 --- a/sys/netccitt/pk.h +++ b/sys/netccitt/pk.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk.h 8.1 (Berkeley) 6/10/93 - * $Id: pk.h,v 1.3 1994/08/21 05:44:09 paul Exp $ + * $Id: pk.h,v 1.4 1995/05/30 08:08:57 rgrimes Exp $ */ #ifndef _NETCCITT_PK_H_ diff --git a/sys/netccitt/pk_acct.c b/sys/netccitt/pk_acct.c index d3ba5bc0c4b56..21371785272bf 100644 --- a/sys/netccitt/pk_acct.c +++ b/sys/netccitt/pk_acct.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk_acct.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_acct.c,v 1.2 1994/08/02 07:47:29 davidg Exp $ + * $Id: pk_acct.c,v 1.3 1995/05/30 08:08:58 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_debug.c b/sys/netccitt/pk_debug.c index 338d167b37f02..2e6d08c7ecc8c 100644 --- a/sys/netccitt/pk_debug.c +++ b/sys/netccitt/pk_debug.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)pk_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: pk_debug.c,v 1.2 1994/08/02 07:47:31 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c index 777de53c2f3ba..0e86580858338 100644 --- a/sys/netccitt/pk_input.c +++ b/sys/netccitt/pk_input.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_input.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_input.c,v 1.4 1995/05/11 00:13:14 wollman Exp $ + * $Id: pk_input.c,v 1.5 1995/05/30 08:08:59 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c index be18dafbcc726..30f00cbe0c5ce 100644 --- a/sys/netccitt/pk_llcsubr.c +++ b/sys/netccitt/pk_llcsubr.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)pk_llcsubr.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_llcsubr.c,v 1.3 1994/12/13 22:32:16 wollman Exp $ + * $Id: pk_llcsubr.c,v 1.4 1995/05/30 08:09:04 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_output.c b/sys/netccitt/pk_output.c index 7645502b2e006..9d609fc106567 100644 --- a/sys/netccitt/pk_output.c +++ b/sys/netccitt/pk_output.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_output.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_output.c,v 1.2 1994/08/02 07:47:38 davidg Exp $ + * $Id: pk_output.c,v 1.3 1995/05/30 08:09:05 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c index a64375facb038..5f5c6e0f88c48 100644 --- a/sys/netccitt/pk_subr.c +++ b/sys/netccitt/pk_subr.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_subr.c,v 1.3 1994/12/13 22:32:17 wollman Exp $ + * $Id: pk_subr.c,v 1.4 1995/05/30 08:09:07 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_timer.c b/sys/netccitt/pk_timer.c index 72aea7783c33d..559c75cba6761 100644 --- a/sys/netccitt/pk_timer.c +++ b/sys/netccitt/pk_timer.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_timer.c,v 1.2 1994/08/02 07:47:44 davidg Exp $ + * $Id: pk_timer.c,v 1.3 1995/05/30 08:09:08 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_usrreq.c b/sys/netccitt/pk_usrreq.c index 84d6e2e1745dc..f0057c5fb35bb 100644 --- a/sys/netccitt/pk_usrreq.c +++ b/sys/netccitt/pk_usrreq.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: pk_usrreq.c,v 1.2 1994/08/02 07:47:46 davidg Exp $ + * $Id: pk_usrreq.c,v 1.3 1995/05/30 08:09:09 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index 6bfe7bd8d9e92..af439559a551e 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)pk_var.h 8.1 (Berkeley) 6/10/93 - * $Id: pk_var.h,v 1.4 1995/03/16 18:14:40 bde Exp $ + * $Id: pk_var.h,v 1.5 1995/05/30 08:09:11 rgrimes Exp $ */ #ifndef _NETCCITT_PK_VAR_H_ diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h index bb91460430509..efb540cfbf7e0 100644 --- a/sys/netccitt/x25.h +++ b/sys/netccitt/x25.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)x25.h 8.1 (Berkeley) 6/10/93 - * $Id: x25.h,v 1.3 1994/08/21 05:44:11 paul Exp $ + * $Id: x25.h,v 1.4 1995/05/30 08:09:12 rgrimes Exp $ */ #ifndef _NETCCITT_X25_H_ diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h index a5ecdd21a91b8..db1cfbb1143b4 100644 --- a/sys/netccitt/x25acct.h +++ b/sys/netccitt/x25acct.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)x25acct.h 8.1 (Berkeley) 6/10/93 - * $Id: x25acct.h,v 1.2 1994/08/02 07:47:52 davidg Exp $ + * $Id: x25acct.h,v 1.3 1994/08/21 05:44:11 paul Exp $ */ #ifndef _NETCCITT_X25ACCT_H_ diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h index 94cf7cd89e82c..f510a65a2701d 100644 --- a/sys/netccitt/x25err.h +++ b/sys/netccitt/x25err.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)x25err.h 8.1 (Berkeley) 6/10/93 - * $Id: x25err.h,v 1.3 1994/08/21 05:44:12 paul Exp $ + * $Id: x25err.h,v 1.4 1995/05/30 08:09:13 rgrimes Exp $ */ #ifndef _NETCCITT_X25ERR_H_ diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index 90eeb4fbcd3f9..9d0d9a99e86e9 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)icmp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: icmp_var.h,v 1.3 1994/08/21 05:27:23 paul Exp $ + * $Id: icmp_var.h,v 1.4 1995/02/16 00:27:40 wollman Exp $ */ #ifndef _NETINET_ICMP_VAR_H_ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 9586cd4636e34..fa796ce832f48 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.c,v 1.17.4.1 1995/07/23 05:26:13 davidg Exp $ + * $Id: if_ether.c,v 1.17.4.2 1996/02/20 17:55:04 fenner Exp $ */ /* diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 2551fe3781133..8b12220ef33b6 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.h,v 1.8 1995/04/02 01:26:26 wpaul Exp $ + * $Id: if_ether.h,v 1.9 1995/05/30 08:09:20 rgrimes Exp $ */ #ifndef _NETINET_IF_ETHER_H_ diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h index 14ec34389f194..c849a44d1d0d8 100644 --- a/sys/netinet/if_fddi.h +++ b/sys/netinet/if_fddi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_fddi.h 8.1 (Berkeley) 6/10/93 - * $Id: if_fddi.h,v 1.1 1995/03/14 09:14:14 davidg Exp $ + * $Id: if_fddi.h,v 1.2 1995/05/30 08:09:21 rgrimes Exp $ */ #ifndef _NETINET_IF_FDDI_H_ diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 1f795d9d14b3d..952a6ff3ca2f9 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 - * $Id: igmp.c,v 1.12 1995/06/13 17:51:05 wollman Exp $ + * $Id: igmp.c,v 1.11.4.1 1995/09/06 10:31:29 davidg Exp $ */ /* diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h index 07cefc8203d42..0189785cf8b41 100644 --- a/sys/netinet/igmp.h +++ b/sys/netinet/igmp.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp.h 8.1 (Berkeley) 6/10/93 - * $Id: igmp.h,v 1.6 1995/06/13 17:51:06 wollman Exp $ + * $Id: igmp.h,v 1.5.4.1 1995/09/06 10:31:30 davidg Exp $ */ #ifndef _NETINET_IGMP_H_ diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h index d845110bd742a..e12a469957c1a 100644 --- a/sys/netinet/igmp_var.h +++ b/sys/netinet/igmp_var.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)igmp_var.h 8.1 (Berkeley) 7/19/93 - * $Id: igmp_var.h,v 1.6 1995/06/13 17:51:07 wollman Exp $ + * $Id: igmp_var.h,v 1.5.4.1 1995/09/06 10:31:31 davidg Exp $ */ #ifndef _NETINET_IGMP_VAR_H_ diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 92bc90a7ca544..4fe6063616a54 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.2 (Berkeley) 11/15/93 - * $Id: in.c,v 1.14.4.2 1996/01/30 21:41:34 davidg Exp $ + * $Id: in.c,v 1.14.4.3 1996/04/07 07:02:05 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 0892b205aa42b..5aad1daced3b9 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $Id: in.h,v 1.10 1995/06/13 17:51:08 wollman Exp $ + * $Id: in.h,v 1.9.4.1 1995/09/06 10:31:32 davidg Exp $ */ #ifndef _NETINET_IN_H_ diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c index 9f12495e6f761..46bdaec4cebee 100644 --- a/sys/netinet/in_cksum.c +++ b/sys/netinet/in_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 - * $Id: in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp $ + * $Id: in_cksum.c,v 1.3 1995/05/30 08:09:27 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 4df50be200a95..dd19aed3484ff 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94 - * $Id: in_pcb.c,v 1.12 1995/05/30 08:09:28 rgrimes Exp $ + * $Id: in_pcb.c,v 1.12.4.1 1995/10/07 20:13:01 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 248ad7afdbe76..74af065f670de 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: in_pcb.h,v 1.7 1995/04/09 16:46:47 jkh Exp $ + * $Id: in_pcb.h,v 1.8 1995/04/10 00:43:18 davidg Exp $ */ #ifndef _NETINET_IN_PCB_H_ diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index e3586ebf2c90c..b31852d90d82f 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)in_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: in_proto.c,v 1.17 1995/06/26 16:11:51 wollman Exp $ + * $Id: in_proto.c,v 1.15.4.1 1995/09/06 10:31:34 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index c3dc5c2a0662f..4be76ee6807b3 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: in_rmx.c,v 1.13.4.2 1996/02/06 18:11:56 fenner Exp $ + * $Id: in_rmx.c,v 1.13.4.3 1996/03/04 04:56:21 davidg Exp $ */ /* diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index f35ab2ff1685d..fa82138e21bdd 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_systm.h 8.1 (Berkeley) 6/10/93 - * $Id: in_systm.h,v 1.2 1994/08/02 07:48:25 davidg Exp $ + * $Id: in_systm.h,v 1.3 1994/08/21 05:27:29 paul Exp $ */ #ifndef _NETINET_IN_SYSTM_H_ diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 2325eadbac7ed..12a6b695b8880 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.1 (Berkeley) 6/10/93 - * $Id: in_var.h,v 1.10 1995/05/30 08:09:32 rgrimes Exp $ + * $Id: in_var.h,v 1.10.4.1 1996/01/13 10:49:45 davidg Exp $ */ #ifndef _NETINET_IN_VAR_H_ diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h index 864474a065b34..52586555e0092 100644 --- a/sys/netinet/ip.h +++ b/sys/netinet/ip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip.h 8.1 (Berkeley) 6/10/93 - * $Id: ip.h,v 1.4 1995/05/05 14:36:38 ache Exp $ + * $Id: ip.h,v 1.5 1995/05/30 08:09:33 rgrimes Exp $ */ #ifndef _NETINET_IP_H_ diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index ff5af2ef3da4b..e81e43a059bfc 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -11,7 +11,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.14.4.9 1996/06/25 03:16:41 alex Exp $ + * $Id: ip_fw.c,v 1.14.4.10 1996/11/12 17:31:31 jkh Exp $ */ /* diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index ad24fd033d5ce..2388dd7569fab 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -11,7 +11,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.h,v 1.20 1996/06/09 23:46:21 alex Exp $ + * $Id: ip_fw.h,v 1.11.4.7 1996/06/25 03:16:43 alex Exp $ */ /* diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 827e7b319d8bd..253be88f8ec65 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_icmp.c,v 1.7.4.3 1996/04/02 12:27:22 phk Exp $ + * $Id: ip_icmp.c,v 1.7.4.4 1996/04/03 05:51:55 phk Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index 649f6fd356952..b6d6e85e57664 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_icmp.h,v 1.7 1996/01/30 22:58:24 mpp Exp $ + * $Id: ip_icmp.h,v 1.4.4.1 1996/02/23 01:36:18 pst Exp $ */ #ifndef _NETINET_IP_ICMP_H_ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 39922243ca544..8b9cab2c4f25c 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.22.4.5 1996/03/25 17:42:41 phk Exp $ + * $Id: ip_input.c,v 1.22.4.6 1996/09/08 13:46:46 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 0239a7db916ff..c5de9c0b16223 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $Id: ip_mroute.c,v 1.16.4.3 1996/03/14 17:13:50 fenner Exp $ + * $Id: ip_mroute.c,v 1.16.4.4 1996/07/12 18:35:45 fenner Exp $ */ diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index bf1392cdf32e0..43e08e7252f1a 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)ip_mroute.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_mroute.h,v 1.9 1995/08/23 18:20:17 wollman Exp $ + * $Id: ip_mroute.h,v 1.7.4.1 1995/09/06 10:31:39 davidg Exp $ */ #ifndef _NETINET_IP_MROUTE_H_ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 7d2e11ffeabf6..c2febeaf96dbe 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $Id: ip_output.c,v 1.19.4.5 1996/03/04 04:56:23 davidg Exp $ + * $Id: ip_output.c,v 1.19.4.6 1996/03/13 08:13:16 pst Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 89fc3d5a7c9a7..80071862e2ba4 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.1 (Berkeley) 6/10/93 - * $Id: ip_var.h,v 1.10.4.1 1995/09/06 10:31:42 davidg Exp $ + * $Id: ip_var.h,v 1.10.4.2 1996/03/04 04:56:24 davidg Exp $ */ #ifndef _NETINET_IP_VAR_H_ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 09fa83ac3ae87..5e407751d371c 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ip.c,v 1.19.4.6 1996/02/26 15:23:39 phk Exp $ + * $Id: raw_ip.c,v 1.19.4.7 1996/03/13 08:13:17 pst Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index a79acf96625b9..6c1eefdccc148 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp.h,v 1.5 1995/02/14 02:35:14 wollman Exp $ + * $Id: tcp.h,v 1.6 1995/05/30 08:09:53 rgrimes Exp $ */ #ifndef _NETINET_TCP_H_ diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index cef966cc73287..5f4dbf2023398 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id: tcp_debug.c,v 1.3 1995/02/09 23:13:22 wollman Exp $ + * $Id: tcp_debug.c,v 1.4 1995/04/19 10:26:04 olah Exp $ */ #ifdef TCPDEBUG diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index 159b798108098..86b32462e2cbd 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_debug.h,v 1.2 1994/08/02 07:48:56 davidg Exp $ + * $Id: tcp_debug.h,v 1.3 1994/08/21 05:27:35 paul Exp $ */ #ifndef _NETINET_TCP_DEBUG_H_ diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index 28f04f082f1e2..f2e6d2278efd3 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_fsm.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_fsm.h,v 1.5 1995/02/16 01:53:31 wollman Exp $ + * $Id: tcp_fsm.h,v 1.6 1995/03/30 23:35:55 davidg Exp $ */ #ifndef _NETINET_TCP_FSM_H_ diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index a488b05159903..6fc843a7bdc92 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 - * $Id: tcp_input.c,v 1.25.4.6 1996/09/19 09:54:15 davidg Exp $ + * $Id: tcp_input.c,v 1.25.4.7 1996/11/20 18:25:30 pst Exp $ */ #ifndef TUBA_INCLUDE diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index aa3397157e7c0..9873930fe3f9c 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.3 (Berkeley) 12/30/93 - * $Id: tcp_output.c,v 1.11.4.4 1996/03/04 04:56:26 davidg Exp $ + * $Id: tcp_output.c,v 1.11.4.5 1996/04/15 03:49:52 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h index 6f0532f3449b3..da9fdd0f6cf84 100644 --- a/sys/netinet/tcp_seq.h +++ b/sys/netinet/tcp_seq.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_seq.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_seq.h,v 1.4 1995/02/08 20:18:46 wollman Exp $ + * $Id: tcp_seq.h,v 1.5 1995/02/14 02:35:17 wollman Exp $ */ #ifndef _NETINET_TCP_SEQ_H_ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 71e3490b87bc0..3c260201db126 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: tcp_subr.c,v 1.11.4.1 1995/07/23 05:04:31 davidg Exp $ + * $Id: tcp_subr.c,v 1.11.4.2 1996/03/04 04:56:27 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index d557da57c5f5d..b1c84b28e9d3e 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: tcp_timer.c,v 1.7.4.4 1996/07/12 17:31:46 davidg Exp $ + * $Id: tcp_timer.c,v 1.7.4.5 1996/09/19 08:18:31 pst Exp $ */ #ifndef TUBA_INCLUDE diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 0740acecba0f1..ce4cde0c88055 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_timer.h,v 1.6 1995/02/14 02:35:18 wollman Exp $ + * $Id: tcp_timer.h,v 1.6.4.1 1996/09/19 08:18:36 pst Exp $ */ #ifndef _NETINET_TCP_TIMER_H_ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 630c44bd0f46d..8dce30c67da91 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $Id: tcp_usrreq.c,v 1.15.2.3 1996/01/31 11:02:03 davidg Exp $ + * $Id: tcp_usrreq.c,v 1.15.2.4 1996/09/19 08:18:40 pst Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 3df6f4a722b91..c52666f2ec4be 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.3 (Berkeley) 4/10/94 - * $Id: tcp_var.h,v 1.11.4.5 1996/09/19 08:18:43 pst Exp $ + * $Id: tcp_var.h,v 1.11.4.6 1996/09/19 09:54:25 davidg Exp $ */ #ifndef _NETINET_TCP_VAR_H_ diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h index bc71fbc654d31..571fcbb434357 100644 --- a/sys/netinet/tcpip.h +++ b/sys/netinet/tcpip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 - * $Id: tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp $ + * $Id: tcpip.h,v 1.4 1995/02/08 20:18:48 wollman Exp $ */ #ifndef _NETINET_TCPIP_H_ diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h index d47ea918a4589..406c0d1d36474 100644 --- a/sys/netinet/udp.h +++ b/sys/netinet/udp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp.h 8.1 (Berkeley) 6/10/93 - * $Id: udp.h,v 1.2 1994/08/02 07:49:22 davidg Exp $ + * $Id: udp.h,v 1.3 1994/08/21 05:27:41 paul Exp $ */ #ifndef _NETINET_UDP_H_ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 9b65d5815d8c9..2f56523c1471b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $Id: udp_usrreq.c,v 1.12.4.2 1995/10/07 20:20:58 davidg Exp $ + * $Id: udp_usrreq.c,v 1.12.4.3 1996/09/19 09:54:31 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 12b5c9c262069..69c22ea5a2f4b 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: udp_var.h,v 1.5 1995/04/09 01:29:31 davidg Exp $ + * $Id: udp_var.h,v 1.5.4.1 1996/09/19 09:54:38 davidg Exp $ */ #ifndef _NETINET_UDP_VAR_H_ diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h index a0dd5f12dee64..0993c6dd17f85 100644 --- a/sys/netiso/argo_debug.h +++ b/sys/netiso/argo_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)argo_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: argo_debug.h,v 1.4 1995/05/30 08:10:09 rgrimes Exp $ + * $Id: argo_debug.h,v 1.4.4.1 1996/06/05 02:54:47 jkh Exp $ */ #ifndef _NETISO_ARGO_DEBUG_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/argo_debug.h,v 1.4 1995/05/30 08:10:09 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/argo_debug.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/argo_debug.h,v 1.4.4.1 1996/06/05 02:54:47 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/argo_debug.h,v $ */ diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h index 65c536ae075f6..068cbc61dc888 100644 --- a/sys/netiso/clnl.h +++ b/sys/netiso/clnl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnl.h 8.1 (Berkeley) 6/10/93 - * $Id: clnl.h,v 1.3 1994/08/21 06:14:12 paul Exp $ + * $Id: clnl.h,v 1.4 1995/05/30 08:10:11 rgrimes Exp $ */ #ifndef _NETISO_CLNL_H_ diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h index 230ec471bccb9..81030103cc771 100644 --- a/sys/netiso/clnp.h +++ b/sys/netiso/clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp.h 8.2 (Berkeley) 4/16/94 - * $Id: clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp $ + * $Id: clnp.h,v 1.4.4.1 1996/06/05 02:54:48 jkh Exp $ */ #ifndef _NETISO_CLNP_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp.h,v 1.4 1995/05/30 08:10:12 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp.h,v 1.4.4.1 1996/06/05 02:54:48 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp.h,v $ */ /* should be config option but cpp breaks with too many #defines */ #define DECBIT diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c index 6511b02503e5a..205aee4031d18 100644 --- a/sys/netiso/clnp_debug.c +++ b/sys/netiso/clnp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_debug.c,v 1.3 1995/05/30 08:10:14 rgrimes Exp $ + * $Id: clnp_debug.c,v 1.3.4.1 1996/06/05 02:54:49 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_debug.c,v 1.3 1995/05/30 08:10:14 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_debug.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_debug.c,v 1.3.4.1 1996/06/05 02:54:49 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_debug.c,v $ */ #include <sys/param.h> #include <sys/mbuf.h> diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c index cbbdc0bcce221..ef2b95c158321 100644 --- a/sys/netiso/clnp_er.c +++ b/sys/netiso/clnp_er.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_er.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_er.c,v 1.4 1995/05/30 08:10:15 rgrimes Exp $ + * $Id: clnp_er.c,v 1.4.4.1 1996/06/05 02:54:50 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_er.c,v 1.4 1995/05/30 08:10:15 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_er.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_er.c,v 1.4.4.1 1996/06/05 02:54:50 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_er.c,v $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c index 89ec430314f9e..45ed7de188156 100644 --- a/sys/netiso/clnp_frag.c +++ b/sys/netiso/clnp_frag.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_frag.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_frag.c,v 1.3 1995/05/30 08:10:17 rgrimes Exp $ + * $Id: clnp_frag.c,v 1.3.4.1 1996/06/05 02:54:51 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_frag.c,v 1.3 1995/05/30 08:10:17 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_frag.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_frag.c,v 1.3.4.1 1996/06/05 02:54:51 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_frag.c,v $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c index ca13a3088159d..7675c81a769eb 100644 --- a/sys/netiso/clnp_input.c +++ b/sys/netiso/clnp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_input.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_input.c,v 1.6 1995/05/30 08:10:19 rgrimes Exp $ + * $Id: clnp_input.c,v 1.6.4.1 1996/06/05 02:54:51 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_input.c,v 1.6 1995/05/30 08:10:19 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_input.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_input.c,v 1.6.4.1 1996/06/05 02:54:51 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_input.c,v $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c index efc51b9c5201f..804c92e942342 100644 --- a/sys/netiso/clnp_options.c +++ b/sys/netiso/clnp_options.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_options.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_options.c,v 1.3 1995/05/30 08:10:20 rgrimes Exp $ + * $Id: clnp_options.c,v 1.3.4.1 1996/06/05 02:54:52 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_options.c,v 1.3 1995/05/30 08:10:20 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_options.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_options.c,v 1.3.4.1 1996/06/05 02:54:52 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_options.c,v $ */ #ifdef ISO diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c index 71c5db6ebe233..c8107c9581e3f 100644 --- a/sys/netiso/clnp_output.c +++ b/sys/netiso/clnp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_output.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_output.c,v 1.4 1995/05/30 08:10:22 rgrimes Exp $ + * $Id: clnp_output.c,v 1.4.4.1 1996/06/05 02:54:53 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_output.c,v 1.4 1995/05/30 08:10:22 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_output.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_output.c,v 1.4.4.1 1996/06/05 02:54:53 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_output.c,v $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c index 9a0c687f19b0c..8c19454339a5b 100644 --- a/sys/netiso/clnp_raw.c +++ b/sys/netiso/clnp_raw.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_raw.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_raw.c,v 1.3 1995/05/30 08:10:23 rgrimes Exp $ + * $Id: clnp_raw.c,v 1.3.4.1 1996/06/05 02:54:54 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_raw.c,v 1.3 1995/05/30 08:10:23 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_raw.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_raw.c,v 1.3.4.1 1996/06/05 02:54:54 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_raw.c,v $ */ #include <sys/param.h> #include <sys/mbuf.h> diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h index d02ea17246943..834cd220b0929 100644 --- a/sys/netiso/clnp_stat.h +++ b/sys/netiso/clnp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_stat.h 8.1 (Berkeley) 6/10/93 - * $Id: clnp_stat.h,v 1.4 1995/05/30 08:10:24 rgrimes Exp $ + * $Id: clnp_stat.h,v 1.4.4.1 1996/06/05 02:54:56 jkh Exp $ */ #ifndef _NETISO_CLNP_STAT_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_stat.h,v 1.4 1995/05/30 08:10:24 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_stat.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_stat.h,v 1.4.4.1 1996/06/05 02:54:56 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_stat.h,v $ */ struct clnp_stat { int cns_total; /* total pkts received */ diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c index 478cc0d044629..369e450163d58 100644 --- a/sys/netiso/clnp_subr.c +++ b/sys/netiso/clnp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_subr.c,v 1.3 1995/05/30 08:10:26 rgrimes Exp $ + * $Id: clnp_subr.c,v 1.3.4.1 1996/06/05 02:54:57 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_subr.c,v 1.3 1995/05/30 08:10:26 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_subr.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_subr.c,v 1.3.4.1 1996/06/05 02:54:57 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_subr.c,v $ */ #ifdef ISO diff --git a/sys/netiso/clnp_timer.c b/sys/netiso/clnp_timer.c index d08909b10d244..e799b9afd9293 100644 --- a/sys/netiso/clnp_timer.c +++ b/sys/netiso/clnp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clnp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: clnp_timer.c,v 1.4 1995/05/30 08:10:27 rgrimes Exp $ + * $Id: clnp_timer.c,v 1.4.4.1 1996/06/05 02:54:59 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_timer.c,v 1.4 1995/05/30 08:10:27 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/clnp_timer.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/clnp_timer.c,v 1.4.4.1 1996/06/05 02:54:59 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/clnp_timer.c,v $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c index 7b95f93bf087c..385ca5cd661ae 100644 --- a/sys/netiso/cltp_usrreq.c +++ b/sys/netiso/cltp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cltp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: cltp_usrreq.c,v 1.3 1994/11/15 14:26:14 bde Exp $ + * $Id: cltp_usrreq.c,v 1.4 1995/05/30 08:10:29 rgrimes Exp $ */ #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */ diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h index 122a272b3dd7e..5b393e76a2bfd 100644 --- a/sys/netiso/cltp_var.h +++ b/sys/netiso/cltp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cltp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: cltp_var.h,v 1.2 1994/08/02 07:49:58 davidg Exp $ + * $Id: cltp_var.h,v 1.3 1994/08/21 06:14:14 paul Exp $ */ #ifndef _NETISO_CLTP_VAR_H_ diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h index 016cf9044d834..9bb240b6ef405 100644 --- a/sys/netiso/cons.h +++ b/sys/netiso/cons.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cons.h 8.1 (Berkeley) 6/10/93 - * $Id: cons.h,v 1.4 1995/05/30 08:10:30 rgrimes Exp $ + * $Id: cons.h,v 1.4.4.1 1996/06/05 02:55:01 jkh Exp $ */ #ifndef _NETISO_CONS_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/cons.h,v 1.4 1995/05/30 08:10:30 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/cons.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/cons.h,v 1.4.4.1 1996/06/05 02:55:01 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/cons.h,v $ * * interface between TP and CONS */ diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h index f84c0679be6d1..4d2ec0fa43824 100644 --- a/sys/netiso/cons_pcb.h +++ b/sys/netiso/cons_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cons_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: cons_pcb.h,v 1.4 1995/05/30 08:10:31 rgrimes Exp $ + * $Id: cons_pcb.h,v 1.4.4.1 1996/06/05 02:55:03 jkh Exp $ */ #ifndef _NETISO_CONS_PCB_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/cons_pcb.h,v 1.4 1995/05/30 08:10:31 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/cons_pcb.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/cons_pcb.h,v 1.4.4.1 1996/06/05 02:55:03 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/cons_pcb.h,v $ */ /* * protocol control block for the connection oriented network service diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h index 8b005329b34fe..78b8a0ec27f02 100644 --- a/sys/netiso/eonvar.h +++ b/sys/netiso/eonvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)eonvar.h 8.1 (Berkeley) 6/10/93 - * $Id: eonvar.h,v 1.3 1994/08/21 06:14:17 paul Exp $ + * $Id: eonvar.h,v 1.4 1995/05/30 08:10:33 rgrimes Exp $ */ #ifndef _NETISO_EONVAR_H_ diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index f62de5d41012f..2dbcb06845f49 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)esis.c 8.1 (Berkeley) 6/10/93 - * $Id: esis.c,v 1.3 1994/12/13 22:33:03 wollman Exp $ + * $Id: esis.c,v 1.4 1995/05/30 08:10:34 rgrimes Exp $ */ /*********************************************************** diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h index 4cd6fd422ad39..0c7cbdd9f3a5b 100644 --- a/sys/netiso/esis.h +++ b/sys/netiso/esis.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)esis.h 8.1 (Berkeley) 6/10/93 - * $Id: esis.h,v 1.4 1995/05/30 08:10:36 rgrimes Exp $ + * $Id: esis.h,v 1.4.4.1 1996/06/05 02:55:04 jkh Exp $ */ #ifndef _NETISO_ESIS_H_ @@ -64,8 +64,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/esis.h,v 1.4 1995/05/30 08:10:36 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/esis.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/esis.h,v 1.4.4.1 1996/06/05 02:55:04 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/esis.h,v $ */ #ifndef BYTE_ORDER diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c index 8e3a3d2138440..e0de340c61564 100644 --- a/sys/netiso/idrp_usrreq.c +++ b/sys/netiso/idrp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idrp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: idrp_usrreq.c,v 1.2 1994/08/02 07:50:16 davidg Exp $ + * $Id: idrp_usrreq.c,v 1.3 1995/05/30 08:10:38 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c index fae7538e9099f..46b494fb14296 100644 --- a/sys/netiso/if_cons.c +++ b/sys/netiso/if_cons.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_cons.c 8.1 (Berkeley) 6/10/93 - * $Id: if_cons.c,v 1.4 1995/05/30 08:10:39 rgrimes Exp $ + * $Id: if_cons.c,v 1.4.4.1 1996/06/05 02:55:06 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/if_cons.c,v 1.4 1995/05/30 08:10:39 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/if_cons.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/if_cons.c,v 1.4.4.1 1996/06/05 02:55:06 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/if_cons.c,v $ * * cons.c - Connection Oriented Network Service: * including support for a) user transport-level service, diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c index 188b366a70ccf..3c8753f22d1d3 100644 --- a/sys/netiso/if_eon.c +++ b/sys/netiso/if_eon.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_eon.c 8.1 (Berkeley) 6/10/93 - * $Id: if_eon.c,v 1.4 1995/05/30 08:10:45 rgrimes Exp $ + * $Id: if_eon.c,v 1.4.4.1 1996/06/05 02:55:08 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/if_eon.c,v 1.4 1995/05/30 08:10:45 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/if_eon.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/if_eon.c,v 1.4.4.1 1996/06/05 02:55:08 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/if_eon.c,v $ * * EON rfc * Layer between IP and CLNL diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c index a790c4538b60e..92b534c298d7b 100644 --- a/sys/netiso/iso.c +++ b/sys/netiso/iso.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso.c 8.2 (Berkeley) 11/15/93 - * $Id: iso.c,v 1.4 1995/05/30 08:10:46 rgrimes Exp $ + * $Id: iso.c,v 1.4.4.1 1996/06/05 02:55:10 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso.c,v 1.4 1995/05/30 08:10:46 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/iso.c,v 1.4.4.1 1996/06/05 02:55:10 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/iso.c,v $ * * iso.c: miscellaneous routines to support the iso address family */ diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h index 0569f368214ef..f767b62bb3346 100644 --- a/sys/netiso/iso.h +++ b/sys/netiso/iso.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.1 (Berkeley) 6/10/93 - * $Id: iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp $ + * $Id: iso.h,v 1.4.4.1 1996/06/05 02:55:12 jkh Exp $ */ #ifndef _NETISO_ISO_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso.h,v 1.4 1995/05/30 08:10:49 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/iso.h,v 1.4.4.1 1996/06/05 02:55:12 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/iso.h,v $ */ /* * Return true if this is a multicast address diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c index 28548a845f112..38f8653f7dfc8 100644 --- a/sys/netiso/iso_chksum.c +++ b/sys/netiso/iso_chksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_chksum.c 8.1 (Berkeley) 6/10/93 - * $Id: iso_chksum.c,v 1.3 1995/05/30 08:10:50 rgrimes Exp $ + * $Id: iso_chksum.c,v 1.3.4.1 1996/06/05 02:55:14 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_chksum.c,v 1.3 1995/05/30 08:10:50 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_chksum.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/iso_chksum.c,v 1.3.4.1 1996/06/05 02:55:14 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/iso_chksum.c,v $ * * ISO CHECKSUM * diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h index 7f03492afec2e..ec7aaea82e989 100644 --- a/sys/netiso/iso_errno.h +++ b/sys/netiso/iso_errno.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_errno.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_errno.h,v 1.4 1994/11/27 20:58:30 ats Exp $ + * $Id: iso_errno.h,v 1.5 1995/05/30 08:10:52 rgrimes Exp $ */ #ifndef _NETISO_ISO_ERRNO_H_ diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c index d9604c8f31235..63aa8fe703e6d 100644 --- a/sys/netiso/iso_pcb.c +++ b/sys/netiso/iso_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id: iso_pcb.c,v 1.3 1995/05/30 08:10:53 rgrimes Exp $ + * $Id: iso_pcb.c,v 1.3.4.1 1996/06/05 02:55:15 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_pcb.c,v 1.3 1995/05/30 08:10:53 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_pcb.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/iso_pcb.c,v 1.3.4.1 1996/06/05 02:55:15 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/iso_pcb.c,v $ * * Iso address family net-layer(s) pcb stuff. NEH 1/29/87 */ diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h index 3d567edf32a07..4664dafe28356 100644 --- a/sys/netiso/iso_pcb.h +++ b/sys/netiso/iso_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_pcb.h,v 1.4 1995/05/30 08:10:55 rgrimes Exp $ + * $Id: iso_pcb.h,v 1.4.4.1 1996/06/05 02:55:16 jkh Exp $ */ #ifndef _NETISO_ISO_PCB_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_pcb.h,v 1.4 1995/05/30 08:10:55 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_pcb.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/iso_pcb.h,v 1.4.4.1 1996/06/05 02:55:16 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/iso_pcb.h,v $ */ #define MAXX25CRUDLEN 16 /* 16 bytes of call request user data */ diff --git a/sys/netiso/iso_proto.c b/sys/netiso/iso_proto.c index 51b7ed4d689c2..28c3fb706122b 100644 --- a/sys/netiso/iso_proto.c +++ b/sys/netiso/iso_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: iso_proto.c,v 1.4 1995/05/30 08:10:56 rgrimes Exp $ + * $Id: iso_proto.c,v 1.4.4.1 1996/06/05 02:55:17 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_proto.c,v 1.4 1995/05/30 08:10:56 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_proto.c,v $ +/* $Header: /home/ncvs/src/sys/netiso/Attic/iso_proto.c,v 1.4.4.1 1996/06/05 02:55:17 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/iso_proto.c,v $ * * iso_proto.c : protocol switch tables in the ISO domain * diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c index 164787307379f..d5caa17825193 100644 --- a/sys/netiso/iso_snpac.c +++ b/sys/netiso/iso_snpac.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_snpac.c 8.1 (Berkeley) 6/10/93 - * $Id: iso_snpac.c,v 1.4 1995/05/30 08:10:58 rgrimes Exp $ + * $Id: iso_snpac.c,v 1.4.4.1 1996/06/05 02:55:18 jkh Exp $ */ /*********************************************************** @@ -60,8 +60,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_snpac.c,v 1.4 1995/05/30 08:10:58 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_snpac.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/iso_snpac.c,v 1.4.4.1 1996/06/05 02:55:18 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/iso_snpac.c,v $ */ #ifdef ISO diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h index e817b818b5a0f..0d9e48ee397b6 100644 --- a/sys/netiso/iso_snpac.h +++ b/sys/netiso/iso_snpac.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_snpac.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_snpac.h,v 1.4 1995/03/28 07:57:14 bde Exp $ + * $Id: iso_snpac.h,v 1.5 1995/05/30 08:10:59 rgrimes Exp $ */ #ifndef _NETISO_ISO_SNPAC_H_ diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index 290f7b575bb9d..e64a9b911e619 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_var.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ + * $Id: iso_var.h,v 1.5.4.1 1996/06/05 02:55:19 jkh Exp $ */ #ifndef _NETISO_ISO_VAR_H_ @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_var.h,v 1.5 1995/05/30 08:11:01 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/iso_var.h,v $ +/* $Header: /home/ncvs/src/sys/netiso/Attic/iso_var.h,v 1.5.4.1 1996/06/05 02:55:19 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/iso_var.h,v $ */ /* diff --git a/sys/netiso/tp.trans b/sys/netiso/tp.trans index 8e1832b1fa85f..1e2da71500ee2 100644 --- a/sys/netiso/tp.trans +++ b/sys/netiso/tp.trans @@ -60,7 +60,7 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp.trans,v 1.1.1.1 1994/05/24 10:07:31 rgrimes Exp $ +/* $Header: /home/ncvs/src/sys/netiso/Attic/tp.trans,v 1.1.1.1.8.1 1996/06/05 02:55:20 jkh Exp $ * * Transition file for TP. * diff --git a/sys/netiso/tp_astring.c b/sys/netiso/tp_astring.c index 5bfa711151026..acf2d5b4b1397 100644 --- a/sys/netiso/tp_astring.c +++ b/sys/netiso/tp_astring.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_astring.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: tp_astring.c,v 1.2 1994/08/02 07:50:51 davidg Exp $ */ char *tp_sstring[] = { diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h index 30fd5497baa3f..f3016c264d7d3 100644 --- a/sys/netiso/tp_clnp.h +++ b/sys/netiso/tp_clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_clnp.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_clnp.h,v 1.4 1995/05/30 08:11:02 rgrimes Exp $ + * $Id: tp_clnp.h,v 1.4.4.1 1996/06/05 02:55:21 jkh Exp $ */ #ifndef _NETISO_TP_CLNP_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_clnp.h,v 1.4 1995/05/30 08:11:02 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_clnp.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_clnp.h,v 1.4.4.1 1996/06/05 02:55:21 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_clnp.h,v $ * * AF_ISO net-dependent structures and include files * diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c index b68adea12b9c8..9af570746fe81 100644 --- a/sys/netiso/tp_cons.c +++ b/sys/netiso/tp_cons.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_cons.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_cons.c,v 1.4 1995/05/30 08:11:04 rgrimes Exp $ + * $Id: tp_cons.c,v 1.4.4.1 1996/06/05 02:55:22 jkh Exp $ */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_cons.c,v 1.4 1995/05/30 08:11:04 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_cons.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_cons.c,v 1.4.4.1 1996/06/05 02:55:22 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_cons.c,v $ * * Here is where you find the iso- and cons-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c index 5c42447896a2e..124731a614d64 100644 --- a/sys/netiso/tp_driver.c +++ b/sys/netiso/tp_driver.c @@ -1,5 +1,5 @@ /* - * $Id: tp_driver.c,v 1.2 1994/08/02 07:50:59 davidg Exp $ + * $Id: tp_driver.c,v 1.3 1995/05/30 08:11:05 rgrimes Exp $ */ #define _XEBEC_PG static diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c index 8376c13fac0cd..2361b70ba8f1f 100644 --- a/sys/netiso/tp_emit.c +++ b/sys/netiso/tp_emit.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_emit.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_emit.c,v 1.3 1995/05/30 08:11:07 rgrimes Exp $ + * $Id: tp_emit.c,v 1.3.4.1 1996/06/05 02:55:23 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_emit.c,v 1.3 1995/05/30 08:11:07 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_emit.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_emit.c,v 1.3.4.1 1996/06/05 02:55:23 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_emit.c,v $ * * This file contains tp_emit() and tp_error_emit(), which * form TPDUs and hand them to ip. diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h index c425ceedb03f7..f37640ba1774b 100644 --- a/sys/netiso/tp_events.h +++ b/sys/netiso/tp_events.h @@ -1,5 +1,5 @@ /* - * $Id: tp_events.h,v 1.3 1994/08/21 06:14:24 paul Exp $ + * $Id: tp_events.h,v 1.4 1995/05/30 08:11:09 rgrimes Exp $ */ #ifndef _NETISO_TP_EVENTS_H_ diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c index c70d8ebb63c5d..d52fc0f8dd7c8 100644 --- a/sys/netiso/tp_inet.c +++ b/sys/netiso/tp_inet.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_inet.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_inet.c,v 1.5 1995/05/30 08:11:10 rgrimes Exp $ + * $Id: tp_inet.c,v 1.5.4.1 1996/06/05 02:55:24 jkh Exp $ */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_inet.c,v 1.5 1995/05/30 08:11:10 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_inet.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_inet.c,v 1.5.4.1 1996/06/05 02:55:24 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_inet.c,v $ * * Here is where you find the inet-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c index a10ae76f323b2..1cb8c72a00eed 100644 --- a/sys/netiso/tp_input.c +++ b/sys/netiso/tp_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_input.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_input.c,v 1.3 1995/05/30 08:11:12 rgrimes Exp $ + * $Id: tp_input.c,v 1.3.4.1 1996/06/05 02:55:25 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_input.c,v 1.3 1995/05/30 08:11:12 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_input.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_input.c,v 1.3.4.1 1996/06/05 02:55:25 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_input.c,v $ * * tp_input() gets an mbuf chain from ip. Actually, not directly * from ip, because ip calls a net-level routine that strips off diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h index b16ed04a6b296..6653da24ef00d 100644 --- a/sys/netiso/tp_ip.h +++ b/sys/netiso/tp_ip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_ip.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_ip.h,v 1.4 1995/05/30 08:11:13 rgrimes Exp $ + * $Id: tp_ip.h,v 1.4.4.1 1996/06/05 02:55:26 jkh Exp $ */ #ifndef _NETISO_TP_IP_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_ip.h,v 1.4 1995/05/30 08:11:13 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_ip.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_ip.h,v 1.4.4.1 1996/06/05 02:55:26 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_ip.h,v $ * * internet IP-dependent structures and include files * diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c index 5114417ee1640..d2f36d9116722 100644 --- a/sys/netiso/tp_iso.c +++ b/sys/netiso/tp_iso.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_iso.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_iso.c,v 1.3 1995/05/30 08:11:18 rgrimes Exp $ + * $Id: tp_iso.c,v 1.3.4.1 1996/06/05 02:55:27 jkh Exp $ */ /*********************************************************** @@ -62,8 +62,8 @@ SOFTWARE. */ /* * ARGO TP - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_iso.c,v 1.3 1995/05/30 08:11:18 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_iso.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_iso.c,v 1.3.4.1 1996/06/05 02:55:27 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_iso.c,v $ * * Here is where you find the iso-dependent code. We've tried * keep all net-level and (primarily) address-family-dependent stuff diff --git a/sys/netiso/tp_meas.c b/sys/netiso/tp_meas.c index d6a7f5ea5f12b..21df6d37c14f2 100644 --- a/sys/netiso/tp_meas.c +++ b/sys/netiso/tp_meas.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_meas.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_meas.c,v 1.3 1995/05/30 08:11:20 rgrimes Exp $ + * $Id: tp_meas.c,v 1.3.4.1 1996/06/05 02:55:28 jkh Exp $ */ /*********************************************************** @@ -61,8 +61,8 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_meas.c,v 1.3 1995/05/30 08:11:20 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_meas.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_meas.c,v 1.3.4.1 1996/06/05 02:55:28 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_meas.c,v $ * * tp_meas.c : create a performance measurement event * in the circular buffer tp_Meas[] diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h index ec38744d04b7e..653fed9d4ccfa 100644 --- a/sys/netiso/tp_meas.h +++ b/sys/netiso/tp_meas.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_meas.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_meas.h,v 1.3 1994/08/21 06:14:25 paul Exp $ + * $Id: tp_meas.h,v 1.4 1995/05/30 08:11:21 rgrimes Exp $ */ #ifndef _NETISO_TP_MEAS_H_ diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c index bbc4ad16c4119..9a4a540fe856e 100644 --- a/sys/netiso/tp_output.c +++ b/sys/netiso/tp_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_output.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_output.c,v 1.4 1995/05/30 08:11:23 rgrimes Exp $ + * $Id: tp_output.c,v 1.4.4.1 1996/06/05 02:55:29 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_output.c,v 1.4 1995/05/30 08:11:23 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_output.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_output.c,v 1.4.4.1 1996/06/05 02:55:29 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_output.c,v $ * * In here is tp_ctloutput(), the guy called by [sg]etsockopt(), */ diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h index ce27f77706ae2..e48b162bc2c98 100644 --- a/sys/netiso/tp_param.h +++ b/sys/netiso/tp_param.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_param.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_param.h,v 1.4 1995/05/30 08:11:24 rgrimes Exp $ + * $Id: tp_param.h,v 1.4.4.1 1996/06/05 02:55:30 jkh Exp $ */ #ifndef _NETISO_TP_PARAM_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_param.h,v 1.4 1995/05/30 08:11:24 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_param.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_param.h,v 1.4.4.1 1996/06/05 02:55:30 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_param.h,v $ * */ diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c index 0082972dec448..9a51c052b6106 100644 --- a/sys/netiso/tp_pcb.c +++ b/sys/netiso/tp_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_pcb.c,v 1.5 1995/05/30 08:11:26 rgrimes Exp $ + * $Id: tp_pcb.c,v 1.5.4.1 1996/06/05 02:55:31 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_pcb.c,v 1.5 1995/05/30 08:11:26 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_pcb.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_pcb.c,v 1.5.4.1 1996/06/05 02:55:31 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_pcb.c,v $ * * * This is the initialization and cleanup stuff - diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h index e0de63d4f4d15..e368a767d2451 100644 --- a/sys/netiso/tp_pcb.h +++ b/sys/netiso/tp_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp $ + * $Id: tp_pcb.h,v 1.5.4.1 1996/06/05 02:55:32 jkh Exp $ */ #ifndef _NETISO_TP_PCB_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_pcb.h,v 1.5 1995/05/30 08:11:27 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_pcb.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_pcb.h,v 1.5.4.1 1996/06/05 02:55:32 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_pcb.h,v $ * * * This file defines the transport protocol control block (tpcb). diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h index a4a312258cf98..160269b1df781 100644 --- a/sys/netiso/tp_seq.h +++ b/sys/netiso/tp_seq.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_seq.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_seq.h,v 1.4 1995/05/30 08:11:29 rgrimes Exp $ + * $Id: tp_seq.h,v 1.4.4.1 1996/06/05 02:55:37 jkh Exp $ */ #ifndef _NETISO_TP_SEQ_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_seq.h,v 1.4 1995/05/30 08:11:29 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_seq.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_seq.h,v 1.4.4.1 1996/06/05 02:55:37 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_seq.h,v $ * * These macros perform sequence number arithmetic modulo (2**7 or 2**31). * The relevant fields in the tpcb are: diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h index b6db8960e558b..05893bb3e5c68 100644 --- a/sys/netiso/tp_stat.h +++ b/sys/netiso/tp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_stat.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_stat.h,v 1.4 1995/05/30 08:11:30 rgrimes Exp $ + * $Id: tp_stat.h,v 1.4.4.1 1996/06/05 02:55:38 jkh Exp $ */ #ifndef _NETISO_TP_STAT_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_stat.h,v 1.4 1995/05/30 08:11:30 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_stat.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_stat.h,v 1.4.4.1 1996/06/05 02:55:38 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_stat.h,v $ * * Here are the data structures in which the global * statistics(counters) are gathered. diff --git a/sys/netiso/tp_states.h b/sys/netiso/tp_states.h index aff73fe78d275..a4e67b4cbf9e3 100644 --- a/sys/netiso/tp_states.h +++ b/sys/netiso/tp_states.h @@ -1,5 +1,5 @@ /* - * $Id: tp_states.h,v 1.3 1994/08/05 12:33:30 davidg Exp $ + * $Id: tp_states.h,v 1.4 1994/08/21 06:14:29 paul Exp $ */ #ifndef _NETISO_TP_STATES_H_ diff --git a/sys/netiso/tp_states.init b/sys/netiso/tp_states.init index d2333c07996d7..1200432f790f5 100644 --- a/sys/netiso/tp_states.init +++ b/sys/netiso/tp_states.init @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_states.init,v 1.1.1.1 1994/05/24 10:07:29 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_states.init,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/Attic/tp_states.init,v 1.1.1.1.8.1 1996/06/05 02:55:38 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/Attic/tp_states.init,v $ */ {0x3,0x0}, {0x6,0x1}, {0x6,0x2}, diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c index 359b3c91f24f9..7bdd22ffbf4bf 100644 --- a/sys/netiso/tp_subr.c +++ b/sys/netiso/tp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_subr.c,v 1.4 1995/05/30 08:11:32 rgrimes Exp $ + * $Id: tp_subr.c,v 1.4.4.1 1996/06/05 02:55:39 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_subr.c,v 1.4 1995/05/30 08:11:32 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_subr.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_subr.c,v 1.4.4.1 1996/06/05 02:55:39 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_subr.c,v $ * * The main work of data transfer is done here. * These routines are called from tp.trans. diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c index 1414df1a4debc..1813cf046b1d3 100644 --- a/sys/netiso/tp_subr2.c +++ b/sys/netiso/tp_subr2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_subr2.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_subr2.c,v 1.4 1995/05/30 08:11:34 rgrimes Exp $ + * $Id: tp_subr2.c,v 1.4.4.1 1996/06/05 02:55:40 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_subr2.c,v 1.4 1995/05/30 08:11:34 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_subr2.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_subr2.c,v 1.4.4.1 1996/06/05 02:55:40 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_subr2.c,v $ * * Some auxiliary routines: * tp_protocol_error: required by xebec- called when a combo of state, diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c index 63ca48d4d7d9b..0b8fe1f9d6944 100644 --- a/sys/netiso/tp_timer.c +++ b/sys/netiso/tp_timer.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_timer.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_timer.c,v 1.3 1995/05/30 08:11:35 rgrimes Exp $ + * $Id: tp_timer.c,v 1.3.4.1 1996/06/05 02:55:41 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_timer.c,v 1.3 1995/05/30 08:11:35 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_timer.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_timer.c,v 1.3.4.1 1996/06/05 02:55:41 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_timer.c,v $ * */ diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h index c0ab2d5663d1d..6a0a1fd41b523 100644 --- a/sys/netiso/tp_timer.h +++ b/sys/netiso/tp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_timer.h,v 1.4 1995/05/30 08:11:37 rgrimes Exp $ + * $Id: tp_timer.h,v 1.4.4.1 1996/06/05 02:55:42 jkh Exp $ */ #ifndef _NETISO_TP_TIMER_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_timer.h,v 1.4 1995/05/30 08:11:37 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_timer.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_timer.h,v 1.4.4.1 1996/06/05 02:55:42 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_timer.h,v $ * * ARGO TP * The callout structures used by the tp timers. diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h index d2bbf608363a3..b23f840c42b2c 100644 --- a/sys/netiso/tp_tpdu.h +++ b/sys/netiso/tp_tpdu.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_tpdu.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp $ + * $Id: tp_tpdu.h,v 1.4.4.1 1996/06/05 02:55:42 jkh Exp $ */ #ifndef _NETISO_TP_TPDU_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_tpdu.h,v 1.4 1995/05/30 08:11:38 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_tpdu.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_tpdu.h,v 1.4.4.1 1996/06/05 02:55:42 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_tpdu.h,v $ * * This ghastly set of macros makes it possible to * refer to tpdu structures without going mad. diff --git a/sys/netiso/tp_trace.c b/sys/netiso/tp_trace.c index 8e4050e245e79..de3e14ddfde3a 100644 --- a/sys/netiso/tp_trace.c +++ b/sys/netiso/tp_trace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_trace.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_trace.c,v 1.4 1995/05/30 08:11:40 rgrimes Exp $ + * $Id: tp_trace.c,v 1.4.4.1 1996/06/05 02:55:43 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_trace.c,v 1.4 1995/05/30 08:11:40 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_trace.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_trace.c,v 1.4.4.1 1996/06/05 02:55:43 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_trace.c,v $ * * The whole protocol trace module. * We keep a circular buffer of trace structures, which are big diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h index b0bb47ba2c3fb..480ad5e526fec 100644 --- a/sys/netiso/tp_trace.h +++ b/sys/netiso/tp_trace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_trace.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_trace.h,v 1.4 1995/05/30 08:11:41 rgrimes Exp $ + * $Id: tp_trace.h,v 1.4.4.1 1996/06/05 02:55:44 jkh Exp $ */ #ifndef _NETISO_TP_TRACE_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_trace.h,v 1.4 1995/05/30 08:11:41 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_trace.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_trace.h,v 1.4.4.1 1996/06/05 02:55:44 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_trace.h,v $ * * * Definitions needed for the protocol trace mechanism. diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h index 79a7415eda929..4c5b3d20eeaf9 100644 --- a/sys/netiso/tp_user.h +++ b/sys/netiso/tp_user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_user.h 8.1 (Berkeley) 6/10/93 - * $Id: tp_user.h,v 1.4 1995/05/30 08:11:43 rgrimes Exp $ + * $Id: tp_user.h,v 1.4.4.1 1996/06/05 02:55:45 jkh Exp $ */ #ifndef _NETISO_TP_USER_H_ @@ -66,8 +66,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_user.h,v 1.4 1995/05/30 08:11:43 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_user.h,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_user.h,v 1.4.4.1 1996/06/05 02:55:45 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_user.h,v $ * * These are the values a real-live user ;-) needs. */ diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c index 8f6a5cd05dd98..941d0247370ac 100644 --- a/sys/netiso/tp_usrreq.c +++ b/sys/netiso/tp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: tp_usrreq.c,v 1.4 1995/05/30 08:11:44 rgrimes Exp $ + * $Id: tp_usrreq.c,v 1.4.4.1 1996/06/05 02:55:46 jkh Exp $ */ /*********************************************************** @@ -63,8 +63,8 @@ SOFTWARE. /* * ARGO TP * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_usrreq.c,v 1.4 1995/05/30 08:11:44 rgrimes Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/Attic/tp_usrreq.c,v $ + * $Header: /home/ncvs/src/sys/netiso/Attic/tp_usrreq.c,v 1.4.4.1 1996/06/05 02:55:46 jkh Exp $ + * $Source: /home/ncvs/src/sys/netiso/Attic/tp_usrreq.c,v $ * * tp_usrreq(), the fellow that gets called from most of the socket code. * Pretty straighforward. diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c index 80a1e674d4451..576b4957c8df4 100644 --- a/sys/netiso/tuba_subr.c +++ b/sys/netiso/tuba_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_subr.c 8.1 (Berkeley) 6/10/93 - * $Id: tuba_subr.c,v 1.2 1994/08/02 07:51:34 davidg Exp $ + * $Id: tuba_subr.c,v 1.3 1995/05/30 08:11:46 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netiso/tuba_table.c b/sys/netiso/tuba_table.c index 0b0a977bf5a06..6fd4632622bbc 100644 --- a/sys/netiso/tuba_table.c +++ b/sys/netiso/tuba_table.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_table.c 8.2 (Berkeley) 11/15/93 - * $Id$ + * $Id: tuba_table.c,v 1.2 1994/08/02 07:51:35 davidg Exp $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netiso/tuba_table.h b/sys/netiso/tuba_table.h index 5d2b2fd7701fe..8fb9e914b01a9 100644 --- a/sys/netiso/tuba_table.h +++ b/sys/netiso/tuba_table.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_table.h 8.1 (Berkeley) 6/10/93 - * $Id: tuba_table.h,v 1.2 1994/08/02 07:51:37 davidg Exp $ + * $Id: tuba_table.h,v 1.3 1994/08/21 06:14:33 paul Exp $ */ #ifndef _NETISO_TUBA_TABLE_H_ diff --git a/sys/netiso/tuba_usrreq.c b/sys/netiso/tuba_usrreq.c index 2b4f716b14de2..9e9712bebc04c 100644 --- a/sys/netiso/tuba_usrreq.c +++ b/sys/netiso/tuba_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tuba_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: tuba_usrreq.c,v 1.2 1994/08/02 07:51:38 davidg Exp $ + * $Id: tuba_usrreq.c,v 1.3 1995/05/30 08:11:48 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netiso/xebec/debug.h b/sys/netiso/xebec/debug.h index aa0c6564c1897..e8153c1288c7e 100644 --- a/sys/netiso/xebec/debug.h +++ b/sys/netiso/xebec/debug.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/debug.h,v 1.2 1995/05/30 08:11:55 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/debug.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/debug.h,v 1.2.4.1 1996/06/05 02:56:02 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/debug.h,v $ */ #define OUT stdout diff --git a/sys/netiso/xebec/llparse.c b/sys/netiso/xebec/llparse.c index cbca4830aa603..11cac3b0ebe43 100644 --- a/sys/netiso/xebec/llparse.c +++ b/sys/netiso/xebec/llparse.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llparse.c,v 1.2 1995/05/30 08:11:57 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llparse.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/llparse.c,v 1.2.4.1 1996/06/05 02:56:03 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/llparse.c,v $ */ /* * ************************* NOTICE ******************************* * This code is in the public domain. It cannot be copyrighted. diff --git a/sys/netiso/xebec/llparse.h b/sys/netiso/xebec/llparse.h index 01f70a94da8e3..4d93e8684f405 100644 --- a/sys/netiso/xebec/llparse.h +++ b/sys/netiso/xebec/llparse.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llparse.h,v 1.2 1995/05/30 08:11:59 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llparse.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/llparse.h,v 1.2.4.1 1996/06/05 02:56:04 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/llparse.h,v $ */ /************************************************************ attributes stack garbage diff --git a/sys/netiso/xebec/llscan.c b/sys/netiso/xebec/llscan.c index 4163e9425034e..38ea34936ddca 100644 --- a/sys/netiso/xebec/llscan.c +++ b/sys/netiso/xebec/llscan.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llscan.c,v 1.2 1995/05/30 08:12:01 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/llscan.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/llscan.c,v 1.2.4.1 1996/06/05 02:56:05 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/llscan.c,v $ */ /* * ************************* NOTICE ******************************* * This code is in the public domain. It cannot be copyrighted. diff --git a/sys/netiso/xebec/main.c b/sys/netiso/xebec/main.c index 566114dae5da2..f1259cda4a6e5 100644 --- a/sys/netiso/xebec/main.c +++ b/sys/netiso/xebec/main.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/main.c,v 1.2 1995/05/30 08:12:03 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/main.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/main.c,v 1.2.4.1 1996/06/05 02:56:05 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/main.c,v $ */ /* * TODO: * rewrite the command line stuff altogether - it's kludged beyond diff --git a/sys/netiso/xebec/main.h b/sys/netiso/xebec/main.h index c64a27f156094..e14faedbcf125 100644 --- a/sys/netiso/xebec/main.h +++ b/sys/netiso/xebec/main.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/main.h,v 1.2 1995/05/30 08:12:05 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/main.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/main.h,v 1.2.4.1 1996/06/05 02:56:06 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/main.h,v $ */ #define TRUE 1 #define FALSE 0 diff --git a/sys/netiso/xebec/malloc.c b/sys/netiso/xebec/malloc.c index 5abe2d43183f1..44898d962575e 100644 --- a/sys/netiso/xebec/malloc.c +++ b/sys/netiso/xebec/malloc.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/malloc.c,v 1.2 1995/05/30 08:12:07 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/malloc.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/malloc.c,v 1.2.4.1 1996/06/05 02:56:07 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/malloc.c,v $ */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/malloc.h b/sys/netiso/xebec/malloc.h index 4de16e1238863..f801b4ee799bd 100644 --- a/sys/netiso/xebec/malloc.h +++ b/sys/netiso/xebec/malloc.h @@ -1,4 +1,4 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/malloc.h,v 1.1.1.1 1994/05/24 10:07:47 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/malloc.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/malloc.h,v 1.1.1.1.8.1 1996/06/05 02:56:08 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/malloc.h,v $ */ char *Malloc(); diff --git a/sys/netiso/xebec/procs.c b/sys/netiso/xebec/procs.c index f6b7744d29b81..e8c77bb9a8a67 100644 --- a/sys/netiso/xebec/procs.c +++ b/sys/netiso/xebec/procs.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/procs.c,v 1.2 1995/05/30 08:12:08 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/procs.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/procs.c,v 1.2.4.1 1996/06/05 02:56:08 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/procs.c,v $ */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/procs.h b/sys/netiso/xebec/procs.h index e886434334b13..e3c72d3f92b28 100644 --- a/sys/netiso/xebec/procs.h +++ b/sys/netiso/xebec/procs.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/procs.h,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/procs.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/procs.h,v 1.1.1.1.8.1 1996/06/05 02:56:09 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/procs.h,v $ */ extern char *stash(); extern struct Object *SameState; diff --git a/sys/netiso/xebec/putdriver.c b/sys/netiso/xebec/putdriver.c index 6543c3abf362a..abb11f772ee0a 100644 --- a/sys/netiso/xebec/putdriver.c +++ b/sys/netiso/xebec/putdriver.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/putdriver.c,v 1.2 1995/05/30 08:12:10 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/putdriver.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/putdriver.c,v 1.2.4.1 1996/06/05 02:56:10 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/putdriver.c,v $ */ /* * This code is such a kludge that I don't want to put my name on it. diff --git a/sys/netiso/xebec/sets.c b/sys/netiso/xebec/sets.c index 7cbfaaa2656fa..d546296553361 100644 --- a/sys/netiso/xebec/sets.c +++ b/sys/netiso/xebec/sets.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/sets.c,v 1.2 1995/05/30 08:12:12 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/sets.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/sets.c,v 1.2.4.1 1996/06/05 02:56:11 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/sets.c,v $ */ /* * This code is such a kludge that I don't want to put my name on it. * It was a ridiculously fast hack and needs rewriting. diff --git a/sys/netiso/xebec/sets.h b/sys/netiso/xebec/sets.h index b1ef98d651cbe..66bceb7b06059 100644 --- a/sys/netiso/xebec/sets.h +++ b/sys/netiso/xebec/sets.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/sets.h,v 1.2 1995/05/30 08:12:14 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/sets.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/sets.h,v 1.2.4.1 1996/06/05 02:56:12 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/sets.h,v $ */ #define MAXEVENTS 200 #define MAXSTATES 200 diff --git a/sys/netiso/xebec/test.trans b/sys/netiso/xebec/test.trans index 9cacba95c0a82..500b04f9edd01 100644 --- a/sys/netiso/xebec/test.trans +++ b/sys/netiso/xebec/test.trans @@ -1,4 +1,4 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/test.trans,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp $ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/test.trans,v 1.1.1.1.8.1 1996/06/05 02:56:12 jkh Exp $ */ *PROTOCOL test diff --git a/sys/netiso/xebec/xebec.c b/sys/netiso/xebec/xebec.c index 485f8a2f2bc42..02bbf51c0ec25 100644 --- a/sys/netiso/xebec/xebec.c +++ b/sys/netiso/xebec/xebec.c @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/xebec.c,v 1.2 1995/05/30 08:12:16 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/xebec.c,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/xebec.c,v 1.2.4.1 1996/06/05 02:56:13 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/xebec.c,v $ */ #include "xebec.h" #include "llparse.h" diff --git a/sys/netiso/xebec/xebec.h b/sys/netiso/xebec/xebec.h index cf5a443467ddc..df37ed495fe7d 100644 --- a/sys/netiso/xebec/xebec.h +++ b/sys/netiso/xebec/xebec.h @@ -1,5 +1,5 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/xebec.h,v 1.1.1.1 1994/05/24 10:07:40 rgrimes Exp $ */ -/* $Source: /pub/FreeBSD/FreeBSD-CVS/src/sys/netiso/xebec/Attic/xebec.h,v $ */ +/* $Header: /home/ncvs/src/sys/netiso/xebec/Attic/xebec.h,v 1.1.1.1.8.1 1996/06/05 02:56:14 jkh Exp $ */ +/* $Source: /home/ncvs/src/sys/netiso/xebec/Attic/xebec.h,v $ */ union llattrib { struct { diff --git a/sys/netns/idp.h b/sys/netns/idp.h index 96b8694d2fc77..8746ed80a583d 100644 --- a/sys/netns/idp.h +++ b/sys/netns/idp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp.h 8.1 (Berkeley) 6/10/93 - * $Id: idp.h,v 1.2 1994/08/02 07:51:40 davidg Exp $ + * $Id: idp.h,v 1.3 1994/08/21 06:22:05 paul Exp $ */ #ifndef _NETNS_IDP_H_ diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c index d6ffaf41a605e..592da22aa09a3 100644 --- a/sys/netns/idp_usrreq.c +++ b/sys/netns/idp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: idp_usrreq.c,v 1.3 1994/11/15 14:26:30 bde Exp $ + * $Id: idp_usrreq.c,v 1.4 1995/05/30 08:12:20 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h index 7ff3823a70fe1..e4b9e9f45934b 100644 --- a/sys/netns/idp_var.h +++ b/sys/netns/idp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)idp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: idp_var.h,v 1.2 1994/08/02 07:51:42 davidg Exp $ + * $Id: idp_var.h,v 1.3 1994/08/21 06:22:06 paul Exp $ */ #ifndef _NETNS_IDP_VAR_H_ diff --git a/sys/netns/ns.c b/sys/netns/ns.c index 61536e1a0aaf9..402f6b711bea4 100644 --- a/sys/netns/ns.c +++ b/sys/netns/ns.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns.c 8.2 (Berkeley) 11/15/93 - * $Id: ns.c,v 1.3 1994/11/15 14:26:31 bde Exp $ + * $Id: ns.c,v 1.4 1995/05/30 08:12:21 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns.h b/sys/netns/ns.h index 527c6950c9f93..27ba198fbfa68 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns.h 8.1 (Berkeley) 6/10/93 - * $Id: ns.h,v 1.2 1994/08/02 07:51:44 davidg Exp $ + * $Id: ns.h,v 1.3 1994/08/21 06:22:07 paul Exp $ */ #ifndef _NETNS_NS_H_ diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c index 617fb2c0f2eb3..6bd1bb44742e6 100644 --- a/sys/netns/ns_cksum.c +++ b/sys/netns/ns_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_cksum.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: ns_cksum.c,v 1.2 1994/08/02 07:51:45 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c index 0e7e24f0d5a51..7102c8925f4f7 100644 --- a/sys/netns/ns_error.c +++ b/sys/netns/ns_error.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_error.c 8.1 (Berkeley) 6/10/93 - * $Id: ns_error.c,v 1.2 1994/08/02 07:51:46 davidg Exp $ + * $Id: ns_error.c,v 1.3 1995/05/30 08:12:22 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h index 5e88b2c8e8ee9..b5ecdcf4d9ac7 100644 --- a/sys/netns/ns_error.h +++ b/sys/netns/ns_error.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_error.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_error.h,v 1.2 1994/08/02 07:51:47 davidg Exp $ + * $Id: ns_error.h,v 1.3 1994/08/21 06:22:07 paul Exp $ */ #ifndef _NETNS_NS_ERROR_H_ diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index a4a955ac82dd6..a20012853ce8d 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_if.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_if.h,v 1.3 1994/08/21 06:22:08 paul Exp $ + * $Id: ns_if.h,v 1.4 1995/03/16 18:15:27 bde Exp $ */ #ifndef _NETNS_NS_IF_H_ diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c index 6fa2e9c0eed50..72245b2086902 100644 --- a/sys/netns/ns_input.c +++ b/sys/netns/ns_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_input.c 8.1 (Berkeley) 6/10/93 - * $Id: ns_input.c,v 1.4 1995/05/11 00:13:22 wollman Exp $ + * $Id: ns_input.c,v 1.5 1995/05/30 08:12:27 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c index e87e1656bc22a..44614a9f4d88c 100644 --- a/sys/netns/ns_ip.c +++ b/sys/netns/ns_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_ip.c 8.1 (Berkeley) 6/10/93 - * $Id: ns_ip.c,v 1.2 1994/08/02 07:51:50 davidg Exp $ + * $Id: ns_ip.c,v 1.3 1995/03/19 14:29:03 davidg Exp $ */ /* diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c index 8b044896d4ea3..9d7715423831e 100644 --- a/sys/netns/ns_output.c +++ b/sys/netns/ns_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_output.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: ns_output.c,v 1.2 1994/08/02 07:51:51 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c index 754c9fb7f9dc7..1b07c32119466 100644 --- a/sys/netns/ns_pcb.c +++ b/sys/netns/ns_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_pcb.c 8.1 (Berkeley) 6/10/93 - * $Id: ns_pcb.c,v 1.2 1994/08/02 07:51:52 davidg Exp $ + * $Id: ns_pcb.c,v 1.3 1995/05/30 08:12:28 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h index 69bd331f12a9c..3260113f4b846 100644 --- a/sys/netns/ns_pcb.h +++ b/sys/netns/ns_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ns_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: ns_pcb.h,v 1.2 1994/08/02 07:51:53 davidg Exp $ + * $Id: ns_pcb.h,v 1.3 1994/08/21 06:22:09 paul Exp $ */ #ifndef _NETNS_NS_PCB_H_ diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c index 3352aa0d7cb75..87b16522bfece 100644 --- a/sys/netns/ns_proto.c +++ b/sys/netns/ns_proto.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)ns_proto.c 8.1 (Berkeley) 6/10/93 - * $Id: ns_proto.c,v 1.3 1995/05/11 00:13:23 wollman Exp $ + * $Id: ns_proto.c,v 1.4 1995/05/30 08:12:30 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/sp.h b/sys/netns/sp.h index 78b9134035425..1f50e6e1d13d6 100644 --- a/sys/netns/sp.h +++ b/sys/netns/sp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sp.h 8.1 (Berkeley) 6/10/93 - * $Id: sp.h,v 1.2 1994/08/02 07:51:55 davidg Exp $ + * $Id: sp.h,v 1.3 1994/08/21 06:22:09 paul Exp $ */ #ifndef _NETNS_SP_H_ diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h index 5642f4a6b1373..52fdf786e3309 100644 --- a/sys/netns/spidp.h +++ b/sys/netns/spidp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spidp.h 8.1 (Berkeley) 6/10/93 - * $Id: spidp.h,v 1.2 1994/08/02 07:51:56 davidg Exp $ + * $Id: spidp.h,v 1.3 1994/08/21 06:22:10 paul Exp $ */ #ifndef _NETNS_SPIDP_H_ diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c index f979a1ec9b89a..982c9aa141508 100644 --- a/sys/netns/spp_debug.c +++ b/sys/netns/spp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: spp_debug.c,v 1.2 1994/08/02 07:51:57 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h index 51132e513eada..0f5b0930b6cd3 100644 --- a/sys/netns/spp_debug.h +++ b/sys/netns/spp_debug.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_debug.h,v 1.2 1994/08/02 07:51:58 davidg Exp $ + * $Id: spp_debug.h,v 1.3 1994/08/21 06:22:11 paul Exp $ */ #ifndef _NETNS_SPP_DEBUG_H_ diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h index d480f20701e58..972fd6ab8d827 100644 --- a/sys/netns/spp_timer.h +++ b/sys/netns/spp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_timer.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_timer.h,v 1.2 1994/08/02 07:51:59 davidg Exp $ + * $Id: spp_timer.h,v 1.3 1994/08/21 06:22:11 paul Exp $ */ #ifndef _NETNS_SPP_TIMER_H_ diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index fbce16af404a3..8a78580dfd038 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_usrreq.c 8.1 (Berkeley) 6/10/93 - * $Id: spp_usrreq.c,v 1.3 1995/03/19 14:29:04 davidg Exp $ + * $Id: spp_usrreq.c,v 1.4 1995/05/30 08:12:31 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h index 98141671e02de..8b630d1c8ab65 100644 --- a/sys/netns/spp_var.h +++ b/sys/netns/spp_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spp_var.h 8.1 (Berkeley) 6/10/93 - * $Id: spp_var.h,v 1.2 1994/08/02 07:52:01 davidg Exp $ + * $Id: spp_var.h,v 1.3 1994/08/21 06:22:12 paul Exp $ */ #ifndef _NETNS_SPP_VAR_H_ diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 444cf1558669f..7850f3d7c36d2 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $ + * $Id: nfs.h,v 1.9.4.1 1996/03/21 20:29:56 phk Exp $ */ #ifndef _NFS_NFS_H_ diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 5f4f316271bf9..7cc04e9676b5c 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.14.4.1 1996/01/30 11:53:56 davidg Exp $ + * $Id: nfs_bio.c,v 1.14.4.2 1996/06/08 20:22:38 pst Exp $ */ #include <sys/param.h> diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index dbc45f187f3d5..c78be2477a266 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_node.c 8.2 (Berkeley) 12/30/93 - * $Id: nfs_node.c,v 1.8.4.1 1995/07/22 03:40:56 davidg Exp $ + * $Id: nfs_node.c,v 1.8.4.2 1996/06/12 03:42:38 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index bfd83f634a6b6..3580e316ea8ad 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_nqlease.c,v 1.11 1995/05/30 08:12:36 rgrimes Exp $ + * $Id: nfs_nqlease.c,v 1.11.4.1 1996/03/21 20:29:57 phk Exp $ */ /* diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 3051e6fa403f5..33cb9d1cd881e 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.15.2.2 1996/03/21 20:29:58 phk Exp $ + * $Id: nfs_serv.c,v 1.15.2.3 1996/07/02 20:28:20 bde Exp $ */ /* diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index d9ab2d3bfad85..15c8f9e0c77f3 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_socket.c,v 1.7 1995/05/30 08:12:40 rgrimes Exp $ + * $Id: nfs_socket.c,v 1.7.4.1 1996/03/21 20:29:59 phk Exp $ */ /* diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index 506107e4ac682..397c25d8b4dc8 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_srvcache.c 8.1 (Berkeley) 6/10/93 - * $Id: nfs_srvcache.c,v 1.5 1994/10/17 17:47:36 phk Exp $ + * $Id: nfs_srvcache.c,v 1.5.8.1 1996/03/21 20:30:00 phk Exp $ */ /* diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 210d3ece69af0..709f2e41e2c46 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.15.4.3 1995/07/20 10:34:12 davidg Exp $ + * $Id: nfs_subs.c,v 1.15.4.4 1996/03/21 20:30:02 phk Exp $ */ /* diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 341fa096a63f0..c54cd68d06467 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_syscalls.c,v 1.6 1995/05/30 08:12:45 rgrimes Exp $ + * $Id: nfs_syscalls.c,v 1.6.4.1 1996/03/21 20:30:04 phk Exp $ */ #include <sys/param.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 737cfc6d314c2..12ac22ced652a 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.15 1995/06/11 19:31:46 rgrimes Exp $ + * $Id: nfs_vfsops.c,v 1.15.2.1 1996/03/21 20:30:05 phk Exp $ */ #include <sys/param.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 14d3e51a04225..5feafb5dc5379 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.15.4.2 1995/10/26 09:17:36 davidg Exp $ + * $Id: nfs_vnops.c,v 1.15.4.3 1996/03/21 20:30:07 phk Exp $ */ /* diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h index 5df85e0f65923..70c7decd97ceb 100644 --- a/sys/nfs/nfsdiskless.h +++ b/sys/nfs/nfsdiskless.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsdiskless.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsdiskless.h,v 1.3 1994/08/05 09:28:49 davidg Exp $ + * $Id: nfsdiskless.h,v 1.4 1994/08/21 06:50:09 paul Exp $ */ #ifndef _NFS_NFSDISKLESS_H_ diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h index 030a985b40d17..c1ccbbe5c0bc0 100644 --- a/sys/nfs/nfsm_subs.h +++ b/sys/nfs/nfsm_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93 - * $Id: nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp $ + * $Id: nfsm_subs.h,v 1.6 1995/05/30 08:12:51 rgrimes Exp $ */ #ifndef _NFS_NFSM_SUBS_H_ diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h index 733616da8993a..215867be5f294 100644 --- a/sys/nfs/nfsmount.h +++ b/sys/nfs/nfsmount.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsmount.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsmount.h,v 1.4 1994/10/17 17:47:43 phk Exp $ + * $Id: nfsmount.h,v 1.4.8.1 1996/03/21 20:30:09 phk Exp $ */ #ifndef _NFS_NFSMOUNT_H_ diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index 439fbb62a0cbb..55fb2d125d875 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsnode.h 8.4 (Berkeley) 2/13/94 - * $Id: nfsnode.h,v 1.9.4.1 1996/03/21 20:30:09 phk Exp $ + * $Id: nfsnode.h,v 1.9.4.2 1996/03/29 06:04:46 davidg Exp $ */ #ifndef _NFS_NFSNODE_H_ diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h index 4463f621645d0..defeddd556cef 100644 --- a/sys/nfs/nfsrtt.h +++ b/sys/nfs/nfsrtt.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsrtt.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsrtt.h,v 1.2 1994/08/02 07:52:24 davidg Exp $ + * $Id: nfsrtt.h,v 1.3 1994/08/21 06:50:12 paul Exp $ */ #ifndef _NFS_NFSRTT_H_ diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h index b367b9f4a2c9f..5a8a6f176406f 100644 --- a/sys/nfs/nfsrvcache.h +++ b/sys/nfs/nfsrvcache.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsrvcache.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsrvcache.h,v 1.3 1994/08/21 06:50:13 paul Exp $ + * $Id: nfsrvcache.h,v 1.4 1994/10/17 17:47:44 phk Exp $ */ #ifndef _NFS_NFSRVCACHE_H_ diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h index 62ba33899be10..c4d0ddce14a69 100644 --- a/sys/nfs/nfsv2.h +++ b/sys/nfs/nfsv2.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsv2.h 8.1 (Berkeley) 6/10/93 - * $Id: nfsv2.h,v 1.3 1994/08/18 22:35:37 wollman Exp $ + * $Id: nfsv2.h,v 1.4 1994/08/21 06:50:13 paul Exp $ */ #ifndef _NFS_NFSV2_H_ diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h index 0f8f12b238dcc..e246a30e07c9d 100644 --- a/sys/nfs/nqnfs.h +++ b/sys/nfs/nqnfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nqnfs.h 8.1 (Berkeley) 6/10/93 - * $Id: nqnfs.h,v 1.5 1994/10/02 17:27:07 phk Exp $ + * $Id: nqnfs.h,v 1.6 1994/10/17 17:47:45 phk Exp $ */ #ifndef _NFS_NQNFS_H_ diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h index 2360cdc3c40aa..2e926459f9c2e 100644 --- a/sys/nfs/rpcv2.h +++ b/sys/nfs/rpcv2.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rpcv2.h 8.1 (Berkeley) 6/10/93 - * $Id: rpcv2.h,v 1.2 1994/08/02 07:52:29 davidg Exp $ + * $Id: rpcv2.h,v 1.3 1994/08/21 06:50:15 paul Exp $ */ #ifndef _NFS_RPCV2_H_ diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h index ac00385e7da06..ccb3ca2d99c31 100644 --- a/sys/nfs/xdr_subs.h +++ b/sys/nfs/xdr_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)xdr_subs.h 8.1 (Berkeley) 6/10/93 - * $Id: xdr_subs.h,v 1.3 1994/08/21 06:50:16 paul Exp $ + * $Id: xdr_subs.h,v 1.4 1995/01/10 13:11:42 davidg Exp $ */ #ifndef _NFS_XDR_SUBS_H_ diff --git a/sys/pci/README.de b/sys/pci/README.de index fb81945c4d73d..b693e39d2b85b 100644 --- a/sys/pci/README.de +++ b/sys/pci/README.de @@ -1,4 +1,4 @@ -$Id: README.de,v 1.3 1994/10/12 11:19:36 se Exp $ +$Id: README.de,v 1.4 1994/10/29 13:13:39 jkh Exp $ ---------------- diff --git a/sys/pci/README.de-le b/sys/pci/README.de-le index 60cd2e2750e03..3e7cd01bd3130 100644 --- a/sys/pci/README.de-le +++ b/sys/pci/README.de-le @@ -1,4 +1,4 @@ -$Id: README.de-le,v 1.1 1994/10/01 20:16:44 wollman Exp $ +$Id: README.de-le,v 1.2 1994/10/29 13:13:40 jkh Exp $ ---------------- diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c index e04f1babab22c..675cd22e958dc 100644 --- a/sys/pci/aic7870.c +++ b/sys/pci/aic7870.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7870.c,v 1.11.2.18 1996/10/06 16:42:35 gibbs Exp $ + * $Id: aic7870.c,v 1.11.2.19 1997/02/12 18:40:17 gibbs Exp $ */ #if defined(__FreeBSD__) diff --git a/sys/pci/bt9xx.c b/sys/pci/bt9xx.c index 635daa404e152..5ef2076c6f332 100644 --- a/sys/pci/bt9xx.c +++ b/sys/pci/bt9xx.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: bt9xx.c,v 1.7 1996/02/18 07:44:16 gibbs Exp $ + * $Id: bt9xx.c,v 1.3.2.4 1996/04/01 00:25:27 gibbs Exp $ */ #include <pci.h> diff --git a/sys/pci/dc21040.h b/sys/pci/dc21040.h index 064c1219b589f..6b37ce7850de6 100644 --- a/sys/pci/dc21040.h +++ b/sys/pci/dc21040.h @@ -21,7 +21,7 @@ * (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: dc21040.h,v 1.15 1996/06/13 16:12:56 thomas Exp $ + * $Id: dc21040.h,v 1.4.4.2 1996/11/10 12:32:27 davidg Exp $ * */ diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 9b21c3a89c94f..0a81688a5ee6e 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -21,7 +21,7 @@ * (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: if_de.c,v 1.29.2.7 1996/11/10 13:35:49 davidg Exp $ + * $Id: if_de.c,v 1.29.2.8 1997/02/13 15:14:21 davidg Exp $ * */ diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index f36bebe31fb2e..da8a7c8281576 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.8.2.10 1996/09/29 10:21:38 davidg Exp $ + * $Id: if_fxp.c,v 1.8.2.11 1997/02/05 12:50:31 davidg Exp $ */ /* diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h index dc4fb54a6cf42..f3f6cbdd784fa 100644 --- a/sys/pci/if_fxpreg.h +++ b/sys/pci/if_fxpreg.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpreg.h,v 1.2.2.1 1996/04/08 01:32:00 davidg Exp $ + * $Id: if_fxpreg.h,v 1.2.2.2 1997/02/05 12:50:33 davidg Exp $ */ #define FXP_VENDORID_INTEL 0x8086 diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c index 2c8885bde871b..59282e697071d 100644 --- a/sys/pci/if_pdq.c +++ b/sys/pci/if_pdq.c @@ -21,7 +21,7 @@ * (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: if_pdq.c,v 1.5 1995/04/05 08:19:23 davidg Exp $ + * $Id: if_pdq.c,v 1.6 1995/05/30 08:13:04 rgrimes Exp $ * */ diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 6218db8135482..903fbe66ca8ad 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.37.4.9 1996/08/05 19:10:33 se Exp $ +** $Id: ncr.c,v 1.37.4.10 1996/11/09 08:41:50 jkh Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -1254,7 +1254,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.37.4.9 1996/08/05 19:10:33 se Exp $\n"; + "\n$Id: ncr.c,v 1.37.4.10 1996/11/09 08:41:50 jkh Exp $\n"; u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h index 1a8b9f1c1dcb2..392bbdd6a774c 100644 --- a/sys/pci/ncrreg.h +++ b/sys/pci/ncrreg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncrreg.h,v 1.2 1995/02/02 13:12:16 davidg Exp $ +** $Id: ncrreg.h,v 1.3 1995/03/21 22:48:36 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** diff --git a/sys/pci/pci.c b/sys/pci/pci.c index d0dcc7c0c0f42..6fd805320b5b0 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.23.4.6 1996/06/26 04:36:49 davidg Exp $ +** $Id: pci.c,v 1.23.4.7 1996/11/12 22:20:22 se Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () diff --git a/sys/pci/pcibus.h b/sys/pci/pcibus.h index 842d97c6dfa0e..a2ee88941364c 100644 --- a/sys/pci/pcibus.h +++ b/sys/pci/pcibus.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.h,v 1.1 1995/02/01 22:56:47 se Exp $ +** $Id: pcibus.h,v 1.2 1995/03/21 23:01:03 se Exp $ ** ** Declarations for pci bus driver. ** diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h index 9aaf8075c59d7..898508c713237 100644 --- a/sys/pci/pcireg.h +++ b/sys/pci/pcireg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcireg.h,v 1.5.4.2 1996/06/26 04:36:50 davidg Exp $ +** $Id: pcireg.h,v 1.5.4.3 1996/11/12 22:20:12 se Exp $ ** ** Names for PCI configuration space registers. ** diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c index 3a17d15b7fa52..a39dfe4de722e 100644 --- a/sys/pci/pcisupport.c +++ b/sys/pci/pcisupport.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcisupport.c,v 1.13.4.4 1996/09/06 09:17:05 rgrimes Exp $ +** $Id: pcisupport.c,v 1.13.4.5 1996/09/16 08:52:18 rgrimes Exp $ ** ** Device driver for DEC/INTEL PCI chipsets. ** diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h index 1e91b9d193981..e23b9bd3107ad 100644 --- a/sys/pci/pcivar.h +++ b/sys/pci/pcivar.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcivar.h,v 1.6 1995/05/30 08:13:12 rgrimes Exp $ +** $Id: pcivar.h,v 1.6.4.1 1996/06/26 04:36:54 davidg Exp $ ** ** Declarations for pci device drivers. ** diff --git a/sys/pci/pdq.c b/sys/pci/pdq.c index 610458bd19ece..0cdaffd5e438c 100644 --- a/sys/pci/pdq.c +++ b/sys/pci/pdq.c @@ -21,9 +21,12 @@ * (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: pdq.c,v 1.4 1995/04/01 01:43:56 davidg Exp $ + * $Id: pdq.c,v 1.5 1995/05/30 08:13:13 rgrimes Exp $ * * $Log: pdq.c,v $ + * Revision 1.5 1995/05/30 08:13:13 rgrimes + * Remove trailing whitespace. + * * Revision 1.4 1995/04/01 01:43:56 davidg * Patch from Matt Thomas to fix mbuf leak in FDDI driver. * diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h index f7226e0b6738e..9af0c4eddc60b 100644 --- a/sys/pci/pdq_os.h +++ b/sys/pci/pdq_os.h @@ -21,9 +21,12 @@ * (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: pdq_os.h,v 1.3 1995/07/16 10:07:20 bde Exp $ + * $Id: pdq_os.h,v 1.2.4.1 1995/09/12 09:19:23 davidg Exp $ * * $Log: pdq_os.h,v $ + * Revision 1.2.4.1 1995/09/12 09:19:23 davidg + * Brought in change from rev 1.3: include systm.h. + * * Revision 1.3 1995/07/16 10:07:20 bde * Fix compiler warnings (systm.h wasn't included). * diff --git a/sys/pci/pdqreg.h b/sys/pci/pdqreg.h index 08038f4b7a9a3..a025e8e25802a 100644 --- a/sys/pci/pdqreg.h +++ b/sys/pci/pdqreg.h @@ -21,9 +21,12 @@ * (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: pdqreg.h,v 1.1 1995/03/14 09:16:07 davidg Exp $ + * $Id: pdqreg.h,v 1.2 1995/05/30 08:13:15 rgrimes Exp $ * * $Log: pdqreg.h,v $ + * Revision 1.2 1995/05/30 08:13:15 rgrimes + * Remove trailing whitespace. + * * Revision 1.1 1995/03/14 09:16:07 davidg * Added support for generic FDDI and the DEC DEFEA and DEFPA FDDI adapters. * diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 8d10b4fd46c75..33a5e20b67c5e 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.41.4.2 1996/04/01 00:25:57 gibbs Exp $ + * $Id: cd.c,v 1.41.4.3 1996/06/08 11:38:16 joerg Exp $ */ #define SPLCD splbio diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index e671a54eef365..0ed7a37935b43 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,7 +2,7 @@ * Written by grefen@????? * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 1.21 1995/05/30 08:13:22 rgrimes Exp $ + * $Id: ch.c,v 1.21.4.1 1996/04/01 00:25:59 gibbs Exp $ */ #include <sys/types.h> diff --git a/sys/scsi/od.c b/sys/scsi/od.c index b7fb255ed66a9..0d96e2cc63959 100644 --- a/sys/scsi/od.c +++ b/sys/scsi/od.c @@ -28,7 +28,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: od.c,v 1.16.2.1 1996/06/08 11:28:43 joerg Exp $ + * $Id: od.c,v 1.16.2.2 1996/06/16 20:10:31 joerg Exp $ */ /* diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c index 63ac6c06ab248..ba0f2bdb3d8a5 100644 --- a/sys/scsi/pt.c +++ b/sys/scsi/pt.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pt.c,v 1.5 1995/05/30 08:13:23 rgrimes Exp $ + * $Id: pt.c,v 1.5.4.1 1996/04/01 00:26:01 gibbs Exp $ */ /* diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h index 8da591e743233..ad6f99fdf403e 100644 --- a/sys/scsi/scsi_all.h +++ b/sys/scsi/scsi_all.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_all.h,v 1.12 1995/04/14 15:10:29 dufault Exp $ + * $Id: scsi_all.h,v 1.13 1995/05/30 08:13:25 rgrimes Exp $ */ /* diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 66b38b220ff4a..750b04966a731 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.29.4.1 1995/10/10 00:42:00 davidg Exp $ + * $Id: scsi_base.c,v 1.29.4.2 1996/04/01 00:26:03 gibbs Exp $ */ #define SPLSD splbio diff --git a/sys/scsi/scsi_cd.h b/sys/scsi/scsi_cd.h index 7b8f63ccec0f7..859e78844802f 100644 --- a/sys/scsi/scsi_cd.h +++ b/sys/scsi/scsi_cd.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_cd.h,v 1.6 1993/11/18 05:02:52 rgrimes Exp $ + * $Id: scsi_cd.h,v 1.7 1995/05/30 08:13:29 rgrimes Exp $ */ #ifndef _SCSI_SCSI_CD_H #define _SCSI_SCSI_CD_H 1 diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h index d7d628af756ef..c48491db92b71 100644 --- a/sys/scsi/scsi_changer.h +++ b/sys/scsi/scsi_changer.h @@ -19,7 +19,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_changer.h,v 1.6 1993/11/18 05:02:53 rgrimes Exp $ + * $Id: scsi_changer.h,v 1.7 1995/05/30 08:13:30 rgrimes Exp $ */ #ifndef _SCSI_SCSI_CHANGER_H #define _SCSI_SCSI_CHANGER_H 1 diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h index 578cd43412d87..d1e0a1929f631 100644 --- a/sys/scsi/scsi_debug.h +++ b/sys/scsi/scsi_debug.h @@ -2,7 +2,7 @@ /* * Written by Julian Elischer (julian@tfs.com) * - * $Id: scsi_debug.h,v 1.1 1993/11/18 05:02:54 rgrimes Exp $ + * $Id: scsi_debug.h,v 1.2 1995/05/30 08:13:32 rgrimes Exp $ */ #ifndef _SCSI_SCSI_DEBUG_H #define _SCSI_SCSI_DEBUG_H 1 diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h index 37a9e063ddec7..cea6e2bcf10df 100644 --- a/sys/scsi/scsi_disk.h +++ b/sys/scsi/scsi_disk.h @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_disk.h,v 1.9 1996/05/19 19:29:09 joerg Exp $ + * $Id: scsi_disk.h,v 1.8.4.1 1996/06/16 20:10:34 joerg Exp $ */ /* diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c index 4f434d29e6926..f928827ee1d30 100644 --- a/sys/scsi/scsi_driver.c +++ b/sys/scsi/scsi_driver.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.c,v 1.10.4.2 1996/04/01 00:26:04 gibbs Exp $ + * $Id: scsi_driver.c,v 1.10.4.3 1996/06/16 20:10:37 joerg Exp $ * */ #include <sys/types.h> diff --git a/sys/scsi/scsi_driver.h b/sys/scsi/scsi_driver.h index 2e7b840e3a73d..a2f5f26953134 100644 --- a/sys/scsi/scsi_driver.h +++ b/sys/scsi/scsi_driver.h @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.h,v 1.4 1995/05/30 08:13:39 rgrimes Exp $ + * $Id: scsi_driver.h,v 1.4.4.1 1996/04/01 00:26:06 gibbs Exp $ * */ #ifndef _SCSI__DRIVER_H_ diff --git a/sys/scsi/scsi_generic.h b/sys/scsi/scsi_generic.h index e1a3d883ff5de..8f7a9d37f84bb 100644 --- a/sys/scsi/scsi_generic.h +++ b/sys/scsi/scsi_generic.h @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: @(#)stdio.h 5.17 (Berkeley) 6/3/91 - * $Id: scsi_generic.h,v 1.3 1995/01/08 13:38:31 dufault Exp $ + * $Id: scsi_generic.h,v 1.4 1995/05/30 08:13:40 rgrimes Exp $ */ /* generic SCSI header file. We use the same minor number format diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 1502c35e7b9ad..af273fc1c6952 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.16.4.1 1995/11/10 15:08:05 davidg Exp $ + * $Id: scsi_ioctl.c,v 1.16.4.2 1996/04/01 00:26:08 gibbs Exp $ * * */ diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h index 159978f4d7248..15cde2bdb615c 100644 --- a/sys/scsi/scsi_tape.h +++ b/sys/scsi/scsi_tape.h @@ -21,7 +21,7 @@ /* * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsi_tape.h,v 1.14 1995/11/30 07:43:46 pst Exp $ + * $Id: scsi_tape.h,v 1.13.4.1 1996/01/05 06:19:35 pst Exp $ */ #ifndef SCSI_SCSI_TAPE_H #define SCSI_SCSI_TAPE_H 1 diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 5624e5df48d90..2869bae74d6d2 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -16,7 +16,7 @@ * * New configuration setup: dufault@hda.com * - * $Id: scsiconf.c,v 1.30.4.9 1996/06/28 16:59:47 joerg Exp $ + * $Id: scsiconf.c,v 1.30.4.10 1996/11/06 17:34:25 joerg Exp $ */ #include <sys/types.h> diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 93034026da87f..75bd9406c53c3 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: scsiconf.h,v 1.26.4.5 1996/04/01 00:26:12 gibbs Exp $ + * $Id: scsiconf.h,v 1.26.4.6 1996/06/23 14:48:38 joerg Exp $ */ #ifndef SCSI_SCSICONF_H #define SCSI_SCSICONF_H 1 diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c index c3658b1601c6d..5efcb1fc4e23d 100644 --- a/sys/scsi/sctarg.c +++ b/sys/scsi/sctarg.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sctarg.c,v 1.3.4.1 1995/07/22 04:25:09 davidg Exp $ + * $Id: sctarg.c,v 1.3.4.2 1996/04/01 00:26:13 gibbs Exp $ */ /* diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index d8d4bcf8382a5..de21a3dd77254 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.65 1995/05/30 08:13:51 rgrimes Exp $ + * $Id: sd.c,v 1.65.4.1 1996/04/01 00:26:14 gibbs Exp $ */ #define SPLSD splbio diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c index df7fbb680047c..d5cadef19c3ac 100644 --- a/sys/scsi/ssc.c +++ b/sys/scsi/ssc.c @@ -49,7 +49,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *End copyright - * $Id: ssc.c,v 1.2 1995/01/08 15:56:09 dufault Exp $ + * $Id: ssc.c,v 1.3 1995/05/03 18:09:18 dufault Exp $ */ #include <sys/types.h> diff --git a/sys/scsi/st.c b/sys/scsi/st.c index d823c528a223d..e8816545e5d5c 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.36.4.4 1996/06/22 15:00:00 joerg Exp $ + * $Id: st.c,v 1.36.4.5 1996/06/25 17:45:58 joerg Exp $ */ /* diff --git a/sys/scsi/su.c b/sys/scsi/su.c index dd73c2b7f2fbe..97f4809a6e364 100644 --- a/sys/scsi/su.c +++ b/sys/scsi/su.c @@ -44,7 +44,7 @@ * SUCH DAMAGE. *End copyright * - * $Id: su.c,v 1.4 1995/03/04 20:51:07 dufault Exp $ + * $Id: su.c,v 1.5 1995/05/03 18:09:20 dufault Exp $ * * Tabstops 4 */ diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c index c5e58d490c0f8..e75f12ee6daae 100644 --- a/sys/scsi/uk.c +++ b/sys/scsi/uk.c @@ -2,7 +2,7 @@ * Driver for a device we can't identify. * by Julian Elischer (julian@tfs.com) * - * $Id: uk.c,v 1.9 1995/05/30 08:13:56 rgrimes Exp $ + * $Id: uk.c,v 1.9.4.1 1996/03/31 18:10:26 joerg Exp $ * * If you find that you are adding any code to this file look closely * at putting it in "scsi_driver.c" instead. diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 537a341ea190d..439811c37b997 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.7.4.3 1996/06/23 14:48:39 joerg Exp $ + * $Id: worm.c,v 1.7.4.4 1996/11/06 12:42:11 joerg Exp $ */ /* XXX This is PRELIMINARY. diff --git a/sys/sys/acct.h b/sys/sys/acct.h index 0ea88d8ea1120..edf66c87744f0 100644 --- a/sys/sys/acct.h +++ b/sys/sys/acct.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)acct.h 8.2 (Berkeley) 1/21/94 - * $Id: acct.h,v 1.3 1994/08/21 04:41:31 paul Exp $ + * $Id: acct.h,v 1.4 1994/09/26 21:09:15 davidg Exp $ */ #ifndef _SYS_ACCT_H_ diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 6948b10bf2774..efd904eb59227 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.7 (Berkeley) 1/21/94 - * $Id: buf.h,v 1.19 1995/05/30 08:14:07 rgrimes Exp $ + * $Id: buf.h,v 1.19.4.1 1995/09/12 09:22:59 davidg Exp $ */ #ifndef _SYS_BUF_H_ diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 81380b33f4ed5..928e777605697 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)callout.h 8.2 (Berkeley) 1/21/94 - * $Id: callout.h,v 1.3 1994/08/18 22:35:41 wollman Exp $ + * $Id: callout.h,v 1.4 1994/08/21 04:41:33 paul Exp $ */ #ifndef _SYS_CALLOUT_H_ diff --git a/sys/sys/ccdvar.h b/sys/sys/ccdvar.h index 28e3e4d64fa85..3dbeb488a0fef 100644 --- a/sys/sys/ccdvar.h +++ b/sys/sys/ccdvar.h @@ -1,4 +1,4 @@ -/* $Id: ccdvar.h,v 1.3 1995/12/28 00:21:32 asami Exp $ */ +/* $Id: ccdvar.h,v 1.4 1996/01/30 22:33:31 asami Exp $ */ /* $NetBSD: ccdvar.h,v 1.7.2.1 1995/10/12 21:30:18 thorpej Exp $ */ diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 03233d046ca27..19ac7363fd75b 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.7 (Berkeley) 1/21/94 - * $Id: cdefs.h,v 1.7 1994/12/08 15:42:17 bde Exp $ + * $Id: cdefs.h,v 1.8 1994/12/23 22:38:54 nate Exp $ */ #ifndef _SYS_CDEFS_H_ diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index 8af5d6524a2e8..977af0e942a84 100644 --- a/sys/sys/cdio.h +++ b/sys/sys/cdio.h @@ -1,7 +1,7 @@ /* * 16 Feb 93 Julian Elischer (julian@dialix.oz.au) * - * $Id: cdio.h,v 1.7 1995/04/09 15:50:48 jkh Exp $ + * $Id: cdio.h,v 1.8 1995/05/30 08:14:11 rgrimes Exp $ */ /* <1> Fixed a conflict with ioctl usage. There were two different diff --git a/sys/sys/chio.h b/sys/sys/chio.h index cc566ec9b1944..634876bf84f41 100644 --- a/sys/sys/chio.h +++ b/sys/sys/chio.h @@ -1,7 +1,7 @@ /* * 16 Feb 93 Julian Elischer ADDED for SCSI system * - * $Id: chio.h,v 1.4 1993/11/18 05:03:24 rgrimes Exp $ + * $Id: chio.h,v 1.5 1995/05/30 08:14:13 rgrimes Exp $ */ /* This is a "convertet" mtio.h from 386BSD diff --git a/sys/sys/clist.h b/sys/sys/clist.h index f1438a160d2aa..3b644ecd3cc33 100644 --- a/sys/sys/clist.h +++ b/sys/sys/clist.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)clist.h 8.1 (Berkeley) 6/4/93 - * $Id: clist.h,v 1.4 1994/08/21 04:41:35 paul Exp $ + * $Id: clist.h,v 1.5 1995/01/07 06:08:15 davidg Exp $ */ #ifndef _SYS_CLIST_H_ diff --git a/sys/sys/conf.h b/sys/sys/conf.h index d42e1163a9099..9bd51e5788e6c 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.14 1995/05/14 03:00:03 davidg Exp $ + * $Id: conf.h,v 1.15 1995/05/30 08:14:14 rgrimes Exp $ */ #ifndef _SYS_CONF_H_ diff --git a/sys/sys/devconf.h b/sys/sys/devconf.h index d468c33223a80..96b143be901dc 100644 --- a/sys/sys/devconf.h +++ b/sys/sys/devconf.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devconf.h,v 1.5 1995/04/12 20:47:13 wollman Exp $ + * $Id: devconf.h,v 1.6 1995/04/13 20:37:51 wollman Exp $ */ /* diff --git a/sys/sys/device.h b/sys/sys/device.h index 2fe1d6a70b3cb..6c0b4ec1aed25 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * @(#)device.h 8.2 (Berkeley) 2/17/94 - * $Id$ + * $Id: device.h,v 1.2 1994/08/02 07:52:45 davidg Exp $ */ #ifndef _SYS_DEVICE_H_ diff --git a/sys/sys/dir.h b/sys/sys/dir.h index c0347c1ec5547..e80b1943778e6 100644 --- a/sys/sys/dir.h +++ b/sys/sys/dir.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * $Id: dir.h,v 1.2 1994/08/02 07:52:46 davidg Exp $ */ /* diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h index 53b9e7a4848fb..5df97e2464db9 100644 --- a/sys/sys/dirent.h +++ b/sys/sys/dirent.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.1 (Berkeley) 6/2/93 - * $Id: dirent.h,v 1.3 1994/08/21 04:41:38 paul Exp $ + * $Id: dirent.h,v 1.4 1995/05/30 08:14:16 rgrimes Exp $ */ #ifndef _SYS_DIRENT_H_ diff --git a/sys/sys/disk.h b/sys/sys/disk.h index c90eca5b0d32e..a375d0d2aa296 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -41,7 +41,7 @@ * * @(#)disk.h 8.1 (Berkeley) 6/2/93 * - * $Id: disk.h,v 1.2 1994/08/02 07:52:48 davidg Exp $ + * $Id: disk.h,v 1.3 1994/08/21 04:41:39 paul Exp $ */ #ifndef _SYS_DISK_H_ diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index c1ba135b48d20..5578097ff18fe 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.1 (Berkeley) 6/2/93 - * $Id: disklabel.h,v 1.16 1995/05/30 08:14:17 rgrimes Exp $ + * $Id: disklabel.h,v 1.16.4.1 1996/05/03 06:02:49 asami Exp $ */ #ifndef _SYS_DISKLABEL_H_ diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h index 6721e339d7670..c3843ed15614c 100644 --- a/sys/sys/diskslice.h +++ b/sys/sys/diskslice.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: diskslice.h,v 1.9 1995/05/08 16:27:10 bde Exp $ + * $Id: diskslice.h,v 1.10 1995/05/30 08:14:19 rgrimes Exp $ */ #ifndef _SYS_DISKSLICE_H_ diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h index eb75c61b0b229..6b560772b2dac 100644 --- a/sys/sys/dkbad.h +++ b/sys/sys/dkbad.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dkbad.h 8.1 (Berkeley) 6/2/93 - * $Id: dkbad.h,v 1.4 1994/12/11 23:20:50 bde Exp $ + * $Id: dkbad.h,v 1.5 1995/04/15 23:21:28 bde Exp $ */ #ifndef _SYS_DKBAD_H_ diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h index 82dbcbbf72f31..244ea80ef87de 100644 --- a/sys/sys/dkstat.h +++ b/sys/sys/dkstat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dkstat.h 8.2 (Berkeley) 1/21/94 - * $Id: dkstat.h,v 1.5 1994/10/16 05:03:05 wollman Exp $ + * $Id: dkstat.h,v 1.6 1994/12/24 10:11:18 bde Exp $ */ #ifndef _SYS_DKSTAT_H_ diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h index b9ca5a1e55c61..5a82bd30f318d 100644 --- a/sys/sys/dmap.h +++ b/sys/sys/dmap.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dmap.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * $Id: dmap.h,v 1.2 1994/08/02 07:52:52 davidg Exp $ */ #ifndef _SYS_DMAP_H_ diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 87021f67bd765..e3790b950fdec 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)domain.h 8.1 (Berkeley) 6/2/93 - * $Id: domain.h,v 1.4 1995/05/11 00:13:26 wollman Exp $ + * $Id: domain.h,v 1.5 1995/05/15 22:55:18 davidg Exp $ */ #ifndef _SYS_DOMAIN_H_ diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 3bac4ed751de2..c9c00c1000980 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)errno.h 8.5 (Berkeley) 1/21/94 - * $Id: errno.h,v 1.2 1994/08/02 07:52:54 davidg Exp $ + * $Id: errno.h,v 1.3 1994/08/21 04:41:42 paul Exp $ */ #ifndef _SYS_ERRNO_H_ diff --git a/sys/sys/exec.h b/sys/sys/exec.h index 920e0a18574cd..21433b3cbcd98 100644 --- a/sys/sys/exec.h +++ b/sys/sys/exec.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 1/21/94 - * $Id: exec.h,v 1.10 1995/03/16 18:16:15 bde Exp $ + * $Id: exec.h,v 1.10.4.1 1996/02/22 19:20:48 peter Exp $ */ #ifndef _SYS_EXEC_H_ diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index b38522f57f3ce..7e9972d2d6516 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -36,7 +36,7 @@ * * @(#)fbio.h 8.2 (Berkeley) 10/30/93 * - * $Id: fbio.h,v 1.2 1994/08/02 07:52:56 davidg Exp $ + * $Id: fbio.h,v 1.3 1994/08/21 04:41:44 paul Exp $ */ #ifndef _SYS_FBIO_H_ diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 33afa9a454d5b..69e799bfdad2e 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)fcntl.h 8.3 (Berkeley) 1/21/94 - * $Id$ + * $Id: fcntl.h,v 1.2 1994/08/02 07:52:57 davidg Exp $ */ #ifndef _SYS_FCNTL_H_ diff --git a/sys/sys/file.h b/sys/sys/file.h index 309a73258ef6b..d34d31076e8e4 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)file.h 8.1 (Berkeley) 6/2/93 - * $Id: file.h,v 1.4 1995/02/20 19:42:37 guido Exp $ + * $Id: file.h,v 1.5 1995/03/16 18:16:16 bde Exp $ */ #ifndef _SYS_FILE_H_ diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 4742a015394ac..68c5cc8f2b80c 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 - * $Id: filedesc.h,v 1.5 1995/03/16 18:16:16 bde Exp $ + * $Id: filedesc.h,v 1.6 1995/05/30 08:14:20 rgrimes Exp $ */ #ifndef _SYS_FILEDESC_H_ diff --git a/sys/sys/filio.h b/sys/sys/filio.h index b82a649c0feb1..d53f4e2d6a2f9 100644 --- a/sys/sys/filio.h +++ b/sys/sys/filio.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)filio.h 8.1 (Berkeley) 3/28/94 - * $Id$ + * $Id: filio.h,v 1.2 1994/08/02 07:53:01 davidg Exp $ */ #ifndef _SYS_FILIO_H_ diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h index bc60cf4f9c2b7..e53b6be6cc90c 100644 --- a/sys/sys/gmon.h +++ b/sys/sys/gmon.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)gmon.h 8.2 (Berkeley) 1/4/94 - * $Id: gmon.h,v 1.5 1995/05/14 03:00:04 davidg Exp $ + * $Id: gmon.h,v 1.6 1995/05/30 08:14:22 rgrimes Exp $ */ #ifndef _SYS_GMON_H_ diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 354efb2e130a1..7ccdba51be36a 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact.h,v 1.8 1994/10/02 17:24:45 phk Exp $ + * $Id: imgact.h,v 1.9 1995/05/30 08:14:24 rgrimes Exp $ */ #ifndef _SYS_IMGACT_H_ diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h index 361d37a497afd..b32a5e31a5ccd 100644 --- a/sys/sys/imgact_aout.h +++ b/sys/sys/imgact_aout.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $Id: imgact_aout.h,v 1.4 1995/07/26 17:25:48 davidg Exp $ + * $Id: imgact_aout.h,v 1.3.4.1 1995/09/12 09:24:47 davidg Exp $ */ #ifndef _IMGACT_AOUT_H_ diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h index a16ce4f1152db..e42f686c45e3c 100644 --- a/sys/sys/inflate.h +++ b/sys/sys/inflate.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: inflate.h,v 1.5 1995/04/15 06:54:04 phk Exp $ + * $Id: inflate.h,v 1.6 1995/05/30 08:14:27 rgrimes Exp $ * */ #ifndef _SYS_INFLATE_H_ diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h index 9958ac77d344a..ead880974a123 100644 --- a/sys/sys/ioccom.h +++ b/sys/sys/ioccom.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ioccom.h 8.2 (Berkeley) 3/28/94 - * $Id$ + * $Id: ioccom.h,v 1.2 1994/08/02 07:53:03 davidg Exp $ */ #ifndef _SYS_IOCCOM_H_ diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h index abe902f57825d..24c281f99bbc8 100644 --- a/sys/sys/ioctl.h +++ b/sys/sys/ioctl.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ioctl.h 8.6 (Berkeley) 3/28/94 - * $Id$ + * $Id: ioctl.h,v 1.2 1994/08/02 07:53:04 davidg Exp $ */ #ifndef _SYS_IOCTL_H_ diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h index ab067b97e42ba..c60dfbb8c8b26 100644 --- a/sys/sys/ioctl_compat.h +++ b/sys/sys/ioctl_compat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ioctl_compat.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * $Id: ioctl_compat.h,v 1.2 1994/08/02 07:53:05 davidg Exp $ */ #ifndef _SYS_IOCTL_COMPAT_H_ diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h index 69912c8c9b0e3..4d3cdfd3259c4 100644 --- a/sys/sys/ipc.h +++ b/sys/sys/ipc.h @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * @(#)ipc.h 8.3 (Berkeley) 1/21/94 - * $Id: ipc.h,v 1.5.4.5 1996/06/05 09:07:10 jkh Exp $ + * $Id: ipc.h,v 1.5.4.6 1996/06/05 19:49:29 nate Exp $ */ /* diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 7c032b2a03f0d..d6e9ebfb7b351 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $Id: kernel.h,v 1.8 1995/03/17 22:02:05 wollman Exp $ + * $Id: kernel.h,v 1.9 1995/03/20 19:20:26 wollman Exp $ */ #ifndef _SYS_KERNEL_H_ diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 15f14b5349854..597de066d0b4e 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ktrace.h 8.1 (Berkeley) 6/2/93 - * $Id: ktrace.h,v 1.6 1994/10/02 17:24:48 phk Exp $ + * $Id: ktrace.h,v 1.7 1995/03/16 18:16:19 bde Exp $ */ #ifndef _SYS_KTRACE_H_ diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 6264baa440f84..6925a333cb93a 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)libkern.h 8.1 (Berkeley) 6/10/93 - * $Id: libkern.h,v 1.6 1995/03/16 18:12:58 bde Exp $ + * $Id: libkern.h,v 1.7 1995/04/23 08:05:25 bde Exp $ */ #include <sys/types.h> diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h deleted file mode 100644 index c71a1fcbd539c..0000000000000 --- a/sys/sys/link_aout.h +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (c) 1993 Paul Kranenburg - * All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Paul Kranenburg. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - * - * $Id: link.h,v 1.4.4.1 1995/08/25 07:08:07 davidg Exp $ - */ - -/* - * RRS section definitions. - * - * The layout of some data structures defined in this header file is - * such that we can provide compatibility with the SunOS 4.x shared - * library scheme. - */ - -#ifndef _LINK_H_ -#define _LINK_H_ - -/* - * A `Shared Object Descriptor' descibes a shared object that is needed - * to complete the link edit process of the object containing it. - * A list of such objects (chained through `sod_next') is pointed at - * by `sdt_sods' in the section_dispatch_table structure. - */ - -struct sod { /* Shared Object Descriptor */ - long sod_name; /* name (relative to load address) */ - u_int sod_library : 1, /* Searched for by library rules */ - sod_reserved : 31; - short sod_major; /* major version number */ - short sod_minor; /* minor version number */ - long sod_next; /* next sod */ -}; - -/* - * `Shared Object Map's are used by the run-time link editor (ld.so) to - * keep track of all shared objects loaded into a process' address space. - * These structures are only used at run-time and do not occur within - * the text or data segment of an executable or shared library. - */ -struct so_map { /* Shared Object Map */ - caddr_t som_addr; /* Address at which object mapped */ - char *som_path; /* Path to mmap'ed file */ - struct so_map *som_next; /* Next map in chain */ - struct sod *som_sod; /* Sod responsible for this map */ - caddr_t som_sodbase; /* Base address of this sod */ - u_int som_write : 1; /* Text is currently writable */ - struct _dynamic *som_dynamic; /* _dynamic structure */ - caddr_t som_spd; /* Private data */ -}; - -/* - * Symbol description with size. This is simply an `nlist' with - * one field (nz_size) added. - * Used to convey size information on items in the data segment - * of shared objects. An array of these live in the shared object's - * text segment and is addressed by the `sdt_nzlist' field. - */ -struct nzlist { - struct nlist nlist; - u_long nz_size; -#define nz_un nlist.n_un -#define nz_strx nlist.n_un.n_strx -#define nz_name nlist.n_un.n_name -#define nz_type nlist.n_type -#define nz_value nlist.n_value -#define nz_desc nlist.n_desc -#define nz_other nlist.n_other -}; - -#define N_AUX(p) ((p)->n_other & 0xf) -#define N_BIND(p) (((unsigned int)(p)->n_other >> 4) & 0xf) -#define N_OTHER(r, v) (((unsigned int)(r) << 4) | ((v) & 0xf)) - -#define AUX_OBJECT 1 -#define AUX_FUNC 2 -/*#define BIND_LOCAL 0 not used */ -/*#define BIND_GLOBAL 1 not used */ -#define BIND_WEAK 2 - - -/* - * The `section_dispatch_table' structure contains offsets to various data - * structures needed to do run-time relocation. - */ -struct section_dispatch_table { - struct so_map *sdt_loaded; /* List of loaded objects */ - long sdt_sods; /* List of shared objects descriptors */ - long sdt_filler1; /* Unused (was: search rules) */ - long sdt_got; /* Global offset table */ - long sdt_plt; /* Procedure linkage table */ - long sdt_rel; /* Relocation table */ - long sdt_hash; /* Symbol hash table */ - long sdt_nzlist; /* Symbol table itself */ - long sdt_filler2; /* Unused (was: stab_hash) */ - long sdt_buckets; /* Number of hash buckets */ - long sdt_strings; /* Symbol strings */ - long sdt_str_sz; /* Size of symbol strings */ - long sdt_text_sz; /* Size of text area */ - long sdt_plt_sz; /* Size of procedure linkage table */ -}; - -/* - * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table. - * Used to quickly lookup symbols of the shared object by hashing - * on the symbol's name. `rh_symbolnum' is the index of the symbol - * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is - * the next symbol in the hash bucket (in case of collisions). - */ -struct rrs_hash { - int rh_symbolnum; /* Symbol number */ - int rh_next; /* Next hash entry */ -}; - -/* - * `rt_symbols' is used to keep track of run-time allocated commons - * and data items copied from shared objects. - */ -struct rt_symbol { - struct nzlist *rt_sp; /* The symbol */ - struct rt_symbol *rt_next; /* Next in linear list */ - struct rt_symbol *rt_link; /* Next in bucket */ - caddr_t rt_srcaddr; /* Address of "master" copy */ - struct so_map *rt_smp; /* Originating map */ -}; - -/* - * Debugger interface structure. - */ -struct so_debug { - int dd_version; /* Version # of interface */ - int dd_in_debugger; /* Set when run by debugger */ - int dd_sym_loaded; /* Run-time linking brought more - symbols into scope */ - char *dd_bpt_addr; /* Address of rtld-generated bpt */ - int dd_bpt_shadow; /* Original contents of bpt */ - struct rt_symbol *dd_cc; /* Allocated commons/copied data */ -}; - -/* - * Version returned to crt0 from ld.so - */ -#define LDSO_VERSION_NONE 0 /* FreeBSD2.0, 2.0.5 */ -#define LDSO_VERSION_HAS_DLEXIT 1 /* includes dlexit in ld_entry */ - -/* - * Entry points into ld.so - user interface to the run-time linker. - * Entries are valid for the given version numbers returned by ld.so - * to crt0. - */ -struct ld_entry { - void *(*dlopen) __P((char *, int)); /* NONE */ - int (*dlclose) __P((void *)); /* NONE */ - void *(*dlsym) __P((void *, char *)); /* NONE */ - char *(*dlerror) __P((void)); /* NONE */ - void (*dlexit) __P((void)); /* HAS_DLEXIT */ -}; - -/* - * dl*() prototypes. - */ -extern void *dlopen __P((char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, char *)); -extern char *dlerror __P((void)); - - -/* - * This is the structure pointed at by the __DYNAMIC symbol if an - * executable requires the attention of the run-time link editor. - * __DYNAMIC is given the value zero if no run-time linking needs to - * be done (it is always present in shared objects). - * The union `d_un' provides for different versions of the dynamic - * linking mechanism (switched on by `d_version'). The last version - * used by Sun is 3. We leave some room here and go to version number - * 8 for NetBSD, the main difference lying in the support for the - * `nz_list' type of symbols. - */ - -struct _dynamic { - int d_version; /* version # of this interface */ - struct so_debug *d_debug; - union { - struct section_dispatch_table *d_sdt; - } d_un; - struct ld_entry *d_entry; /* XXX */ -}; - -#define LD_VERSION_SUN (3) -#define LD_VERSION_BSD (8) -#define LD_VERSION_NZLIST_P(v) ((v) >= 8) - -#define LD_GOT(x) ((x)->d_un.d_sdt->sdt_got) -#define LD_PLT(x) ((x)->d_un.d_sdt->sdt_plt) -#define LD_REL(x) ((x)->d_un.d_sdt->sdt_rel) -#define LD_SYMBOL(x) ((x)->d_un.d_sdt->sdt_nzlist) -#define LD_HASH(x) ((x)->d_un.d_sdt->sdt_hash) -#define LD_STRINGS(x) ((x)->d_un.d_sdt->sdt_strings) -#define LD_NEED(x) ((x)->d_un.d_sdt->sdt_sods) -#define LD_BUCKETS(x) ((x)->d_un.d_sdt->sdt_buckets) - -#define LD_GOTSZ(x) ((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got) -#define LD_RELSZ(x) ((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel) -#define LD_HASHSZ(x) ((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash) -#define LD_STABSZ(x) ((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist) -#define LD_PLTSZ(x) ((x)->d_un.d_sdt->sdt_plt_sz) -#define LD_STRSZ(x) ((x)->d_un.d_sdt->sdt_str_sz) -#define LD_TEXTSZ(x) ((x)->d_un.d_sdt->sdt_text_sz) - -/* - * Interface to ld.so - */ -struct crt_ldso { - int crt_ba; /* Base address of ld.so */ - int crt_dzfd; /* "/dev/zero" file decriptor (SunOS) */ - int crt_ldfd; /* ld.so file descriptor */ - struct _dynamic *crt_dp; /* Main's __DYNAMIC */ - char **crt_ep; /* environment strings */ - caddr_t crt_bp; /* Breakpoint if run from debugger */ - char *crt_prog; /* Program name (v3) */ - char *crt_ldso; /* Link editor name (v4) */ - struct ld_entry *crt_ldentry; /* dl*() access (v4) */ -}; - -/* - * Version passed from crt0 to ld.so (1st argument to _rtld()). - */ -#define CRT_VERSION_SUN 1 -#define CRT_VERSION_BSD_2 2 -#define CRT_VERSION_BSD_3 3 -#define CRT_VERSION_BSD_4 4 - -/* - * Maximum number of recognized shared object version numbers. - */ -#define MAXDEWEY 8 - -/* - * Header of the hints file. - */ -struct hints_header { - long hh_magic; -#define HH_MAGIC 011421044151 - long hh_version; /* Interface version number */ -#define LD_HINTS_VERSION_1 1 - long hh_hashtab; /* Location of hash table */ - long hh_nbucket; /* Number of buckets in hashtab */ - long hh_strtab; /* Location of strings */ - long hh_strtab_sz; /* Size of strings */ - long hh_ehints; /* End of hints (max offset in file) */ -}; - -#define HH_BADMAG(hdr) ((hdr).hh_magic != HH_MAGIC) - -/* - * Hash table element in hints file. - */ -struct hints_bucket { - /* namex and pathx are indices into the string table */ - int hi_namex; /* Library name */ - int hi_pathx; /* Full path */ - int hi_dewey[MAXDEWEY]; /* The versions */ - int hi_ndewey; /* Number of version numbers */ -#define hi_major hi_dewey[0] -#define hi_minor hi_dewey[1] - int hi_next; /* Next in this bucket */ -}; - -#define _PATH_LD_HINTS "/var/run/ld.so.hints" - -#endif /* _LINK_H_ */ - diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h deleted file mode 100644 index c71a1fcbd539c..0000000000000 --- a/sys/sys/link_elf.h +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (c) 1993 Paul Kranenburg - * All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Paul Kranenburg. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - * - * $Id: link.h,v 1.4.4.1 1995/08/25 07:08:07 davidg Exp $ - */ - -/* - * RRS section definitions. - * - * The layout of some data structures defined in this header file is - * such that we can provide compatibility with the SunOS 4.x shared - * library scheme. - */ - -#ifndef _LINK_H_ -#define _LINK_H_ - -/* - * A `Shared Object Descriptor' descibes a shared object that is needed - * to complete the link edit process of the object containing it. - * A list of such objects (chained through `sod_next') is pointed at - * by `sdt_sods' in the section_dispatch_table structure. - */ - -struct sod { /* Shared Object Descriptor */ - long sod_name; /* name (relative to load address) */ - u_int sod_library : 1, /* Searched for by library rules */ - sod_reserved : 31; - short sod_major; /* major version number */ - short sod_minor; /* minor version number */ - long sod_next; /* next sod */ -}; - -/* - * `Shared Object Map's are used by the run-time link editor (ld.so) to - * keep track of all shared objects loaded into a process' address space. - * These structures are only used at run-time and do not occur within - * the text or data segment of an executable or shared library. - */ -struct so_map { /* Shared Object Map */ - caddr_t som_addr; /* Address at which object mapped */ - char *som_path; /* Path to mmap'ed file */ - struct so_map *som_next; /* Next map in chain */ - struct sod *som_sod; /* Sod responsible for this map */ - caddr_t som_sodbase; /* Base address of this sod */ - u_int som_write : 1; /* Text is currently writable */ - struct _dynamic *som_dynamic; /* _dynamic structure */ - caddr_t som_spd; /* Private data */ -}; - -/* - * Symbol description with size. This is simply an `nlist' with - * one field (nz_size) added. - * Used to convey size information on items in the data segment - * of shared objects. An array of these live in the shared object's - * text segment and is addressed by the `sdt_nzlist' field. - */ -struct nzlist { - struct nlist nlist; - u_long nz_size; -#define nz_un nlist.n_un -#define nz_strx nlist.n_un.n_strx -#define nz_name nlist.n_un.n_name -#define nz_type nlist.n_type -#define nz_value nlist.n_value -#define nz_desc nlist.n_desc -#define nz_other nlist.n_other -}; - -#define N_AUX(p) ((p)->n_other & 0xf) -#define N_BIND(p) (((unsigned int)(p)->n_other >> 4) & 0xf) -#define N_OTHER(r, v) (((unsigned int)(r) << 4) | ((v) & 0xf)) - -#define AUX_OBJECT 1 -#define AUX_FUNC 2 -/*#define BIND_LOCAL 0 not used */ -/*#define BIND_GLOBAL 1 not used */ -#define BIND_WEAK 2 - - -/* - * The `section_dispatch_table' structure contains offsets to various data - * structures needed to do run-time relocation. - */ -struct section_dispatch_table { - struct so_map *sdt_loaded; /* List of loaded objects */ - long sdt_sods; /* List of shared objects descriptors */ - long sdt_filler1; /* Unused (was: search rules) */ - long sdt_got; /* Global offset table */ - long sdt_plt; /* Procedure linkage table */ - long sdt_rel; /* Relocation table */ - long sdt_hash; /* Symbol hash table */ - long sdt_nzlist; /* Symbol table itself */ - long sdt_filler2; /* Unused (was: stab_hash) */ - long sdt_buckets; /* Number of hash buckets */ - long sdt_strings; /* Symbol strings */ - long sdt_str_sz; /* Size of symbol strings */ - long sdt_text_sz; /* Size of text area */ - long sdt_plt_sz; /* Size of procedure linkage table */ -}; - -/* - * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table. - * Used to quickly lookup symbols of the shared object by hashing - * on the symbol's name. `rh_symbolnum' is the index of the symbol - * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is - * the next symbol in the hash bucket (in case of collisions). - */ -struct rrs_hash { - int rh_symbolnum; /* Symbol number */ - int rh_next; /* Next hash entry */ -}; - -/* - * `rt_symbols' is used to keep track of run-time allocated commons - * and data items copied from shared objects. - */ -struct rt_symbol { - struct nzlist *rt_sp; /* The symbol */ - struct rt_symbol *rt_next; /* Next in linear list */ - struct rt_symbol *rt_link; /* Next in bucket */ - caddr_t rt_srcaddr; /* Address of "master" copy */ - struct so_map *rt_smp; /* Originating map */ -}; - -/* - * Debugger interface structure. - */ -struct so_debug { - int dd_version; /* Version # of interface */ - int dd_in_debugger; /* Set when run by debugger */ - int dd_sym_loaded; /* Run-time linking brought more - symbols into scope */ - char *dd_bpt_addr; /* Address of rtld-generated bpt */ - int dd_bpt_shadow; /* Original contents of bpt */ - struct rt_symbol *dd_cc; /* Allocated commons/copied data */ -}; - -/* - * Version returned to crt0 from ld.so - */ -#define LDSO_VERSION_NONE 0 /* FreeBSD2.0, 2.0.5 */ -#define LDSO_VERSION_HAS_DLEXIT 1 /* includes dlexit in ld_entry */ - -/* - * Entry points into ld.so - user interface to the run-time linker. - * Entries are valid for the given version numbers returned by ld.so - * to crt0. - */ -struct ld_entry { - void *(*dlopen) __P((char *, int)); /* NONE */ - int (*dlclose) __P((void *)); /* NONE */ - void *(*dlsym) __P((void *, char *)); /* NONE */ - char *(*dlerror) __P((void)); /* NONE */ - void (*dlexit) __P((void)); /* HAS_DLEXIT */ -}; - -/* - * dl*() prototypes. - */ -extern void *dlopen __P((char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, char *)); -extern char *dlerror __P((void)); - - -/* - * This is the structure pointed at by the __DYNAMIC symbol if an - * executable requires the attention of the run-time link editor. - * __DYNAMIC is given the value zero if no run-time linking needs to - * be done (it is always present in shared objects). - * The union `d_un' provides for different versions of the dynamic - * linking mechanism (switched on by `d_version'). The last version - * used by Sun is 3. We leave some room here and go to version number - * 8 for NetBSD, the main difference lying in the support for the - * `nz_list' type of symbols. - */ - -struct _dynamic { - int d_version; /* version # of this interface */ - struct so_debug *d_debug; - union { - struct section_dispatch_table *d_sdt; - } d_un; - struct ld_entry *d_entry; /* XXX */ -}; - -#define LD_VERSION_SUN (3) -#define LD_VERSION_BSD (8) -#define LD_VERSION_NZLIST_P(v) ((v) >= 8) - -#define LD_GOT(x) ((x)->d_un.d_sdt->sdt_got) -#define LD_PLT(x) ((x)->d_un.d_sdt->sdt_plt) -#define LD_REL(x) ((x)->d_un.d_sdt->sdt_rel) -#define LD_SYMBOL(x) ((x)->d_un.d_sdt->sdt_nzlist) -#define LD_HASH(x) ((x)->d_un.d_sdt->sdt_hash) -#define LD_STRINGS(x) ((x)->d_un.d_sdt->sdt_strings) -#define LD_NEED(x) ((x)->d_un.d_sdt->sdt_sods) -#define LD_BUCKETS(x) ((x)->d_un.d_sdt->sdt_buckets) - -#define LD_GOTSZ(x) ((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got) -#define LD_RELSZ(x) ((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel) -#define LD_HASHSZ(x) ((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash) -#define LD_STABSZ(x) ((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist) -#define LD_PLTSZ(x) ((x)->d_un.d_sdt->sdt_plt_sz) -#define LD_STRSZ(x) ((x)->d_un.d_sdt->sdt_str_sz) -#define LD_TEXTSZ(x) ((x)->d_un.d_sdt->sdt_text_sz) - -/* - * Interface to ld.so - */ -struct crt_ldso { - int crt_ba; /* Base address of ld.so */ - int crt_dzfd; /* "/dev/zero" file decriptor (SunOS) */ - int crt_ldfd; /* ld.so file descriptor */ - struct _dynamic *crt_dp; /* Main's __DYNAMIC */ - char **crt_ep; /* environment strings */ - caddr_t crt_bp; /* Breakpoint if run from debugger */ - char *crt_prog; /* Program name (v3) */ - char *crt_ldso; /* Link editor name (v4) */ - struct ld_entry *crt_ldentry; /* dl*() access (v4) */ -}; - -/* - * Version passed from crt0 to ld.so (1st argument to _rtld()). - */ -#define CRT_VERSION_SUN 1 -#define CRT_VERSION_BSD_2 2 -#define CRT_VERSION_BSD_3 3 -#define CRT_VERSION_BSD_4 4 - -/* - * Maximum number of recognized shared object version numbers. - */ -#define MAXDEWEY 8 - -/* - * Header of the hints file. - */ -struct hints_header { - long hh_magic; -#define HH_MAGIC 011421044151 - long hh_version; /* Interface version number */ -#define LD_HINTS_VERSION_1 1 - long hh_hashtab; /* Location of hash table */ - long hh_nbucket; /* Number of buckets in hashtab */ - long hh_strtab; /* Location of strings */ - long hh_strtab_sz; /* Size of strings */ - long hh_ehints; /* End of hints (max offset in file) */ -}; - -#define HH_BADMAG(hdr) ((hdr).hh_magic != HH_MAGIC) - -/* - * Hash table element in hints file. - */ -struct hints_bucket { - /* namex and pathx are indices into the string table */ - int hi_namex; /* Library name */ - int hi_pathx; /* Full path */ - int hi_dewey[MAXDEWEY]; /* The versions */ - int hi_ndewey; /* Number of version numbers */ -#define hi_major hi_dewey[0] -#define hi_minor hi_dewey[1] - int hi_next; /* Next in this bucket */ -}; - -#define _PATH_LD_HINTS "/var/run/ld.so.hints" - -#endif /* _LINK_H_ */ - diff --git a/sys/sys/lkm.h b/sys/sys/lkm.h index 486ddbe43de09..bd09af99ff08d 100644 --- a/sys/sys/lkm.h +++ b/sys/sys/lkm.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lkm.h,v 1.5 1995/04/20 05:08:51 wpaul Exp $ + * $Id: lkm.h,v 1.5.4.1 1995/08/05 07:42:51 davidg Exp $ */ #ifndef _SYS_LKM_H_ diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h index 09b2b68af90df..bbbaf2a84968f 100644 --- a/sys/sys/lockf.h +++ b/sys/sys/lockf.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)lockf.h 8.1 (Berkeley) 6/11/93 - * $Id: lockf.h,v 1.1 1994/08/08 17:30:58 davidg Exp $ + * $Id: lockf.h,v 1.2 1994/08/21 04:41:50 paul Exp $ */ #ifndef _SYS_LOCKF_H_ diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index e7c96f262e0b0..de20bef594e89 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.3 (Berkeley) 1/12/94 - * $Id: malloc.h,v 1.7 1995/03/12 13:25:01 ugen Exp $ + * $Id: malloc.h,v 1.8 1995/04/20 03:18:15 julian Exp $ */ #ifndef _SYS_MALLOC_H_ diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 3f888a6261355..7a6ffa50a2060 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.3 (Berkeley) 1/21/94 - * $Id: mbuf.h,v 1.8 1994/11/04 00:28:38 davidg Exp $ + * $Id: mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp $ */ #ifndef _SYS_MBUF_H_ diff --git a/sys/sys/mman.h b/sys/sys/mman.h index a3d4c47a97a10..b02c28d0538d9 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mman.h 8.1 (Berkeley) 6/2/93 - * $Id: mman.h,v 1.6 1995/03/25 17:28:30 davidg Exp $ + * $Id: mman.h,v 1.7 1995/05/14 19:19:07 nate Exp $ */ #ifndef _SYS_MMAN_H_ diff --git a/sys/sys/mount.h b/sys/sys/mount.h index f8de10ee4384b..67a66c7dcbdbd 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.13 (Berkeley) 3/27/94 - * $Id: mount.h,v 1.19 1995/05/30 08:14:28 rgrimes Exp $ + * $Id: mount.h,v 1.19.4.1 1996/03/21 20:30:14 phk Exp $ */ #ifndef _SYS_MOUNT_H_ diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 48e7c5bd21eef..035bb655f70b7 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -1,4 +1,4 @@ -/* $Id: msg.h,v 1.2 1994/09/17 13:24:27 davidg Exp $ */ +/* $Id: msg.h,v 1.3 1995/03/28 07:57:34 bde Exp $ */ /* $NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $ */ /* diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h index d4823ea6685de..43eb79a6ed0a7 100644 --- a/sys/sys/msgbuf.h +++ b/sys/sys/msgbuf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)msgbuf.h 8.1 (Berkeley) 6/2/93 - * $Id: msgbuf.h,v 1.5 1995/03/16 18:16:21 bde Exp $ + * $Id: msgbuf.h,v 1.5.4.1 1995/08/11 04:04:20 davidg Exp $ */ #ifndef _SYS_MSGBUF_H_ diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h index cfd1e337e7ffd..ca1faaf1c3bdc 100644 --- a/sys/sys/mtio.h +++ b/sys/sys/mtio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mtio.h 8.1 (Berkeley) 6/2/93 - * $Id: mtio.h,v 1.6 1996/01/08 12:26:15 joerg Exp $ + * $Id: mtio.h,v 1.5.4.1 1996/06/25 17:46:01 joerg Exp $ */ #ifndef _SYS_MTIO_H_ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 421e3f284599b..d21476b9fb1bf 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)namei.h 8.2 (Berkeley) 1/4/94 - * $Id: namei.h,v 1.5 1995/03/09 20:27:21 phk Exp $ + * $Id: namei.h,v 1.5.4.1 1995/08/25 01:49:15 davidg Exp $ */ #ifndef _SYS_NAMEI_H_ diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h deleted file mode 100644 index b80c0b21f7173..0000000000000 --- a/sys/sys/nlist_aout.h +++ /dev/null @@ -1,90 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#)nlist.h 8.2 (Berkeley) 1/21/94 - * - * $Id$ - */ - -#ifndef _NLIST_H_ -#define _NLIST_H_ - -/* - * Symbol table entry format. The #ifdef's are so that programs including - * nlist.h can initialize nlist structures statically. - */ -struct nlist { -#ifdef _AOUT_INCLUDE_ - union { - char *n_name; /* symbol name (in memory) */ - long n_strx; /* file string table offset (on disk) */ - } n_un; -#else - char *n_name; /* symbol name (in memory) */ -#endif - -#define N_UNDF 0x00 /* undefined */ -#define N_ABS 0x02 /* absolute address */ -#define N_TEXT 0x04 /* text segment */ -#define N_DATA 0x06 /* data segment */ -#define N_BSS 0x08 /* bss segment */ -#define N_INDR 0x0a /* alias definition */ -#define N_SIZE 0x0c /* pseudo type, defines a symbol's size */ -#define N_COMM 0x12 /* common reference */ -#define N_FN 0x1e /* file name (N_EXT on) */ -#define N_WARN 0x1e /* warning message (N_EXT off) */ - -#define N_EXT 0x01 /* external (global) bit, OR'ed in */ -#define N_TYPE 0x1e /* mask for all the type bits */ - unsigned char n_type; /* type defines */ - - char n_other; /* spare */ -#define n_hash n_desc /* used internally by ld(1); XXX */ - short n_desc; /* used by stab entries */ - unsigned long n_value; /* address/value of the symbol */ -}; - -#define N_FORMAT "%08x" /* namelist value format; XXX */ -#define N_STAB 0x0e0 /* mask for debugger symbols -- stab(5) */ - -#include <sys/cdefs.h> - -__BEGIN_DECLS -int nlist __P((const char *, struct nlist *)); -__END_DECLS - -#endif /* !_NLIST_H_ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index 09cb1ce9ccd95..c2d9f59ea46e6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.2 (Berkeley) 1/21/94 - * $Id: param.h,v 1.7 1995/02/07 03:33:05 davidg Exp $ + * $Id: param.h,v 1.8 1995/05/14 03:00:05 davidg Exp $ */ #ifndef _SYS_PARAM_H_ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index ca485cc5c4562..dcb7c1cc7b94a 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.8 (Berkeley) 1/21/94 - * $Id: proc.h,v 1.17 1995/03/16 18:16:22 bde Exp $ + * $Id: proc.h,v 1.17.4.1 1996/06/04 02:45:01 davidg Exp $ */ #ifndef _SYS_PROC_H_ diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index f01f91013c99c..00bd154e473ab 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $Id: protosw.h,v 1.5 1994/10/08 22:22:57 phk Exp $ + * $Id: protosw.h,v 1.6 1995/02/07 02:01:57 wollman Exp $ */ #ifndef _SYS_PROTOSW_H_ diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 9c6c15945a9b2..e308870ec4e0c 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.2 (Berkeley) 1/4/94 - * $Id: ptrace.h,v 1.3 1994/08/08 13:00:27 davidg Exp $ + * $Id: ptrace.h,v 1.4 1995/03/16 18:16:23 bde Exp $ */ #ifndef _SYS_PTRACE_H_ diff --git a/sys/sys/queue.h b/sys/sys/queue.h index b42dbced5f9a7..d91fd9d665141 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $Id: queue.h,v 1.8 1996/03/31 03:21:45 gibbs Exp $ + * $Id: queue.h,v 1.3.4.1 1996/04/01 00:27:36 gibbs Exp $ */ #ifndef _SYS_QUEUE_H_ diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index 29f2ce0ef84d6..8187bcf916a19 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reboot.h 8.1 (Berkeley) 6/2/93 - * $Id: reboot.h,v 1.9 1995/01/25 20:05:03 bde Exp $ + * $Id: reboot.h,v 1.10 1995/04/20 06:06:42 phk Exp $ */ #ifndef _SYS_REBOOT_H_ diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 432667ac58c10..49de69045d6af 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)resource.h 8.2 (Berkeley) 1/4/94 - * $Id: resource.h,v 1.2 1994/08/02 07:53:28 davidg Exp $ + * $Id: resource.h,v 1.3 1995/01/21 14:58:25 bde Exp $ */ #ifndef _SYS_RESOURCE_H_ diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h index f03d3085dee5a..c06d40d1aa27c 100644 --- a/sys/sys/resourcevar.h +++ b/sys/sys/resourcevar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)resourcevar.h 8.3 (Berkeley) 2/22/94 - * $Id: resourcevar.h,v 1.5 1994/10/10 00:58:33 phk Exp $ + * $Id: resourcevar.h,v 1.6 1994/11/14 14:09:38 bde Exp $ */ #ifndef _SYS_RESOURCEVAR_H_ diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h index 4c85b717b592e..86cb3c6b37cdb 100644 --- a/sys/sys/rlist.h +++ b/sys/sys/rlist.h @@ -16,7 +16,7 @@ * rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap * * from: unknown? - * $Id: rlist.h,v 1.6 1993/11/25 01:38:01 wollman Exp $ + * $Id: rlist.h,v 1.7 1994/10/09 07:35:10 davidg Exp $ */ #ifndef _SYS_RLIST_H_ diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h index 9a22a34806b75..217c624124323 100644 --- a/sys/sys/rtprio.h +++ b/sys/sys/rtprio.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rtprio.h,v 1.1 1994/09/01 05:12:53 davidg Exp $ + * $Id: rtprio.h,v 1.2 1994/10/02 04:45:59 davidg Exp $ */ #ifndef _SYS_RTPRIO_H_ diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h index de461663a5167..75c86a13e052d 100644 --- a/sys/sys/scsiio.h +++ b/sys/sys/scsiio.h @@ -1,5 +1,5 @@ /* - * $Id: scsiio.h,v 1.3 1995/01/08 13:39:46 dufault Exp $ + * $Id: scsiio.h,v 1.4 1995/04/28 19:26:02 dufault Exp $ */ #ifndef _SYS_SCSIIO_H_ #define _SYS_SCSIIO_H_ diff --git a/sys/sys/select.h b/sys/sys/select.h index e69971e3b6845..138eb17fa44c8 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)select.h 8.2 (Berkeley) 1/4/94 - * $Id$ + * $Id: select.h,v 1.2 1994/08/02 07:53:31 davidg Exp $ */ #ifndef _SYS_SELECT_H_ diff --git a/sys/sys/sem.h b/sys/sys/sem.h index f529d5a745a16..ce39ccf57ec25 100644 --- a/sys/sys/sem.h +++ b/sys/sys/sem.h @@ -1,4 +1,4 @@ -/* $Id: sem.h,v 1.3.4.1 1995/12/23 17:09:48 joerg Exp $ */ +/* $Id: sem.h,v 1.3.4.2 1996/06/14 02:26:17 davidg Exp $ */ /* $NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $ */ /* diff --git a/sys/sys/shm.h b/sys/sys/shm.h index 329a18fc0aaa1..ccb7a73d0460a 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -1,4 +1,4 @@ -/* $Id: shm.h,v 1.4 1995/07/08 16:36:30 joerg Exp $ */ +/* $Id: shm.h,v 1.3.8.1 1995/12/23 17:09:49 joerg Exp $ */ /* $NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $ */ /* diff --git a/sys/sys/signal.h b/sys/sys/signal.h index c26054b094a97..fd18532ffea34 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.2 (Berkeley) 1/21/94 - * $Id: signal.h,v 1.2 1994/08/02 07:53:32 davidg Exp $ + * $Id: signal.h,v 1.3 1995/01/29 01:19:25 ats Exp $ */ #ifndef _SYS_SIGNAL_H_ diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index f08f895a347e6..50a3589b99c26 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.3 (Berkeley) 1/4/94 - * $Id: signalvar.h,v 1.5 1995/03/16 18:16:24 bde Exp $ + * $Id: signalvar.h,v 1.5.4.1 1996/01/31 13:12:36 davidg Exp $ */ #ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */ diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 16564aa003a8d..966b18651c212 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $Id: socket.h,v 1.6.4.1 1995/09/15 10:13:05 davidg Exp $ + * $Id: socket.h,v 1.6.4.2 1996/01/29 12:33:09 davidg Exp $ */ #ifndef _SYS_SOCKET_H_ diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 9ac9dfaa03e8b..852dfaceb06e3 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.1 (Berkeley) 6/2/93 - * $Id: socketvar.h,v 1.5 1994/10/02 17:24:57 phk Exp $ + * $Id: socketvar.h,v 1.6 1995/05/30 08:14:33 rgrimes Exp $ */ #ifndef _SYS_SOCKETVAR_H_ diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 41fc86b15aac5..8f5478e240c7f 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sockio.h 8.1 (Berkeley) 3/28/94 - * $Id: sockio.h,v 1.4 1994/09/06 22:42:31 wollman Exp $ + * $Id: sockio.h,v 1.5 1994/12/21 22:57:05 wollman Exp $ */ #ifndef _SYS_SOCKIO_H_ diff --git a/sys/sys/stat.h b/sys/sys/stat.h index 99ae6b9792dc1..b9e0903db0ae7 100644 --- a/sys/sys/stat.h +++ b/sys/sys/stat.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)stat.h 8.6 (Berkeley) 3/8/94 - * $Id: stat.h,v 1.5 1994/10/02 17:24:57 phk Exp $ + * $Id: stat.h,v 1.6 1995/05/30 08:14:35 rgrimes Exp $ */ #ifndef _SYS_STAT_H_ diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h index caf91ce679c8d..387a8e0cb6497 100644 --- a/sys/sys/syscall-hide.h +++ b/sys/sys/syscall-hide.h @@ -2,7 +2,7 @@ * System call hiders. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.15.4.1 1996/03/21 20:25:56 phk Exp $ + * created from $Id: syscall-hide.h,v 1.13.4.1 1996/03/21 20:30:15 phk Exp $ */ HIDE_POSIX(fork) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index c4140645cbbc3..ac8a87f853f2f 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from $Id: syscalls.master,v 1.15.4.1 1996/03/21 20:25:56 phk Exp $ + * created from $Id: syscall.h,v 1.19.4.1 1996/03/21 20:30:15 phk Exp $ */ #define SYS_syscall 0 diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 8ecd37a02dde3..30efcd313d100 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $Id: sysctl.h,v 1.23.4.4 1996/06/05 19:49:29 nate Exp $ + * $Id: sysctl.h,v 1.23.4.5 1996/09/19 08:19:00 pst Exp $ */ #ifndef _SYS_SYSCTL_H_ diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index f2953a6fc1f33..bf70f79d28302 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sysent.h,v 1.3 1995/02/14 19:23:20 sos Exp $ + * $Id: sysent.h,v 1.4 1995/03/16 18:16:29 bde Exp $ */ #ifndef _SYS_SYSENT_H_ diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h index 2dc7a5bc34511..f5bfec3c1cbc7 100644 --- a/sys/sys/syslimits.h +++ b/sys/sys/syslimits.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)syslimits.h 8.1 (Berkeley) 6/2/93 - * $Id: syslimits.h,v 1.5 1994/08/21 04:41:59 paul Exp $ + * $Id: syslimits.h,v 1.6 1994/12/03 17:36:37 smace Exp $ */ #ifndef _SYS_SYSLIMITS_H_ diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h index 969717b6dd317..8d684ae2bbdf1 100644 --- a/sys/sys/syslog.h +++ b/sys/sys/syslog.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)syslog.h 8.1 (Berkeley) 6/2/93 - * $Id: syslog.h,v 1.3 1994/08/18 22:35:46 wollman Exp $ + * $Id: syslog.h,v 1.4 1994/08/21 04:42:00 paul Exp $ */ #ifndef _SYS_SYSLOG_H_ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index d54968a3840b8..998378772e1f4 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.4 (Berkeley) 2/23/94 - * $Id: systm.h,v 1.23 1995/07/05 12:04:51 davidg Exp $ + * $Id: systm.h,v 1.22.4.1 1995/09/15 10:18:05 davidg Exp $ */ #ifndef _SYS_SYSTM_H_ diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h index f9aefc0cac975..7bfb0a8b27af0 100644 --- a/sys/sys/tablet.h +++ b/sys/sys/tablet.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tablet.h 8.3 (Berkeley) 1/4/94 - * $Id$ + * $Id: tablet.h,v 1.2 1994/08/02 07:53:45 davidg Exp $ */ #ifndef _SYS_TABLET_H_ diff --git a/sys/sys/termios.h b/sys/sys/termios.h index 14b264850604b..14280943ae818 100644 --- a/sys/sys/termios.h +++ b/sys/sys/termios.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)termios.h 8.3 (Berkeley) 3/28/94 - * $Id: termios.h,v 1.5 1995/05/11 07:52:47 bde Exp $ + * $Id: termios.h,v 1.6 1995/05/30 08:14:40 rgrimes Exp $ */ #ifndef _SYS_TERMIOS_H_ diff --git a/sys/sys/time.h b/sys/sys/time.h index fa7aecc935b86..59fa7c705c77a 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.1 (Berkeley) 6/2/93 - * $Id: time.h,v 1.4 1994/10/02 17:25:01 phk Exp $ + * $Id: time.h,v 1.5 1994/10/10 00:58:36 phk Exp $ */ #ifndef _SYS_TIME_H_ diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 8759a7ca4f8dc..223ae15e58fad 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)timeb.h 8.2 (Berkeley) 1/21/94 - * $Id: timeb.h,v 1.2 1994/08/02 07:53:49 davidg Exp $ + * $Id: timeb.h,v 1.3 1994/08/21 04:42:02 paul Exp $ */ #ifndef _SYS_TIMEB_H_ diff --git a/sys/sys/times.h b/sys/sys/times.h index 961ebfd182644..63cf0108e8d07 100644 --- a/sys/sys/times.h +++ b/sys/sys/times.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)times.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * $Id: times.h,v 1.2 1994/08/02 07:53:50 davidg Exp $ */ #ifndef _SYS_TIMES_H_ diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h index 5ef2934ced7b6..81bb41c435f33 100644 --- a/sys/sys/tprintf.h +++ b/sys/sys/tprintf.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tprintf.h 8.1 (Berkeley) 6/2/93 - * $Id: tprintf.h,v 1.2 1994/08/02 07:53:51 davidg Exp $ + * $Id: tprintf.h,v 1.3 1994/08/21 04:42:03 paul Exp $ */ #ifndef _SYS_TPRINTF_H_ diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 069f90bb25b51..a683ec0e17b6d 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.h 8.6 (Berkeley) 1/21/94 - * $Id: tty.h,v 1.31 1995/07/31 22:50:08 bde Exp $ + * $Id: tty.h,v 1.18.4.1 1995/09/14 07:10:24 davidg Exp $ */ #ifndef _SYS_TTY_H_ diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h index 7146f600c714b..2a347ab75867d 100644 --- a/sys/sys/ttychars.h +++ b/sys/sys/ttychars.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ttychars.h 8.2 (Berkeley) 1/4/94 - * $Id: ttychars.h,v 1.3 1994/08/21 04:42:06 paul Exp $ + * $Id: ttychars.h,v 1.4 1994/08/22 19:34:03 csgr Exp $ */ #ifndef _SYS_TTYCHARS_H_ diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h index 75c8619f3c088..0dfb7f7139204 100644 --- a/sys/sys/ttycom.h +++ b/sys/sys/ttycom.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ttycom.h 8.1 (Berkeley) 3/28/94 - * $Id: ttycom.h,v 1.8 1995/03/30 05:17:50 ache Exp $ + * $Id: ttycom.h,v 1.9 1995/05/30 08:14:42 rgrimes Exp $ */ #ifndef _SYS_TTYCOM_H_ diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h index 43216c7f58ad4..703190ba8373a 100644 --- a/sys/sys/ttydefaults.h +++ b/sys/sys/ttydefaults.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ttydefaults.h 8.4 (Berkeley) 1/21/94 - * $Id: ttydefaults.h,v 1.8 1995/05/11 07:52:48 bde Exp $ + * $Id: ttydefaults.h,v 1.9 1995/05/30 08:14:47 rgrimes Exp $ */ /* diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h index 5f41b471d6c2d..8c07fe11fcc01 100644 --- a/sys/sys/ttydev.h +++ b/sys/sys/ttydev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ttydev.h 8.2 (Berkeley) 1/4/94 - * $Id: ttydev.h,v 1.2 1994/08/02 07:53:58 davidg Exp $ + * $Id: ttydev.h,v 1.3 1994/08/26 12:07:31 jkh Exp $ */ /* COMPATABILITY HEADER FILE */ diff --git a/sys/sys/types.h b/sys/sys/types.h index 81e8f452b5169..99d4115f2f834 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.4 (Berkeley) 1/21/94 - * $Id: types.h,v 1.4 1994/09/25 15:56:25 davidg Exp $ + * $Id: types.h,v 1.4.8.3 1996/06/05 02:56:23 jkh Exp $ */ #ifndef _SYS_TYPES_H_ diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 33d64c036d529..5c4f6636154de 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.2 (Berkeley) 1/4/94 - * $Id: ucred.h,v 1.4 1994/10/08 22:23:00 phk Exp $ + * $Id: ucred.h,v 1.5 1995/04/23 08:31:02 bde Exp $ */ #ifndef _SYS_UCRED_H_ diff --git a/sys/sys/uio.h b/sys/sys/uio.h index d48c0343a2674..9d84e21b89308 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $Id: uio.h,v 1.3 1994/09/15 20:24:28 bde Exp $ + * $Id: uio.h,v 1.4 1995/04/04 17:01:49 davidg Exp $ */ #ifndef _SYS_UIO_H_ diff --git a/sys/sys/un.h b/sys/sys/un.h index b85714b973463..6255911a966fd 100644 --- a/sys/sys/un.h +++ b/sys/sys/un.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)un.h 8.1 (Berkeley) 6/2/93 - * $Id: un.h,v 1.5 1994/10/02 17:25:03 phk Exp $ + * $Id: un.h,v 1.6 1995/05/30 08:14:48 rgrimes Exp $ */ #ifndef _SYS_UN_H_ diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 1f63f61e89eed..17c2b4c51185d 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.2 (Berkeley) 1/7/94 - * $Id: unistd.h,v 1.2 1994/08/02 07:54:04 davidg Exp $ + * $Id: unistd.h,v 1.4 1995/05/11 07:52:49 bde Exp $ */ #ifndef _SYS_UNISTD_H_ diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h index 41d8cfc09b7c3..c880c39a31704 100644 --- a/sys/sys/unpcb.h +++ b/sys/sys/unpcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unpcb.h 8.1 (Berkeley) 6/2/93 - * $Id: unpcb.h,v 1.2 1994/08/02 07:54:05 davidg Exp $ + * $Id: unpcb.h,v 1.3 1994/08/21 04:42:09 paul Exp $ */ #ifndef _SYS_UNPCB_H_ diff --git a/sys/sys/user.h b/sys/sys/user.h index 08e74dc79ea11..c2876a1dca0ab 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)user.h 8.2 (Berkeley) 9/23/93 - * $Id: user.h,v 1.3 1994/08/21 04:42:10 paul Exp $ + * $Id: user.h,v 1.4 1995/05/30 08:14:50 rgrimes Exp $ */ #ifndef _SYS_USER_H_ diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h index 0387cc1d206ec..e65ffa58eb3e3 100644 --- a/sys/sys/utsname.h +++ b/sys/sys/utsname.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)utsname.h 8.1 (Berkeley) 1/4/94 - * $Id$ + * $Id: utsname.h,v 1.3 1994/08/02 07:54:07 davidg Exp $ */ #ifndef _SYS_UTSNAME_H diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h index e8ed7235f520a..9171c92d92c21 100644 --- a/sys/sys/vadvise.h +++ b/sys/sys/vadvise.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vadvise.h 8.1 (Berkeley) 6/2/93 - * $Id: vadvise.h,v 1.2 1994/08/02 07:54:08 davidg Exp $ + * $Id: vadvise.h,v 1.3 1994/08/21 04:42:11 paul Exp $ */ #ifndef _SYS_VADVISE_H_ diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h index 4d59e36dd2415..cc0b9945d57f2 100644 --- a/sys/sys/vcmd.h +++ b/sys/sys/vcmd.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vcmd.h 8.1 (Berkeley) 6/2/93 - * $Id: vcmd.h,v 1.2 1994/08/02 07:54:09 davidg Exp $ + * $Id: vcmd.h,v 1.3 1994/08/21 04:42:12 paul Exp $ */ #ifndef _SYS_VCMD_H_ diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h index b1a1fe330e2c3..5d86c8e46e106 100644 --- a/sys/sys/vlimit.h +++ b/sys/sys/vlimit.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vlimit.h 8.1 (Berkeley) 6/2/93 - * $Id: vlimit.h,v 1.3 1994/08/21 04:42:13 paul Exp $ + * $Id: vlimit.h,v 1.4 1995/05/30 08:14:51 rgrimes Exp $ */ #ifndef _SYS_VLIMIT_H_ diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h index 99693fc3a0ce1..45875ccb14d73 100644 --- a/sys/sys/vmmeter.h +++ b/sys/sys/vmmeter.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vmmeter.h 8.1 (Berkeley) 6/2/93 - * $Id: vmmeter.h,v 1.11 1995/07/29 10:47:05 bde Exp $ + * $Id: vmmeter.h,v 1.10.4.1 1995/09/15 10:20:10 davidg Exp $ */ #ifndef _SYS_VMMETER_H_ diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 045ce71aaa350..7aa72958b5e2f 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $Id: vnode.h,v 1.20.4.1 1995/07/07 06:21:57 davidg Exp $ + * $Id: vnode.h,v 1.20.4.2 1996/03/29 06:41:19 davidg Exp $ */ #ifndef _SYS_VNODE_H_ diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h index b867b8b42ced8..14573a0dc65a0 100644 --- a/sys/sys/vsio.h +++ b/sys/sys/vsio.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vsio.h 8.1 (Berkeley) 6/2/93 - * $Id: vsio.h,v 1.3 1994/08/21 04:42:16 paul Exp $ + * $Id: vsio.h,v 1.4 1995/05/30 08:14:52 rgrimes Exp $ */ #ifndef _SYS_VSIO_H_ diff --git a/sys/sys/wait.h b/sys/sys/wait.h index 0b8ec48970b16..936dd95aad74b 100644 --- a/sys/sys/wait.h +++ b/sys/sys/wait.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)wait.h 8.1 (Berkeley) 6/2/93 - * $Id: wait.h,v 1.3 1994/08/21 04:42:17 paul Exp $ + * $Id: wait.h,v 1.4 1995/05/30 08:14:54 rgrimes Exp $ */ #ifndef _SYS_WAIT_H_ diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index d91c557616f9d..def4125302a8f 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.13 1995/05/11 19:26:48 rgrimes Exp $ + * $Id: ffs_alloc.c,v 1.14 1995/05/30 08:14:57 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index cbe9c6051c843..10310925f3f20 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $Id: ffs_balloc.c,v 1.8 1995/05/28 04:32:23 davidg Exp $ + * $Id: ffs_balloc.c,v 1.9 1995/05/30 08:14:59 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 43e7bbefaf4fb..6b463776c0b04 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ffs_extern.h,v 1.5 1994/09/22 19:38:32 wollman Exp $ + * $Id: ffs_extern.h,v 1.6 1995/03/28 07:57:46 bde Exp $ */ struct buf; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index f6c1662ad7288..5908f781f011f 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.13 1995/03/26 23:29:10 davidg Exp $ + * $Id: ffs_inode.c,v 1.13.4.1 1995/08/24 06:03:02 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index cbf96521b7a1e..83748d842deaf 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $Id: ffs_subr.c,v 1.3 1994/10/10 01:04:38 phk Exp $ + * $Id: ffs_subr.c,v 1.4 1995/05/30 08:15:00 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c index 089334ff6e4b1..163f9e76fca4e 100644 --- a/sys/ufs/ffs/ffs_tables.c +++ b/sys/ufs/ffs/ffs_tables.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_tables.c 8.1 (Berkeley) 6/11/93 - * $Id: ffs_tables.c,v 1.2 1994/08/02 07:54:22 davidg Exp $ + * $Id: ffs_tables.c,v 1.3 1995/05/30 08:15:02 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 400244319dea6..56d453894c917 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.21.4.2 1996/06/11 05:17:34 bde Exp $ + * $Id: ffs_vfsops.c,v 1.21.4.3 1996/06/12 03:42:46 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index c5209fc2609ee..1f56be303b8dc 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vnops.c 8.7 (Berkeley) 2/3/94 - * $Id: ffs_vnops.c,v 1.10 1995/05/21 21:39:26 davidg Exp $ + * $Id: ffs_vnops.c,v 1.11 1995/05/30 08:15:05 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index 41f204cb6f382..11280318019fe 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.7 (Berkeley) 4/19/94 - * $Id: fs.h,v 1.4 1995/03/10 22:18:16 davidg Exp $ + * $Id: fs.h,v 1.5 1995/05/30 08:15:07 rgrimes Exp $ */ #ifndef _UFS_FFS_FS_H_ diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h index 1ae1e23ef9194..7e21c36040ff0 100644 --- a/sys/ufs/lfs/lfs.h +++ b/sys/ufs/lfs/lfs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs.h 8.3 (Berkeley) 9/23/93 - * $Id: lfs.h,v 1.5 1994/11/17 01:30:47 gibbs Exp $ + * $Id: lfs.h,v 1.6 1995/05/30 08:15:11 rgrimes Exp $ */ #ifndef _UFS_LFS_LFS_H_ diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index fc48f62d009d4..49975b7df604e 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94 - * $Id: lfs_alloc.c,v 1.8 1995/04/16 11:25:47 davidg Exp $ + * $Id: lfs_alloc.c,v 1.8.4.1 1996/06/12 03:42:50 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index 81fac0d5db7e4..8a28fac72580b 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_balloc.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_balloc.c,v 1.6 1995/04/09 06:03:41 davidg Exp $ + * $Id: lfs_balloc.c,v 1.7 1995/05/30 08:15:12 rgrimes Exp $ */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c index 9344dbb590f54..5adc57c65c612 100644 --- a/sys/ufs/lfs/lfs_bio.c +++ b/sys/ufs/lfs/lfs_bio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_bio.c 8.4 (Berkeley) 12/30/93 - * $Id: lfs_bio.c,v 1.4 1994/08/20 03:49:01 davidg Exp $ + * $Id: lfs_bio.c,v 1.5 1994/10/10 01:04:49 phk Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c index b3f689c95dbdc..9a92cb3203390 100644 --- a/sys/ufs/lfs/lfs_cksum.c +++ b/sys/ufs/lfs/lfs_cksum.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_cksum.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_cksum.c,v 1.2 1994/08/02 07:54:32 davidg Exp $ + * $Id: lfs_cksum.c,v 1.3 1995/05/30 08:15:14 rgrimes Exp $ */ #include <sys/types.h> diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c index 1edffbf150f35..58bb2a6060d2c 100644 --- a/sys/ufs/lfs/lfs_debug.c +++ b/sys/ufs/lfs/lfs_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_debug.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_debug.c,v 1.2 1994/08/02 07:54:33 davidg Exp $ + * $Id: lfs_debug.c,v 1.3 1995/05/30 08:15:16 rgrimes Exp $ */ #ifdef DEBUG diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index 9a1fb4ab0f047..969c1824e1880 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_extern.h 8.2 (Berkeley) 4/16/94 - * $Id: lfs_extern.h,v 1.4 1994/09/22 19:38:34 wollman Exp $ + * $Id: lfs_extern.h,v 1.5 1995/03/28 07:58:04 bde Exp $ */ #ifndef _UFS_LFS_LFS_EXTERN_H_ diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index 61437c51d5263..e42e4a23b8ae9 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_inode.c,v 1.8 1995/03/26 23:29:13 davidg Exp $ + * $Id: lfs_inode.c,v 1.9 1995/05/30 08:15:20 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index 48a73ce6cbe1b..5c9db125b9957 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94 - * $Id: lfs_segment.c,v 1.10 1995/05/11 19:26:51 rgrimes Exp $ + * $Id: lfs_segment.c,v 1.11 1995/05/30 08:15:22 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c index f911c3fc93a51..d2a640ffff48e 100644 --- a/sys/ufs/lfs/lfs_subr.c +++ b/sys/ufs/lfs/lfs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_subr.c 8.2 (Berkeley) 9/21/93 - * $Id: lfs_subr.c,v 1.6 1995/01/09 16:05:23 davidg Exp $ + * $Id: lfs_subr.c,v 1.7 1995/05/30 08:15:24 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c index 1ec0cdc712794..966b6d3885516 100644 --- a/sys/ufs/lfs/lfs_syscalls.c +++ b/sys/ufs/lfs/lfs_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_syscalls.c 8.5 (Berkeley) 4/20/94 - * $Id: lfs_syscalls.c,v 1.9 1995/05/11 19:26:52 rgrimes Exp $ + * $Id: lfs_syscalls.c,v 1.10 1995/05/30 08:15:25 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index e571dcd628afe..da73b104c79bc 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vfsops.c 8.7 (Berkeley) 4/16/94 - * $Id: lfs_vfsops.c,v 1.10 1995/03/16 18:16:48 bde Exp $ + * $Id: lfs_vfsops.c,v 1.11 1995/03/19 14:29:20 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 3d269532133e7..f1fade7bfc0a8 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_vnops.c,v 1.8 1995/04/09 06:03:42 davidg Exp $ + * $Id: lfs_vnops.c,v 1.9 1995/05/30 08:15:27 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h index fa51177ac9fe0..8d516464cfd68 100644 --- a/sys/ufs/mfs/mfs_extern.h +++ b/sys/ufs/mfs/mfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_extern.h 8.1 (Berkeley) 6/11/93 - * $Id: mfs_extern.h,v 1.2 1994/08/02 07:54:42 davidg Exp $ + * $Id: mfs_extern.h,v 1.3 1994/08/21 07:16:10 paul Exp $ */ #ifndef _UFS_MFS_MFS_EXTERN_H_ diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 643a2073a8d9e..3c2b7591c42fa 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: mfs_vfsops.c,v 1.9.4.1 1995/08/24 06:06:25 davidg Exp $ + * $Id: mfs_vfsops.c,v 1.9.4.2 1996/06/12 03:42:54 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index d0f6a644f1804..1d11ef56b9c7d 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.3 (Berkeley) 9/21/93 - * $Id: mfs_vnops.c,v 1.9 1995/03/19 14:29:22 davidg Exp $ + * $Id: mfs_vnops.c,v 1.10 1995/05/11 19:26:53 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h index a420aa3210c4b..f91f2e41f668b 100644 --- a/sys/ufs/mfs/mfsiom.h +++ b/sys/ufs/mfs/mfsiom.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfsiom.h 8.1 (Berkeley) 6/11/93 - * $Id: mfsiom.h,v 1.2 1994/08/02 07:54:45 davidg Exp $ + * $Id: mfsiom.h,v 1.3 1994/08/21 07:16:11 paul Exp $ */ #ifndef _UFS_MFS_MFSIOM_H_ diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h index 28d9254265cf5..f0d329cbb0e17 100644 --- a/sys/ufs/mfs/mfsnode.h +++ b/sys/ufs/mfs/mfsnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfsnode.h 8.2 (Berkeley) 8/11/93 - * $Id: mfsnode.h,v 1.2 1994/08/02 07:54:46 davidg Exp $ + * $Id: mfsnode.h,v 1.3 1994/08/21 07:16:12 paul Exp $ */ #ifndef _UFS_MFS_MFSNODE_H_ diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index b91843b7a79ed..b72d18721f8b3 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dinode.h 8.3 (Berkeley) 1/21/94 - * $Id: dinode.h,v 1.2 1994/08/02 07:54:47 davidg Exp $ + * $Id: dinode.h,v 1.3 1994/08/21 07:16:13 paul Exp $ */ #ifndef _UFS_UFS_DINODE_H_ diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h index f18eca8dc8aa6..bd6a7c02a07a9 100644 --- a/sys/ufs/ufs/dir.h +++ b/sys/ufs/ufs/dir.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.2 (Berkeley) 1/21/94 - * $Id: dir.h,v 1.2 1994/08/02 07:54:48 davidg Exp $ + * $Id: dir.h,v 1.3 1994/08/21 07:16:14 paul Exp $ */ #ifndef _UFS_UFS_DIR_H_ diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 00105ea3635df..ff63f7c28f47c 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.4 (Berkeley) 1/21/94 - * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $ + * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $ */ #ifndef _UFS_UFS_INODE_H_ diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h index 35dafa934cf36..7ef0a91a77041 100644 --- a/sys/ufs/ufs/quota.h +++ b/sys/ufs/ufs/quota.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)quota.h 8.1 (Berkeley) 6/11/93 - * $Id: quota.h,v 1.2 1994/08/02 07:54:51 davidg Exp $ + * $Id: quota.h,v 1.3 1994/08/21 07:16:16 paul Exp $ */ #ifndef _UFS_UFS_QUOTA_ diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index b820ae864f84c..1d5aaee1c67c2 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.8 1995/05/30 08:15:31 rgrimes Exp $ + * $Id: ufs_bmap.c,v 1.8.4.1 1996/06/15 09:25:16 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index 83400a919c6f7..29afdf6b00ad0 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.15 1995/05/30 08:15:33 rgrimes Exp $ + * $Id: ufs_disksubr.c,v 1.15.4.1 1995/09/18 06:15:15 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 8ff0d949d505a..bdc878fd1541d 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ufs_extern.h,v 1.6 1994/11/14 13:50:15 bde Exp $ + * $Id: ufs_extern.h,v 1.7 1995/03/28 07:58:17 bde Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c index 18ac11c406223..dd61b6b3f7261 100644 --- a/sys/ufs/ufs/ufs_ihash.c +++ b/sys/ufs/ufs/ufs_ihash.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.4 (Berkeley) 12/30/93 - * $Id: ufs_ihash.c,v 1.4 1994/10/08 06:57:23 phk Exp $ + * $Id: ufs_ihash.c,v 1.5 1995/04/24 05:13:13 dyson Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index c3e4c51e4f294..acbefaf4beb75 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_inode.c 8.4 (Berkeley) 1/21/94 - * $Id: ufs_inode.c,v 1.5 1994/10/15 04:08:44 ache Exp $ + * $Id: ufs_inode.c,v 1.6 1995/01/04 23:48:04 gibbs Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 25a10aa24d2e7..adf84ff4dccbf 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94 - * $Id: ufs_lookup.c,v 1.3 1994/10/08 06:57:26 phk Exp $ + * $Id: ufs_lookup.c,v 1.3.8.1 1995/10/26 09:17:44 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 9b1f6218d3372..e6e54469d2190 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_quota.c 8.2 (Berkeley) 12/30/93 - * $Id: ufs_quota.c,v 1.4 1994/10/08 06:57:27 phk Exp $ + * $Id: ufs_quota.c,v 1.5 1995/05/30 08:15:36 rgrimes Exp $ */ #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index 7d25fd4f4f289..4969c2d3a0cfc 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.7 (Berkeley) 1/21/94 - * $Id: ufs_readwrite.c,v 1.9 1995/04/24 05:13:15 dyson Exp $ + * $Id: ufs_readwrite.c,v 1.9.4.1 1996/06/25 03:02:11 davidg Exp $ */ #ifdef LFS_READWRITE diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 950f386e17228..267eb538da2cd 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: ufs_vfsops.c,v 1.3 1994/10/08 06:57:28 phk Exp $ + * $Id: ufs_vfsops.c,v 1.4 1995/03/10 22:06:39 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index b658873b598eb..5acc13c9854e4 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.10 (Berkeley) 4/1/94 - * $Id: ufs_vnops.c,v 1.24.4.4 1996/06/08 02:06:08 davidg Exp $ + * $Id: ufs_vnops.c,v 1.24.4.5 1996/11/04 18:26:47 jkh Exp $ */ #include <sys/param.h> diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h index 02fdff2eb3faa..96d3b8a8a6c0f 100644 --- a/sys/ufs/ufs/ufsmount.h +++ b/sys/ufs/ufs/ufsmount.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.2 (Berkeley) 1/12/94 - * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $ + * $Id: ufsmount.h,v 1.3 1994/08/21 07:16:18 paul Exp $ */ #ifndef _UFS_UFS_UFSMOUNT_H_ diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 8ce0bc164fc50..2bb0144df480d 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 - * $Id: device_pager.c,v 1.10 1995/05/18 02:59:18 davidg Exp $ + * $Id: device_pager.c,v 1.11 1995/05/30 08:15:46 rgrimes Exp $ */ /* diff --git a/sys/vm/device_pager.h b/sys/vm/device_pager.h index 6fa8bfe6ac510..950a67b63f643 100644 --- a/sys/vm/device_pager.h +++ b/sys/vm/device_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.h 8.3 (Berkeley) 12/13/93 - * $Id: device_pager.h,v 1.2 1994/08/02 07:55:07 davidg Exp $ + * $Id: device_pager.h,v 1.3 1995/01/09 16:05:30 davidg Exp $ */ #ifndef _DEVICE_PAGER_ diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c index 30be6763c1888..1234086694a2f 100644 --- a/sys/vm/kern_lock.c +++ b/sys/vm/kern_lock.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: kern_lock.c,v 1.5 1995/04/16 12:56:12 davidg Exp $ + * $Id: kern_lock.c,v 1.6 1995/05/30 08:15:49 rgrimes Exp $ */ /* diff --git a/sys/vm/lock.h b/sys/vm/lock.h index 6cd71edc29476..b5d2f08b12d15 100644 --- a/sys/vm/lock.h +++ b/sys/vm/lock.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: lock.h,v 1.2 1994/08/02 07:55:11 davidg Exp $ + * $Id: lock.h,v 1.3 1995/01/09 16:05:31 davidg Exp $ */ /* diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index b55519f2f20dc..8a25edb00819b 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: pmap.h,v 1.5 1994/11/14 08:19:07 bde Exp $ + * $Id: pmap.h,v 1.6 1995/01/09 16:05:32 davidg Exp $ */ /* diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index ac44b48d6095c..62172f58929ac 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.41.4.2 1995/07/22 04:41:47 davidg Exp $ + * $Id: swap_pager.c,v 1.41.4.3 1996/01/31 13:15:21 davidg Exp $ */ /* diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index 5a1393f5e0e17..9b03b57474798 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)swap_pager.h 7.1 (Berkeley) 12/5/90 - * $Id: swap_pager.h,v 1.5 1995/02/02 09:08:09 davidg Exp $ + * $Id: swap_pager.h,v 1.6 1995/05/10 18:56:04 davidg Exp $ */ /* diff --git a/sys/vm/vm.h b/sys/vm/vm.h index a24ba321a5692..4999882e61eb0 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm.h 8.2 (Berkeley) 12/13/93 - * $Id: vm.h,v 1.3 1994/08/02 07:55:16 davidg Exp $ + * $Id: vm.h,v 1.4 1995/01/09 16:05:37 davidg Exp $ */ #ifndef VM_H diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 997f41a0e21d0..80641b6eaa321 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id: vm_extern.h,v 1.14 1995/05/10 18:56:04 davidg Exp $ + * $Id: vm_extern.h,v 1.15 1995/05/14 03:00:09 davidg Exp $ */ #ifndef _VM_EXTERN_H_ diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index b4571ab22cb3d..4929307302735 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -66,7 +66,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_fault.c,v 1.25.4.3 1996/06/19 07:20:21 davidg Exp $ + * $Id: vm_fault.c,v 1.25.4.4 1996/07/02 10:59:04 davidg Exp $ */ /* diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 1d84ce9049c63..9bcff36859c6a 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.20.4.5 1996/06/27 05:39:02 davidg Exp $ + * $Id: vm_glue.c,v 1.20.4.6 1996/06/27 05:48:51 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h index ee212e19bdc57..65a54beb41fcd 100644 --- a/sys/vm/vm_inherit.h +++ b/sys/vm/vm_inherit.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_inherit.h,v 1.2 1994/08/02 07:55:20 davidg Exp $ + * $Id: vm_inherit.h,v 1.3 1995/01/09 16:05:41 davidg Exp $ */ /* diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 64f3814d21840..ce1d4ea81fa34 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_init.c,v 1.5 1995/01/09 16:05:42 davidg Exp $ + * $Id: vm_init.c,v 1.6 1995/03/16 18:17:11 bde Exp $ */ /* diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 5c8615828e47e..8c3f81b2cf233 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_kern.c,v 1.13.4.2 1996/05/26 18:35:22 davidg Exp $ + * $Id: vm_kern.c,v 1.13.4.3 1996/07/01 14:22:22 davidg Exp $ */ /* diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index 627c70d2a6f15..b93a44de11718 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_kern.h,v 1.4 1994/08/18 22:36:03 wollman Exp $ + * $Id: vm_kern.h,v 1.5 1995/01/09 16:05:44 davidg Exp $ */ #ifndef _VM_VM_KERN_H_ diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index c951e5b5dab38..095c63fdb17dc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.22.4.4 1996/06/15 14:03:33 davidg Exp $ + * $Id: vm_map.c,v 1.22.4.5 1996/07/07 03:29:44 davidg Exp $ */ /* diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index f250144047d94..89b0ffb56a7af 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.h,v 1.4 1995/01/09 16:05:46 davidg Exp $ + * $Id: vm_map.h,v 1.5 1995/03/16 18:17:17 bde Exp $ */ /* diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index bf65f8ca4ad8d..88bab58fa9bba 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_meter.c 8.4 (Berkeley) 1/4/94 - * $Id: vm_meter.c,v 1.5 1995/01/09 16:05:47 davidg Exp $ + * $Id: vm_meter.c,v 1.6 1995/01/10 07:32:47 davidg Exp $ */ #include <sys/param.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 106b62b6a529d..aac04cd858f7b 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.24 1995/05/30 08:16:09 rgrimes Exp $ + * $Id: vm_mmap.c,v 1.24.4.1 1995/07/20 10:34:15 davidg Exp $ */ /* diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index d39ad4552124b..4f4d774c0ea69 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.48.2.3 1996/03/29 06:30:18 davidg Exp $ + * $Id: vm_object.c,v 1.48.2.4 1996/11/24 00:19:38 davidg Exp $ */ /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 18b4e9ac4bffa..efe92914ea66a 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.h,v 1.17 1995/04/09 06:03:51 davidg Exp $ + * $Id: vm_object.h,v 1.18 1995/05/02 05:57:11 davidg Exp $ */ /* diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8227f15a476fd..be57e0bdb3aa3 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.32.4.1 1996/06/19 07:22:45 davidg Exp $ + * $Id: vm_page.c,v 1.32.4.2 1996/10/24 04:31:51 davidg Exp $ */ /* diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 4a4e54d87c9f9..81bb3547aa45a 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_page.h,v 1.17 1995/03/26 23:33:14 davidg Exp $ + * $Id: vm_page.h,v 1.18 1995/04/23 08:05:49 bde Exp $ */ /* diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 6c3069f757d9f..6df1bf4c1edec 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.c,v 1.51.4.12 1996/06/29 09:17:17 davidg Exp $ + * $Id: vm_pageout.c,v 1.51.4.13 1996/11/24 00:19:47 davidg Exp $ */ /* diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index d1da63c280ed9..fc22edbae1282 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.h,v 1.11 1995/04/09 06:03:55 davidg Exp $ + * $Id: vm_pageout.h,v 1.12 1995/05/30 08:16:20 rgrimes Exp $ */ #ifndef _VM_VM_PAGEOUT_H_ diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index f7f1976d7b6bb..7d4cb7b13f19c 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pager.c,v 1.14 1995/04/25 06:22:47 davidg Exp $ + * $Id: vm_pager.c,v 1.15 1995/05/10 18:56:07 davidg Exp $ */ /* diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index 1cab34a5045b0..aec798667489f 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)vm_pager.h 8.4 (Berkeley) 1/12/94 - * $Id: vm_pager.h,v 1.6 1995/03/16 18:17:32 bde Exp $ + * $Id: vm_pager.h,v 1.7 1995/05/10 18:56:08 davidg Exp $ */ /* diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 4b047f9e06caf..086a8bf2227b0 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_param.h,v 1.3 1994/08/02 07:55:37 davidg Exp $ + * $Id: vm_param.h,v 1.4 1995/01/09 16:05:57 davidg Exp $ */ /* diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h index 36079a0c1ed9c..b50a90150ec45 100644 --- a/sys/vm/vm_prot.h +++ b/sys/vm/vm_prot.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_prot.h,v 1.3 1994/08/02 07:55:38 davidg Exp $ + * $Id: vm_prot.h,v 1.4 1995/01/09 16:05:57 davidg Exp $ */ /* diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 9b90074ddc8d8..d2fbf2dd06b2c 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.20 1995/05/25 03:38:11 davidg Exp $ + * $Id: vm_swap.c,v 1.21 1995/05/30 08:16:21 rgrimes Exp $ */ #include <sys/param.h> diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index e84b5dc0b9170..3ba8dede40755 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$ * * @(#)vm_unix.c 8.1 (Berkeley) 6/11/93 - * $Id: vm_unix.c,v 1.5 1995/02/20 17:36:36 davidg Exp $ + * $Id: vm_unix.c,v 1.5.4.1 1996/06/25 03:48:34 davidg Exp $ */ /* diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 4abda8acc3e47..375830662faf0 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.40.4.1 1995/07/07 06:22:00 davidg Exp $ + * $Id: vnode_pager.c,v 1.40.4.2 1995/07/20 10:34:17 davidg Exp $ */ /* diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h index 381af99feb695..6e40dcbc2494a 100644 --- a/sys/vm/vnode_pager.h +++ b/sys/vm/vnode_pager.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vnode_pager.h 8.1 (Berkeley) 6/11/93 - * $Id: vnode_pager.h,v 1.3 1994/08/02 07:55:43 davidg Exp $ + * $Id: vnode_pager.h,v 1.4 1995/01/09 16:06:02 davidg Exp $ */ #ifndef _VNODE_PAGER_ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 1b730155a14a3..48b1bbacac22d 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $Id: Makefile,v 1.52.4.4 1996/08/13 18:15:37 rgrimes Exp $ +# $Id: Makefile,v 1.52.4.5 1996/10/21 21:21:32 wosch Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct units xsend diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile index e1e3096182e27..6eacdb0c7bb65 100644 --- a/usr.bin/at/Makefile +++ b/usr.bin/at/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/01/05 01:08:51 nate Exp $ +# $Id: Makefile,v 1.2 1995/04/12 02:42:22 ache Exp $ .include "${.CURDIR}/Makefile.inc" diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index d2e6e30efe5a0..3f5bd0ba5e33c 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -80,7 +80,7 @@ /* File scope variables */ -static char rcsid[] = "$Id: at.c,v 1.4 1995/04/27 19:27:41 ache Exp $"; +static char rcsid[] = "$Id: at.c,v 1.5 1995/05/30 06:29:21 rgrimes Exp $"; char *no_export[] = { "TERM", "TERMCAP", "DISPLAY", "_" diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man index 21e789c010411..016cbf8f5911b 100644 --- a/usr.bin/at/at.man +++ b/usr.bin/at/at.man @@ -1,4 +1,4 @@ -.\" $Id: at.man,v 1.3 1994/06/16 16:49:46 kernel Exp $ +.\" $Id: at.man,v 1.1 1995/04/12 02:42:31 ache Exp $ .Dd April 12, 1995 .Dt "AT" 1 .Os "FreeBSD 2.1" diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c index 9d21e096b85c7..ddd3b8abd59d5 100644 --- a/usr.bin/at/panic.c +++ b/usr.bin/at/panic.c @@ -37,7 +37,7 @@ /* File scope variables */ -static char rcsid[] = "$Id: panic.c,v 1.2 1995/04/12 02:42:32 ache Exp $"; +static char rcsid[] = "$Id: panic.c,v 1.3 1995/05/30 06:29:23 rgrimes Exp $"; /* External variables */ diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c index c806eb6bbe93b..6f35bc3ae8c71 100644 --- a/usr.bin/at/parsetime.c +++ b/usr.bin/at/parsetime.c @@ -130,7 +130,7 @@ static size_t sc_len; /* scanner - lenght of token buffer */ static int sc_tokid; /* scanner - token id */ static int sc_tokplur; /* scanner - is token plural? */ -static char rcsid[] = "$Id: parsetime.c,v 1.4 1995/05/30 06:29:25 rgrimes Exp $"; +static char rcsid[] = "$Id: parsetime.c,v 1.4.4.1 1996/09/25 12:03:27 jdp Exp $"; /* Local functions */ diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c index 078af59269a88..13fc0c15ec2ae 100644 --- a/usr.bin/at/perm.c +++ b/usr.bin/at/perm.c @@ -48,7 +48,7 @@ /* File scope variables */ -static char rcsid[] = "$Id: perm.c,v 1.1 1995/04/12 02:42:37 ache Exp $"; +static char rcsid[] = "$Id: perm.c,v 1.2 1995/05/30 06:29:26 rgrimes Exp $"; /* Function declarations */ diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all index 77856cc44a457..0c135c0610698 100644 --- a/usr.bin/calendar/calendars/calendar.all +++ b/usr.bin/calendar/calendars/calendar.all @@ -1,7 +1,7 @@ /* * International and national calendar files * - * $Id: calendar.all,v 1.2 1996/02/09 14:34:48 wosch Exp $ + * $Id: calendar.all,v 1.3 1996/05/10 21:36:28 ache Exp $ */ #ifndef _calendar_all_ diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian index 48e3120759545..82b435df44a7c 100644 --- a/usr.bin/calendar/calendars/calendar.croatian +++ b/usr.bin/calendar/calendars/calendar.croatian @@ -1,7 +1,7 @@ /* * Croatian calendar files * - * $Id: calendar.croatian,v 1.2 1996/01/30 23:35:08 wosch Exp $ + * $Id: calendar.croatian,v 1.1 1996/02/09 14:34:49 wosch Exp $ */ #ifndef _calendar_croatian_ diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german index d45dc7ec95d48..ef13804709d35 100644 --- a/usr.bin/calendar/calendars/calendar.german +++ b/usr.bin/calendar/calendars/calendar.german @@ -1,7 +1,7 @@ /* * German calendar file(s) * - * $Id: calendar.german,v 1.1 1996/01/29 00:32:57 wosch Exp $ + * $Id: calendar.german,v 1.2 1996/01/30 23:35:08 wosch Exp $ */ #ifndef _calendar_german_ diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian index 47f3fa9e7025d..37cbd6da128e1 100644 --- a/usr.bin/calendar/calendars/calendar.russian +++ b/usr.bin/calendar/calendars/calendar.russian @@ -1,7 +1,7 @@ /* * Russian calendar files * - * $Id: calendar.croatian,v 1.1 1996/02/09 14:34:49 wosch Exp $ + * $Id: calendar.russian,v 1.1 1996/05/10 21:36:31 ache Exp $ */ #ifndef _calendar_russian_ diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world index 641b2b5701bc9..edbdca3f64a2e 100644 --- a/usr.bin/calendar/calendars/calendar.world +++ b/usr.bin/calendar/calendars/calendar.world @@ -1,7 +1,7 @@ /* * World wide calendar files, except national calendars * - * $Id: calendar.world,v 1.1 1996/01/28 19:12:24 wosch Exp $ + * $Id: calendar.world,v 1.1 1996/01/29 00:33:02 wosch Exp $ */ #ifndef _calendar_world_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all index c41483c6ec9ce..1882f8cf24337 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all @@ -1,7 +1,7 @@ /* * deutscher Kalender * - * $Id: calendar.all,v 1.1 1996/01/29 00:34:11 wosch Exp $ + * $Id: calendar.all,v 1.2 1996/01/30 23:36:43 wosch Exp $ */ #ifndef _de_DE_ISO_8859_1_all_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag index e47d36a445a06..81443d87e7675 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag @@ -1,7 +1,7 @@ /* * Feiertage * - * $Id: calendar.feiertag,v 1.2 1996/02/02 06:05:13 wosch Exp $ + * $Id: calendar.feiertag,v 1.3 1996/05/10 16:30:02 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_feiertag_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte index 5dc30968ba953..6b5d782616851 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte @@ -13,7 +13,7 @@ * * ISBN 3-924521-59-X * - * $Id: calendar.geschichte,v 1.2 1996/02/02 06:05:15 wosch Exp $ + * $Id: calendar.geschichte,v 1.3 1996/05/10 16:30:05 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_geschichte_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche index 0fdd1351d3df4..fcdabd10d6dde 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche @@ -1,7 +1,7 @@ /* * Kirche in Deutschland * - * $Id: calendar.kirche,v 1.2 1996/02/02 06:05:16 wosch Exp $ + * $Id: calendar.kirche,v 1.3 1996/05/10 16:30:07 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_kirche_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur index d35599c1de959..b37017903ac57 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur @@ -1,7 +1,7 @@ /* * Literatur * - * $Id: calendar.literatur,v 1.2 1996/02/02 06:05:17 wosch Exp $ + * $Id: calendar.literatur,v 1.3 1996/05/10 16:30:09 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_literatur_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik index bf0a7f33840a6..a662dad7321d4 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik @@ -1,7 +1,7 @@ /* * Musik * - * $Id: calendar.musik,v 1.2 1996/02/02 06:05:18 wosch Exp $ + * $Id: calendar.musik,v 1.3 1996/05/10 16:30:11 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_musik_ diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft index d8595710806c0..1f5e2bc78e1a7 100644 --- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft +++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft @@ -1,7 +1,7 @@ /* * Wissenschaft * - * $Id: calendar.wissenschaft,v 1.2 1996/02/02 06:05:20 wosch Exp $ + * $Id: calendar.wissenschaft,v 1.3 1996/05/10 16:30:13 ache Exp $ */ #ifndef _de_DE_ISO_8859_1_wissenschaft_ diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all index ac50c26af730b..c976208d9501d 100644 --- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all +++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all @@ -1,7 +1,7 @@ /* * hrvatski calendar * - * $Id: calendar.croatian,v 1.2 1996/01/30 23:35:08 wosch Exp $ + * $Id: calendar.all,v 1.1 1996/02/09 14:35:01 wosch Exp $ */ #ifndef _hr_HR_ISO_8859_2_all diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici index ae4547c85d11d..c34ad3a33a711 100644 --- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici +++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici @@ -1,7 +1,7 @@ /* * hrvatski praznici * - * $Id: calendar.praznici,v 1.1 1996/02/09 14:35:02 wosch Exp $ + * $Id: calendar.praznici,v 1.2 1996/05/10 16:30:22 ache Exp $ */ #ifndef _hr_HR_ISO_8859_2_praznici diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all index 72b2c695c58d3..01cccb2b38890 100644 --- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all +++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all @@ -1,7 +1,7 @@ /* * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ * - * $Id: calendar.all,v 1.1 1996/02/09 14:35:01 wosch Exp $ + * $Id: calendar.all,v 1.1 1996/05/10 21:36:45 ache Exp $ */ #ifndef _ru_SU_KOI8_R_all diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common index fb788e1e80900..596f888c94ea9 100644 --- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common +++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common @@ -1,7 +1,7 @@ /* * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ * - * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $ + * $Id: calendar.common,v 1.1 1996/05/10 21:36:48 ache Exp $ */ #ifndef _ru_SU_KOI8_R_common_ diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk index ba273f5fa3285..1e173506663b2 100644 --- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk +++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk @@ -1,7 +1,7 @@ /* * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ * - * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $ + * $Id: calendar.msk,v 1.1 1996/05/10 21:36:50 ache Exp $ */ #ifndef _ru_SU_KOI8_R_msk_ diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox index 3cb125844753c..583843b17b2a9 100644 --- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox +++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox @@ -1,7 +1,7 @@ /* * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ * - * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $ + * $Id: calendar.orthodox,v 1.1 1996/05/10 21:36:52 ache Exp $ */ #ifndef _ru_SU_KOI8_R_orthodox_ diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan index cdc1f144a79a2..c6b6e849f0896 100644 --- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan +++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan @@ -1,7 +1,7 @@ /* * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ * - * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $ + * $Id: calendar.pagan,v 1.1 1996/05/10 21:36:56 ache Exp $ */ #ifndef _ru_SU_KOI8_R_pagan_ diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c index 25fbfe8edf234..4fb83e4a45945 100644 --- a/usr.bin/calendar/ostern.c +++ b/usr.bin/calendar/ostern.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1995 Wolfram Schneider. Public domain. * - * $Id: ostern.c,v 1.3 1996/05/10 17:32:05 ache Exp $ + * $Id: ostern.c,v 1.4 1996/05/11 20:44:20 ache Exp $ */ #include <stdio.h> diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile index be272711406cb..42df755055e7c 100644 --- a/usr.bin/chat/Makefile +++ b/usr.bin/chat/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile.bsd,v 1.2 1994/05/26 06:45:03 paulus Exp $ +# $Id: Makefile,v 1.1.1.1 1994/11/12 05:25:32 lars Exp $ PROG= chat SRCS= chat.c diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8 index e54f6b4ee7f86..7d8ff8b038bbe 100644 --- a/usr.bin/chat/chat.8 +++ b/usr.bin/chat/chat.8 @@ -1,6 +1,6 @@ .\" -*- nroff -*- .\" manual page [] for chat 1.8 -.\" $Id: chat.8,v 1.1.1.1 1994/11/12 05:25:32 lars Exp $ +.\" $Id: chat.8,v 1.2 1994/12/12 00:19:19 ats Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index 66387d63ae035..de350d7449a3b 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -18,7 +18,7 @@ * (614)451-1883 */ -static char rcsid[] = "$Id: chat.c,v 1.2 1994/12/19 01:02:11 ache Exp $"; +static char rcsid[] = "$Id: chat.c,v 1.3 1995/05/30 06:29:32 rgrimes Exp $"; #include <stdio.h> #include <fcntl.h> diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index 227fb916d74aa..d244ea8752263 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint static char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94"; static char rcsid[] = - "$Id: chpass.c,v 1.3.4.2 1995/10/06 00:58:49 davidg Exp $"; + "$Id: chpass.c,v 1.3.4.3 1996/03/17 09:03:17 joerg Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c index 193fe4b528418..1bb0a8563368a 100644 --- a/usr.bin/chpass/pw_yp.c +++ b/usr.bin/chpass/pw_yp.c @@ -35,7 +35,7 @@ * Center for Telecommunications Research * Columbia University, New York City * - * $Id: pw_yp.c,v 1.1.2.1 1995/10/06 00:58:50 davidg Exp $ + * $Id: pw_yp.c,v 1.1.2.2 1996/06/24 17:18:04 wpaul Exp $ */ #ifdef YP diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h index 13f3eee2b0115..7315399dd8009 100644 --- a/usr.bin/chpass/pw_yp.h +++ b/usr.bin/chpass/pw_yp.h @@ -35,7 +35,7 @@ * Center for Telecommunications Research * Columbia University, New York City * - * $Id: pw_yp.h,v 1.2 1995/09/02 03:56:21 wpaul Exp $ + * $Id: pw_yp.h,v 1.1.2.1 1995/10/06 00:58:51 davidg Exp $ */ #ifdef YP diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile index a49e39b4459b6..bcaeac6a89b1c 100644 --- a/usr.bin/colldef/Makefile +++ b/usr.bin/colldef/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1995/09/28 18:23:34 bde Exp $ +# $Id: Makefile,v 1.2.4.2 1995/10/06 01:07:02 davidg Exp $ PROG = colldef LFLAGS = -8 -i diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile index 00b7b4707992b..06a17b4494c4d 100644 --- a/usr.bin/colldef/data/Makefile +++ b/usr.bin/colldef/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/10/22 00:58:41 ache Exp $ +# $Id: Makefile,v 1.1 1995/11/03 14:53:50 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y index 47f3cd5a1b41f..35153184cbd66 100644 --- a/usr.bin/colldef/parse.y +++ b/usr.bin/colldef/parse.y @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parse.y,v 1.2 1995/01/24 11:15:47 alex Exp alex $ + * $Id: parse.y,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $ */ #include <err.h> diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l index 3be046335080a..3b9352c65cf43 100644 --- a/usr.bin/colldef/scan.l +++ b/usr.bin/colldef/scan.l @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scan.l,v 1.1 1995/01/22 20:37:31 alex Exp alex $ + * $Id: scan.l,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $ */ #include <err.h> diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile index b03ff7801b23e..f48381b9a14bd 100644 --- a/usr.bin/compile_et/Makefile +++ b/usr.bin/compile_et/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1995/01/14 22:30:32 wollman Exp $ +# $Id: Makefile,v 1.5 1995/02/09 00:24:00 jkh Exp $ PROG= compile_et SRCS= compile_et.c error_table.y diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1 index df664bdacf7d9..7e5358dac3e1c 100644 --- a/usr.bin/compile_et/compile_et.1 +++ b/usr.bin/compile_et/compile_et.1 @@ -1,7 +1,7 @@ .\" Copyright (c) 1988 Massachusetts Institute of Technology, .\" Student Information Processing Board. All rights reserved. .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/compile_et.1,v 1.1 1995/01/14 22:29:30 wollman Exp $ +.\" $Header: /home/ncvs/src/usr.bin/compile_et/compile_et.1,v 1.1.4.1 1996/06/05 02:56:30 jkh Exp $ .\" .TH COMPILE_ET 1 "22 Nov 1988" SIPB .SH NAME diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c index 5635df928cab1..2e5ff40600d60 100644 --- a/usr.bin/compile_et/compile_et.c +++ b/usr.bin/compile_et/compile_et.c @@ -23,7 +23,7 @@ static const char copyright[] = "Copyright 1987,1988 by MIT Student Information Processing Board"; static const char rcsid_compile_et_c[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/compile_et.c,v 1.2 1995/01/14 22:29:31 wollman Exp $"; + "$Header: /home/ncvs/src/usr.bin/compile_et/compile_et.c,v 1.2.4.1 1996/06/05 02:56:31 jkh Exp $"; #endif extern char *gensym(); diff --git a/usr.bin/compile_et/error_table.y b/usr.bin/compile_et/error_table.y index f584ef15d87a1..76134b347e6d9 100644 --- a/usr.bin/compile_et/error_table.y +++ b/usr.bin/compile_et/error_table.y @@ -74,7 +74,7 @@ description : QUOTED_STRING #ifndef lint static char const rcsid_error_table_y[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/error_table.y,v 1.3 1995/03/15 19:05:28 wpaul Exp $"; + "$Header: /home/ncvs/src/usr.bin/compile_et/error_table.y,v 1.3.4.1 1996/06/05 02:56:32 jkh Exp $"; #endif void *malloc(), *realloc(); diff --git a/usr.bin/compile_et/et_lex.lex.l b/usr.bin/compile_et/et_lex.lex.l index bffe0d4855f53..f64dbf6573224 100644 --- a/usr.bin/compile_et/et_lex.lex.l +++ b/usr.bin/compile_et/et_lex.lex.l @@ -22,5 +22,5 @@ end return END; . { return (*yytext); } %% #ifndef lint -static char rcsid_et_lex_lex_l[] = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/et_lex.lex.l,v 1.2 1995/01/14 22:29:33 wollman Exp $"; +static char rcsid_et_lex_lex_l[] = "$Header: /home/ncvs/src/usr.bin/compile_et/et_lex.lex.l,v 1.2.4.1 1996/06/05 02:56:33 jkh Exp $"; #endif diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log index efddfbd716e32..89158b376ce7d 100644 --- a/usr.bin/compress/doc/revision.log +++ b/usr.bin/compress/doc/revision.log @@ -1,6 +1,10 @@ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compress/doc/revision.log,v 1.1.1.1 1994/05/27 12:30:59 rgrimes Exp $ + * $Header: /home/ncvs/src/usr.bin/compress/doc/revision.log,v 1.1.1.1.6.1 1996/06/05 02:56:34 jkh Exp $ * $Log: revision.log,v $ + * Revision 1.1.1.1.6.1 1996/06/05 02:56:34 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * # Revision 1.1.1.1 1994/05/27 12:30:59 rgrimes # BSD 4.4 Lite Usr.bin Sources # @@ -116,4 +120,4 @@ */ static char rcs_ident[] = - "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compress/doc/revision.log,v 1.1.1.1 1994/05/27 12:30:59 rgrimes Exp $"; + "$Header: /home/ncvs/src/usr.bin/compress/doc/revision.log,v 1.1.1.1.6.1 1996/06/05 02:56:34 jkh Exp $"; diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh index 34aa29eb883a0..e593d45c2fbd3 100644 --- a/usr.bin/cpp/cpp.sh +++ b/usr.bin/cpp/cpp.sh @@ -36,7 +36,7 @@ # SUCH DAMAGE. # # From: @(#)cpp.sh 8.1 (Berkeley) 6/6/93 -# $Id: cpp.sh,v 1.3 1994/08/23 03:52:40 jkh Exp $ +# $Id: cpp.sh,v 1.4 1994/09/05 13:58:58 bde Exp $ # # Transitional front end to CCCP to make it behave like (Reiser) CCP: # specifies -traditional diff --git a/usr.bin/devmenu/Makefile b/usr.bin/devmenu/Makefile index 225756a41ca85..631f24f932a8b 100644 --- a/usr.bin/devmenu/Makefile +++ b/usr.bin/devmenu/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/04/13 21:10:56 wollman Exp $ +# $Id: Makefile,v 1.2 1995/04/14 16:13:28 ache Exp $ PROG= devmenu SRCS= devmenu.c devfilter.c ifmenu.c diff --git a/usr.bin/devmenu/devmenu.1 b/usr.bin/devmenu/devmenu.1 index f277baafb3454..0f89d8a4646ad 100644 --- a/usr.bin/devmenu/devmenu.1 +++ b/usr.bin/devmenu/devmenu.1 @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: devmenu.1,v 1.1 1995/04/13 21:10:58 wollman Exp $ +.\" $Id: devmenu.1,v 1.2 1995/04/14 18:33:42 wollman Exp $ .Dd April 14, 1995 .Dt DEVMENU 1 .Os FreeBSD 2.1 diff --git a/usr.bin/devmenu/devmenu.c b/usr.bin/devmenu/devmenu.c index 2e5c69beea45e..802a1ebfefe9d 100644 --- a/usr.bin/devmenu/devmenu.c +++ b/usr.bin/devmenu/devmenu.c @@ -36,7 +36,7 @@ #ifndef lint static const char rcsid[] = - "$Id: devmenu.c,v 1.2 1995/04/14 18:33:43 wollman Exp $"; + "$Id: devmenu.c,v 1.3 1995/05/30 06:29:43 rgrimes Exp $"; #endif #include <stdlib.h> diff --git a/usr.bin/devmenu/devmenu.h b/usr.bin/devmenu/devmenu.h index e3cf1a85b40ba..ba7611de09d7d 100644 --- a/usr.bin/devmenu/devmenu.h +++ b/usr.bin/devmenu/devmenu.h @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devmenu.h,v 1.2 1995/04/14 18:33:44 wollman Exp $ + * $Id: devmenu.h,v 1.3 1995/05/30 06:29:44 rgrimes Exp $ */ /* NB: must include sys/devconf.h before this file */ diff --git a/usr.bin/dig/dig.1 b/usr.bin/dig/dig.1 index 71e43749a695d..10d57e0600d90 100644 --- a/usr.bin/dig/dig.1 +++ b/usr.bin/dig/dig.1 @@ -1,4 +1,4 @@ -.\" $Id: dig.1,v 1.1.1.1 1994/09/22 21:33:31 pst Exp $ +.\" $Id: dig.1,v 1.2 1994/11/19 13:12:37 ats Exp $ .\" .\" ++Copyright++ 1993 .\" - diff --git a/usr.bin/dig/dig.c b/usr.bin/dig/dig.c index 0557412088d9e..4b5eb0fc16bc5 100644 --- a/usr.bin/dig/dig.c +++ b/usr.bin/dig/dig.c @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "$Id: dig.c,v 1.4 1995/05/30 06:29:46 rgrimes Exp $"; +static char rcsid[] = "$Id: dig.c,v 1.4.4.1 1995/08/30 04:06:06 davidg Exp $"; #endif /* diff --git a/usr.bin/ee/doc/new_curse.c b/usr.bin/ee/doc/new_curse.c index 9d57038e19a6f..69e1b25bf8395 100644 --- a/usr.bin/ee/doc/new_curse.c +++ b/usr.bin/ee/doc/new_curse.c @@ -37,14 +37,14 @@ | Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon | All are rights reserved. | - | $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/doc/new_curse.c,v 1.1.1.1 1995/08/30 07:28:06 jkh Exp $ + | $Header: /home/ncvs/src/usr.bin/ee/doc/Attic/new_curse.c,v 1.1.1.1.2.1 1996/06/05 02:56:39 jkh Exp $ | */ char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon", "All rights are reserved."}; -char * new_curse_name= "@(#) new_curse.c $Revision: 1.1.1.1 $"; +char * new_curse_name= "@(#) new_curse.c $Revision: 1.1.1.1.2.1 $"; #include "new_curse.h" #include <signal.h> diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1 index b51d9d7949dbe..e01b92cff6b3c 100644 --- a/usr.bin/ee/ee.1 +++ b/usr.bin/ee/ee.1 @@ -4,7 +4,7 @@ .\" .\" nroff -man ee.1 .\" -.\" $Header: /home/ncvs/src/usr.bin/ee/ee.1,v 1.2 1996/01/30 13:48:39 mpp Exp $ +.\" $Header: /home/ncvs/src/usr.bin/ee/ee.1,v 1.3 1996/02/02 00:25:36 mpp Exp $ .\" .\" .TH ee 1 "" "" "" "" diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index 0556fd7322f48..922532ceddab2 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -49,7 +49,7 @@ | proprietary information which is protected by | copyright. All rights are reserved. | - | $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/ee.c,v 1.3.2.2 1996/05/27 21:07:11 joerg Exp $ + | $Header: /home/ncvs/src/usr.bin/ee/ee.c,v 1.3.2.3 1996/06/05 02:56:37 jkh Exp $ | */ @@ -62,7 +62,7 @@ char *ee_long_notice[] = { "copyright. All rights are reserved." }; -char *version = "@(#) ee, version 1.2.4 $Revision: 1.3.2.2 $"; +char *version = "@(#) ee, version 1.2.4 $Revision: 1.3.2.3 $"; #ifdef NCURSE #include "new_curse.h" diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg index 042bc7fd9490e..65c8cd5ea7b3b 100644 --- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg +++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg @@ -3,7 +3,7 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.1.2.1 1996/05/27 21:07:59 joerg Exp $ +$ $Header: /home/ncvs/src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.1.2.2 1996/06/05 02:56:41 jkh Exp $ $ $set 1 $quote " diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg index e5cc9c7705834..45a6f9e58535a 100644 --- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg +++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg @@ -3,7 +3,7 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.1.2.1 1996/05/27 21:08:02 joerg Exp $ +$ $Header: /home/ncvs/src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.1.2.2 1996/06/05 02:56:43 jkh Exp $ $ $set 1 $quote " diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg index f98bf5c64e0a5..a18281493926f 100644 --- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg +++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg @@ -3,7 +3,7 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $Id: ee.msg,v 1.1 1995/09/09 15:06:08 jmz Exp $ +$ $Id: ee.msg,v 1.1.2.1 1996/05/27 21:08:09 joerg Exp $ $ $set 1 $quote " diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1 index 5c6bdfbf943d7..68498c5aa5745 100644 --- a/usr.bin/fetch/fetch.1 +++ b/usr.bin/fetch/fetch.1 @@ -1,4 +1,4 @@ -.\" $Id: fetch.1,v 1.9 1996/09/23 22:24:15 wosch Exp $ +.\" $Id: fetch.1,v 1.1.1.1.2.2 1997/02/07 19:32:13 jkh Exp $ .Dd July 2, 1996 .Dt FETCH 1 .Os diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c index 7f19372492afb..f9e3568f7642a 100644 --- a/usr.bin/fetch/main.c +++ b/usr.bin/fetch/main.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $Id: main.c,v 1.26.2.2 1996/11/28 08:26:14 phk Exp $ */ +/* $Id: main.c,v 1.1.1.1.2.6 1997/02/07 19:32:14 jkh Exp $ */ #include <sys/types.h> #include <sys/socket.h> diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE index a8255b903a12c..b07d89685dc18 100644 --- a/usr.bin/file/LEGAL.NOTICE +++ b/usr.bin/file/LEGAL.NOTICE @@ -1,6 +1,6 @@ Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992. Written by Ian F. Darwin and others. -$Id: LEGAL.NOTICE,v 1.8 1993/03/17 11:35:30 ian Exp $ +$Id: LEGAL.NOTICE,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ This software is not subject to and may not be made subject to any license of the American Telephone and Telegraph Company (AT&T Inc.), diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT index 7fc5e3637f3bd..63d41b783b620 100644 --- a/usr.bin/file/MAINT +++ b/usr.bin/file/MAINT @@ -1,4 +1,4 @@ -$Id: MAINT,v 1.2 1993/09/23 21:47:01 christos Exp $ +$Id: MAINT,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ Maintenance notes: diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff index 224940b946e1d..d4b8377faa888 100644 --- a/usr.bin/file/Magdir/Localstuff +++ b/usr.bin/file/Magdir/Localstuff @@ -1,3 +1,3 @@ -# $Id: Localstuff,v 1.2 1993/01/05 13:22:25 ian Exp $ +# $Id: Localstuff,v 1.1.1.1 1994/09/03 19:16:24 csgr Exp $ # Add any locally-observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. diff --git a/usr.bin/file/Magdir/sgml b/usr.bin/file/Magdir/sgml index bb8b5dd43d19e..db8434e33c0ad 100644 --- a/usr.bin/file/Magdir/sgml +++ b/usr.bin/file/Magdir/sgml @@ -1,4 +1,4 @@ -# $Id: sgml,v 1.3 1993/01/05 12:52:44 ian Exp $ +# $Id: sgml,v 1.1.1.1 1994/09/03 19:16:28 csgr Exp $ # SGML goop, mostly from rph@sq. 0 string \<!DOCTYPE Exported SGML document 0 string \<!doctype Exported SGML document diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad index e49d052ee7cbe..deb4a14f7d6b2 100644 --- a/usr.bin/file/Magdir/softquad +++ b/usr.bin/file/Magdir/softquad @@ -1,5 +1,5 @@ # SoftQuad Publishing Software magic numbers -# $Id: softquad,v 1.8 1993/02/19 14:36:43 ian Exp $ +# $Id: softquad,v 1.1.1.1 1994/09/03 19:16:28 csgr Exp $ # Author/Editor and RulesBuilder # # XXX - byte order? diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index a0b27d20dfc78..e0f06c84c4a47 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -1,6 +1,6 @@ # Makefile for file(1) cmd. # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE. -# @(#)$Id: Makefile,v 1.2 1994/09/03 19:31:14 csgr Exp $ +# @(#)$Id: Makefile,v 1.3 1995/05/30 06:29:57 rgrimes Exp $ # # This software is not subject to any license of the American Telephone # and Telegraph Company or of the Regents of the University of California. diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING index 06790e6ace038..6f62a3ef35be7 100644 --- a/usr.bin/file/PORTING +++ b/usr.bin/file/PORTING @@ -1,5 +1,5 @@ Portability of the new file(1) command. -@(#) $Id: PORTING,v 1.11 1993/09/23 21:47:23 christos Exp $ +@(#) $Id: PORTING,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ Read this file only if the program doesn't compile on your system. diff --git a/usr.bin/file/README b/usr.bin/file/README index 2ee8e6777a40d..ff11bdd2d35ee 100644 --- a/usr.bin/file/README +++ b/usr.bin/file/README @@ -1,5 +1,5 @@ ** README for file(1) Command ** -@(#) $Id: README,v 1.20 1993/09/23 21:47:01 christos Exp $ +@(#) $Id: README,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ This is Release 3.x of Ian Darwin's (copyright but distributable) file(1) command. Release 3.x is scheduled for inclusion in the diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c index 6cdacaaa6c356..9b01354ab405b 100644 --- a/usr.bin/file/apprentice.c +++ b/usr.bin/file/apprentice.c @@ -33,7 +33,7 @@ #ifndef lint static char *moduleid = - "@(#)$Id: apprentice.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $"; + "@(#)$Id: apprentice.c,v 1.2 1995/05/30 06:29:58 rgrimes Exp $"; #endif /* lint */ #define EATAB {while (isascii((unsigned char) *l) && \ diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c index 0edb0caa73900..345e0125ee3ef 100644 --- a/usr.bin/file/ascmagic.c +++ b/usr.bin/file/ascmagic.c @@ -36,7 +36,7 @@ #ifndef lint static char *moduleid = - "@(#)$Id: ascmagic.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $"; + "@(#)$Id: ascmagic.c,v 1.2 1995/05/30 06:29:59 rgrimes Exp $"; #endif /* lint */ /* an optimisation over plain strcmp() */ diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c index 1c0d824e3dfc5..adf9226d10e53 100644 --- a/usr.bin/file/compress.c +++ b/usr.bin/file/compress.c @@ -4,7 +4,7 @@ * information if recognized * uncompress(method, old, n, newch) - uncompress old into new, * using method, return sizeof new - * $Id: compress.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ + * $Id: compress.c,v 1.2 1995/05/30 06:30:00 rgrimes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh index 6112e9655fcfe..b801525935aa4 100644 --- a/usr.bin/file/cvsimport.sh +++ b/usr.bin/file/cvsimport.sh @@ -3,7 +3,7 @@ # This shell script can be used in order to handle future imports # of newer versions of file(1) # -# $Id$ +# $Id: cvsimport.sh,v 1.1 1994/09/03 23:08:40 csgr Exp $ if [ $# -ne 2 ] ; then echo "usage: $0 <major> <minor>" 1>&2 exit 1 diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1 index 532116e19a14c..e4c479dae1078 100644 --- a/usr.bin/file/file.1 +++ b/usr.bin/file/file.1 @@ -1,5 +1,5 @@ .TH FILE 1 "Copyright but distributable" -.\# $Id: file.1,v 1.2 1994/09/03 19:31:15 csgr Exp $ +.\# $Id: file.1,v 1.2.6.1 1996/01/30 13:59:21 mpp Exp $ .SH NAME .I file \- determine file type diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index 4b12a9aea4a42..9e22b8dd97c48 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -26,7 +26,7 @@ */ #ifndef lint static char *moduleid = - "@(#)$Id: file.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $"; + "@(#)$Id: file.c,v 1.2 1995/05/30 06:30:01 rgrimes Exp $"; #endif /* lint */ #include <stdio.h> diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h index a92c9ffed80cc..f96dc40a4aaaf 100644 --- a/usr.bin/file/file.h +++ b/usr.bin/file/file.h @@ -1,6 +1,6 @@ /* * file.h - definitions for file(1) program - * @(#)$Id: file.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ + * @(#)$Id: file.h,v 1.2 1995/05/30 06:30:02 rgrimes Exp $ * * Copyright (c) Ian F. Darwin, 1987. * Written by Ian F. Darwin. diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c index 5a66d31fbd738..005999c6b61df 100644 --- a/usr.bin/file/fsmagic.c +++ b/usr.bin/file/fsmagic.c @@ -46,7 +46,7 @@ #ifndef lint static char *moduleid = - "@(#)$Id: fsmagic.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $"; + "@(#)$Id: fsmagic.c,v 1.2 1995/05/30 06:30:03 rgrimes Exp $"; #endif /* lint */ int diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c index fc9cce2782b6f..fff57b68c0c3a 100644 --- a/usr.bin/file/is_tar.c +++ b/usr.bin/file/is_tar.c @@ -5,7 +5,7 @@ * Pubic Domain version written 26 Aug 1985 John Gilmore (ihnp4!hoptoad!gnu). * * @(#)list.c 1.18 9/23/86 Public Domain - gnu - * $Id: is_tar.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $ + * $Id: is_tar.c,v 1.2 1995/05/30 06:30:04 rgrimes Exp $ * * Comments changed and some code/comments reformatted * for file command by Ian Darwin. diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5 index 6c6f3ef267677..34b8d47382655 100644 --- a/usr.bin/file/magic.5 +++ b/usr.bin/file/magic.5 @@ -191,4 +191,4 @@ indirect offsets. .\" the changes I posted to the S5R2 version. .\" .\" Modified for Ian Darwin's version of the file command. -.\" @(#)$Id: magic.man,v 1.11 1994/05/03 17:58:23 christos Exp $ +.\" @(#)$Id: magic.5,v 1.2 1994/09/03 19:31:16 csgr Exp $ diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h index 5d989ee564aeb..2dd46b4cc304c 100644 --- a/usr.bin/file/names.h +++ b/usr.bin/file/names.h @@ -10,7 +10,7 @@ * * See LEGAL.NOTICE * - * $Id: names.h,v 1.11 1993/09/16 21:14:20 christos Exp $ + * $Id: names.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ */ /* these types are used to index the table 'types': keep em in sync! */ diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h index b33a113e6264b..e0dff35d9256f 100644 --- a/usr.bin/file/patchlevel.h +++ b/usr.bin/file/patchlevel.h @@ -3,9 +3,12 @@ /* * Patchlevel file for Ian Darwin's MAGIC command. - * $Id: patchlevel.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ + * $Id: patchlevel.h,v 1.2 1995/05/30 06:30:06 rgrimes Exp $ * * $Log: patchlevel.h,v $ + * Revision 1.2 1995/05/30 06:30:06 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.1 1994/09/03 19:16:23 csgr * Bring in file 3.14 by Ian Darwin (and Christos Zoulas) * diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c index 44a079eadf608..40b2cea34d475 100644 --- a/usr.bin/file/print.c +++ b/usr.bin/file/print.c @@ -40,7 +40,7 @@ #ifndef lint static char *moduleid = - "@(#)$Id: print.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $"; + "@(#)$Id: print.c,v 1.2 1995/05/30 06:30:08 rgrimes Exp $"; #endif /* lint */ #define SZOF(a) (sizeof(a) / sizeof(a[0])) diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c index 737e6d644800a..7e7706ebad828 100644 --- a/usr.bin/file/softmagic.c +++ b/usr.bin/file/softmagic.c @@ -34,7 +34,7 @@ #ifndef lint static char *moduleid = - "@(#)$Id: softmagic.c,v 1.2 1995/05/24 02:54:30 ache Exp $"; + "@(#)$Id: softmagic.c,v 1.3 1995/05/30 06:30:09 rgrimes Exp $"; #endif /* lint */ static int match __P((unsigned char *, int)); diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h index fd6f0c94f744f..cca00fe3117ed 100644 --- a/usr.bin/file/tar.h +++ b/usr.bin/file/tar.h @@ -5,7 +5,7 @@ * * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu. * - * $Id: tar.h,v 1.3 1992/09/08 15:32:41 ian Exp $ # checkin only + * $Id: tar.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ # checkin only */ /* diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile index f19c125af3d45..f753741641351 100644 --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1994/09/24 02:55:45 davidg Exp $ +# $Id: Makefile,v 1.1 1995/01/29 00:49:42 phk Exp $ PROG= file2c MAN1= file2c.1 diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1 index c2dda08198ecd..3143cd2adff66 100644 --- a/usr.bin/file2c/file2c.1 +++ b/usr.bin/file2c/file2c.1 @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" --------------------------------------------------------------------------- .\" -.\" $Id$ +.\" $Id: file2c.1,v 1.1 1995/01/29 00:49:49 phk Exp $ .\" .Dd Jan 28, 1995 .Dt FILE2C 1 diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c index 0bad9045fcb33..904fdc0a95ae9 100644 --- a/usr.bin/file2c/file2c.c +++ b/usr.bin/file2c/file2c.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: file2c.c,v 1.1 1995/01/29 00:49:57 phk Exp $ * */ diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile index b738deb5e4a76..97f6f87f83ce3 100644 --- a/usr.bin/gencat/Makefile +++ b/usr.bin/gencat/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/03/30 12:49:06 jkh Exp $ PROG= gencat SRCS= gencat.c genlib.c diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile index 2b373ee386acb..d7efd390e9be4 100644 --- a/usr.bin/getopt/Makefile +++ b/usr.bin/getopt/Makefile @@ -1,4 +1,4 @@ -# $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/getopt/Makefile,v 1.1 1993/07/26 22:22:35 nate Exp $ +# $Header: /home/ncvs/src/usr.bin/getopt/Makefile,v 1.1.6.1 1996/06/05 02:56:45 jkh Exp $ # PROG = getopt diff --git a/usr.bin/host/host.1 b/usr.bin/host/host.1 index 29f9411083616..aec8484b83056 100644 --- a/usr.bin/host/host.1 +++ b/usr.bin/host/host.1 @@ -50,7 +50,7 @@ .\" SOFTWARE. .\" - .\" --Copyright-- -.\" $Id: host.1,v 1.2 1994/09/22 21:52:02 pst Exp $ +.\" $Id: host.1,v 1.3 1994/12/12 00:23:00 ats Exp $ .TH HOST 1 .SH NAME host \- look up host names using domain server diff --git a/usr.bin/host/host.c b/usr.bin/host/host.c index d505583a26ad5..ce1b7f308e2f2 100644 --- a/usr.bin/host/host.c +++ b/usr.bin/host/host.c @@ -67,7 +67,7 @@ char copyright[] = */ #ifndef lint -static char rcsid[] = "$Id: host.c,v 1.3.4.1 1995/08/30 04:06:18 davidg Exp $"; +static char rcsid[] = "$Id: host.c,v 1.3.4.2 1996/01/21 20:11:54 jkh Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile index 98fd8f84f0477..29ecd7b539d0e 100644 --- a/usr.bin/ipcrm/Makefile +++ b/usr.bin/ipcrm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3.2.1 1994/08/09 13:47:15 mycroft Exp $ +# $Id: Makefile,v 1.1 1994/09/13 16:52:09 dfr Exp $ PROG= ipcrm diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1 index 19bb6e622e376..32217adf3d043 100644 --- a/usr.bin/ipcrm/ipcrm.1 +++ b/usr.bin/ipcrm/ipcrm.1 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ipcrm.1,v 1.1 1994/08/09 02:26:30 glass Exp $ +.\" $Id: ipcrm.1,v 1.1 1994/09/13 16:52:10 dfr Exp $ .\"" .Dd August 8th, 1994 .Dt ipcrm 1 diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c index ff8a99ecc6c8c..14eb9333db6a8 100644 --- a/usr.bin/ipcrm/ipcrm.c +++ b/usr.bin/ipcrm/ipcrm.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ipcrm.c,v 1.1 1994/09/13 16:52:12 dfr Exp $ + * $Id: ipcrm.c,v 1.2 1995/05/30 06:30:56 rgrimes Exp $ */ #include <stdio.h> diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile index eab410030ad45..0359e020742a9 100644 --- a/usr.bin/ipcs/Makefile +++ b/usr.bin/ipcs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1994/06/18 21:09:40 cgd Exp $ +# $Id: Makefile,v 1.2 1994/09/13 16:59:27 dfr Exp $ PROG= ipcs BINGRP= kmem diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1 index a6d0344f7da9f..dac9cec5cdc89 100644 --- a/usr.bin/ipcs/ipcs.1 +++ b/usr.bin/ipcs/ipcs.1 @@ -27,7 +27,7 @@ .\" (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: ipcs.1,v 1.1 1994/09/13 16:59:28 dfr Exp $ +.\" $Id: ipcs.1,v 1.2 1994/11/19 18:19:27 nate Exp $ .\" .Dd June 18, 1994 .Dt "IPCS" 1 diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c index 27888cae97b7a..d655df3e281bd 100644 --- a/usr.bin/ipcs/ipcs.c +++ b/usr.bin/ipcs/ipcs.c @@ -24,7 +24,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ipcs.c,v 1.3 1994/09/19 10:24:38 davidg Exp $ + * $Id: ipcs.c,v 1.3.6.2 1996/06/05 02:56:46 jkh Exp $ */ #include <stdio.h> diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl index 260a72479f987..10ab9d2d3bae3 100644 --- a/usr.bin/keyinfo/keyinfo.pl +++ b/usr.bin/keyinfo/keyinfo.pl @@ -3,7 +3,7 @@ # Search /etc/skeykeys for the skey string for this user OR user specified # in 1st parameter. # -# $Id$ +# $Id: keyinfo.pl,v 1.1 1996/04/26 21:35:10 joerg Exp $ # die "usage: keyinfo [user]\n" unless $#ARGV < 1; diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1 index 1fb58a93a0599..17b950c6ebf79 100644 --- a/usr.bin/killall/killall.1 +++ b/usr.bin/killall/killall.1 @@ -22,7 +22,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: killall.1,v 1.4 1996/05/30 22:04:05 smpatel Exp $ +.\" $Id: killall.1,v 1.3.2.1 1996/06/23 22:03:37 wosch Exp $ .\" .Dd June 25, 1995 .Os FreeBSD 2.2 diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl index d91746763bc38..9f19dbae71bb4 100755 --- a/usr.bin/killall/killall.pl +++ b/usr.bin/killall/killall.pl @@ -30,7 +30,7 @@ # # killall - kill processes by name # -# $Id: killall.pl,v 1.5 1996/05/30 22:04:09 smpatel Exp $ +# $Id: killall.pl,v 1.4.2.1 1996/06/23 22:03:37 wosch Exp $ # $ENV{'PATH'} = '/bin:/usr/bin'; # security diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index f0dd55ab11730..484d51d4fb6ac 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -42,7 +42,7 @@ static char copyright[] = static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: ktrace.c,v 1.3.4.1 1996/06/21 01:12:18 jraynard Exp $"; + "$Id: ktrace.c,v 1.3.4.2 1996/06/30 09:42:42 joerg Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile index 235c9b6e12bd4..39901fa6f3b98 100644 --- a/usr.bin/kzip/Makefile +++ b/usr.bin/kzip/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/10/06 02:42:11 peter Exp $ +# $Id: Makefile,v 1.1.4.1 1995/10/06 02:53:46 jkh Exp $ PROG= kzip NOMAN= toobad diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c index b5ec7f1e2148c..dd589577f1796 100644 --- a/usr.bin/kzip/kzip.c +++ b/usr.bin/kzip/kzip.c @@ -9,7 +9,7 @@ * Copyright (C) 1993 Hannu Savolainen * Ported to 386bsd by Serge Vakulenko * based on tools/build.c by Linus Torvalds - * $Id: kzip.c,v 1.4 1995/10/06 02:42:15 peter Exp $ + * $Id: kzip.c,v 1.3.4.1 1995/10/06 02:53:48 jkh Exp $ * */ diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h index 48d1369d59130..0cf7ad9b1b3dc 100644 --- a/usr.bin/lex/FlexLexer.h +++ b/usr.bin/lex/FlexLexer.h @@ -1,4 +1,4 @@ -// $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/FlexLexer.h,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $ +// $Header: /home/ncvs/src/usr.bin/lex/FlexLexer.h,v 1.1.1.1.6.1 1996/06/05 02:56:48 jkh Exp $ // FlexLexer.h -- define classes for lexical analyzers generated by flex diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index 41d4afddceb7e..db6787c35262d 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $ +# $Id: Makefile,v 1.2 1994/08/27 09:52:30 csgr Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c index 8a1e2784655c4..c4b0c2b640146 100644 --- a/usr.bin/lex/ccl.c +++ b/usr.bin/lex/ccl.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/ccl.c,v 1.2 1995/05/30 06:31:06 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/ccl.c,v 1.2.4.1 1996/06/05 02:56:49 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c index 62ffa0c7f6b25..077cdf68835ad 100644 --- a/usr.bin/lex/dfa.c +++ b/usr.bin/lex/dfa.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/dfa.c,v 1.2 1995/05/30 06:31:08 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/dfa.c,v 1.2.4.1 1996/06/05 02:56:50 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c index e186b2794f44e..70c3a6c115e49 100644 --- a/usr.bin/lex/ecs.c +++ b/usr.bin/lex/ecs.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/ecs.c,v 1.2 1995/05/30 06:31:09 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/ecs.c,v 1.2.4.1 1996/06/05 02:56:51 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl index 92f909981a7fb..054779b1cb553 100644 --- a/usr.bin/lex/flex.skl +++ b/usr.bin/lex/flex.skl @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/flex.skl,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $ + * $Header: /home/ncvs/src/usr.bin/lex/flex.skl,v 1.1.1.1.6.1 1996/06/05 02:56:51 jkh Exp $ */ #define FLEX_SCANNER diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h index d2fc16bb5c3be..2ddc6476d6f36 100644 --- a/usr.bin/lex/flexdef.h +++ b/usr.bin/lex/flexdef.h @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/flexdef.h,v 1.2 1995/05/30 06:31:12 rgrimes Exp $ (LBL) */ +/* @(#) $Header: /home/ncvs/src/usr.bin/lex/flexdef.h,v 1.2.4.1 1996/06/05 02:56:52 jkh Exp $ (LBL) */ #include <stdio.h> #include <ctype.h> diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c index 7d06703ed8a05..4c68b4bd74872 100644 --- a/usr.bin/lex/gen.c +++ b/usr.bin/lex/gen.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/gen.c,v 1.2 1995/05/30 06:31:13 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/gen.c,v 1.2.4.1 1996/06/05 02:56:54 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c index 70a1237238d3f..6b61e41718262 100644 --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/initscan.c,v 1.2 1995/05/30 06:31:14 rgrimes Exp $ + * $Header: /home/ncvs/src/usr.bin/lex/initscan.c,v 1.2.4.1 1996/06/05 02:56:55 jkh Exp $ */ #define FLEX_SCANNER @@ -894,7 +894,7 @@ char *yytext; * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/initscan.c,v 1.2 1995/05/30 06:31:14 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/initscan.c,v 1.2.4.1 1996/06/05 02:56:55 jkh Exp $ */ #include "flexdef.h" #include "parse.h" diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index 689b46018e792..bbc7c7c704d35 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $ +# $Id: Makefile,v 1.2 1994/08/25 23:11:07 wollman Exp $ LIB= ln SRCS= libmain.c libyywrap.c diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c index a7efd3abdcc3b..e0cdb24716bec 100644 --- a/usr.bin/lex/lib/libmain.c +++ b/usr.bin/lex/lib/libmain.c @@ -1,6 +1,6 @@ /* libmain - flex run-time support library "main" function */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/lib/libmain.c,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/lib/libmain.c,v 1.1.1.1.6.1 1996/06/05 02:57:09 jkh Exp $ */ extern int yylex(); diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c index c14876b47fb0a..65af0c01e74d9 100644 --- a/usr.bin/lex/lib/libyywrap.c +++ b/usr.bin/lex/lib/libyywrap.c @@ -1,6 +1,6 @@ /* libyywrap - flex run-time support library "yywrap" function */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/lib/libyywrap.c,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/lib/libyywrap.c,v 1.1.1.1.6.1 1996/06/05 02:57:10 jkh Exp $ */ int yywrap() { diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c index 116901b91018b..2e8e8f7774928 100644 --- a/usr.bin/lex/main.c +++ b/usr.bin/lex/main.c @@ -32,7 +32,7 @@ char copyright[] = All rights reserved.\n"; #endif /* not lint */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/main.c,v 1.2 1995/05/30 06:31:15 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/main.c,v 1.2.4.1 1996/06/05 02:56:56 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c index 37889e50438a1..f9924bb1644c3 100644 --- a/usr.bin/lex/misc.c +++ b/usr.bin/lex/misc.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/misc.c,v 1.2 1995/05/30 06:31:16 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/misc.c,v 1.2.4.1 1996/06/05 02:56:57 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c index 5007b8ca9f088..e2ec58dfc6b9f 100644 --- a/usr.bin/lex/nfa.c +++ b/usr.bin/lex/nfa.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/nfa.c,v 1.2 1995/05/30 06:31:17 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/nfa.c,v 1.2.4.1 1996/06/05 02:56:59 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y index 4cd4db9dc3d8b..3868e9d743b95 100644 --- a/usr.bin/lex/parse.y +++ b/usr.bin/lex/parse.y @@ -29,7 +29,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/parse.y,v 1.1.1.1 1994/08/24 13:10:32 csgr Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/parse.y,v 1.1.1.1.6.1 1996/06/05 02:57:00 jkh Exp $ */ /* Some versions of bison are broken in that they use alloca() but don't diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l index 59742c56c615b..ceea1269c87bc 100644 --- a/usr.bin/lex/scan.l +++ b/usr.bin/lex/scan.l @@ -27,7 +27,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/scan.l,v 1.1.1.1 1994/08/24 13:10:31 csgr Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/scan.l,v 1.1.1.1.6.1 1996/06/05 02:57:01 jkh Exp $ */ #include "flexdef.h" #include "parse.h" diff --git a/usr.bin/lex/skel.c b/usr.bin/lex/skel.c index f7030209758db..f1b6f96b6edfe 100644 --- a/usr.bin/lex/skel.c +++ b/usr.bin/lex/skel.c @@ -6,7 +6,7 @@ char *skel[] = { "/* A lexical scanner generated by flex */", "", "/* Scanner skeleton version:", - " * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/skel.c,v 1.1.1.1 1994/08/24 13:10:31 csgr Exp $", + " * $Header: /home/ncvs/src/usr.bin/lex/skel.c,v 1.1.1.1.6.1 1996/06/05 02:57:02 jkh Exp $", " */", "", "#define FLEX_SCANNER", diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c index fde1ef4236c43..da0806f7ec23f 100644 --- a/usr.bin/lex/sym.c +++ b/usr.bin/lex/sym.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/sym.c,v 1.2 1995/05/30 06:31:18 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/sym.c,v 1.2.4.1 1996/06/05 02:57:03 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c index d5185ebea4be8..e5b9b8696e5e9 100644 --- a/usr.bin/lex/tblcmp.c +++ b/usr.bin/lex/tblcmp.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/tblcmp.c,v 1.2 1995/05/30 06:31:19 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/tblcmp.c,v 1.2.4.1 1996/06/05 02:57:04 jkh Exp $ */ #include "flexdef.h" diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c index 0c915447512bd..b655fe6c9b7ec 100644 --- a/usr.bin/lex/yylex.c +++ b/usr.bin/lex/yylex.c @@ -26,7 +26,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/yylex.c,v 1.2 1995/05/30 06:31:20 rgrimes Exp $ */ +/* $Header: /home/ncvs/src/usr.bin/lex/yylex.c,v 1.2.4.1 1996/06/05 02:57:04 jkh Exp $ */ #include <ctype.h> #include "flexdef.h" diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 9b9a7edae6100..a456258a1f02b 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.12 1995/03/18 17:18:15 nate Exp $ +# $Id: Makefile,v 1.13 1995/05/30 06:31:25 rgrimes Exp $ PROG= login MAN1= login.1 diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile index 3b25443ca3a2d..b41f380b4c453 100644 --- a/usr.bin/lsvfs/Makefile +++ b/usr.bin/lsvfs/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/22 01:25:55 wollman Exp $ PROG= lsvfs .include <bsd.prog.mk> diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1 index 703a620f517c2..403f826d1b9ef 100644 --- a/usr.bin/lsvfs/lsvfs.1 +++ b/usr.bin/lsvfs/lsvfs.1 @@ -1,4 +1,4 @@ -.\" $Id: lsvfs.1,v 1.2 1995/03/16 18:37:46 wollman Exp $ +.\" $Id: lsvfs.1,v 1.2.4.1 1996/01/30 13:59:58 mpp Exp $ .\" Garrett A. Wollman, September 1994 .\" This file is in the public domain. .\" diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c index ccfc03877b7ac..afa7ce77bc73e 100644 --- a/usr.bin/lsvfs/lsvfs.c +++ b/usr.bin/lsvfs/lsvfs.c @@ -3,7 +3,7 @@ * Garrett A. Wollman, September 1994 * This file is in the public domain. * - * $Id: lsvfs.c,v 1.4 1995/03/16 20:29:11 wollman Exp $ + * $Id: lsvfs.c,v 1.5 1995/03/16 21:43:03 wollman Exp $ */ #include <sys/types.h> diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index 53180191e8f5e..9f7f2055db82d 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -1,5 +1,5 @@ .\" -.\" @(#) $Id: m4.1,v 1.4 1994/01/16 00:30:31 swallace Exp $ +.\" @(#) $Id: m4.1,v 1.1 1994/08/11 01:06:29 jkh Exp $ .\" .Dd January 26, 1993 .Dt m4 1 diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index c28b6f840dce8..d9986d2a1a07a 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile,v 1.4 1995/06/16 22:46:38 ache Exp $ +# $Id: Makefile,v 1.3.4.1 1995/08/08 04:00:16 ache Exp $ PROG= make CFLAGS+= -I${.CURDIR} -DPOSIX -DSYSVINCLUDE diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms index eca49d947383b..05da5603b4f2f 100644 --- a/usr.bin/make/PSD.doc/tutorial.ms +++ b/usr.bin/make/PSD.doc/tutorial.ms @@ -43,7 +43,7 @@ .\" is numeric, it is taken as the depth for numbering (as for .NH), else .\" the default (1) is assumed. .\" -.\" $Id: tutorial.ms,v 1.4 89/01/08 20:20:22 adam Exp Locker: adam $ +.\" $Id: tutorial.ms,v 1.1.1.1 1994/05/27 12:32:16 rgrimes Exp $ .\" .\" @P The initial paragraph distance. .\" @Q The piece of section number to increment (or 0 if none given) diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h index 2c25ead53ed54..b6ec1100dcdd5 100644 --- a/usr.bin/make/pathnames.h +++ b/usr.bin/make/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.2 1993/08/01 18:11:58 mycroft Exp $ + * $Id: pathnames.h,v 1.2 1995/01/23 21:01:52 jkh Exp $ */ #define _PATH_OBJDIR "obj" diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c index 41dd195d89461..14adcbb27ffa0 100644 --- a/usr.bin/make/str.c +++ b/usr.bin/make/str.c @@ -38,7 +38,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90"; */ -static char *rcsid = "$Id: str.c,v 1.5 1995/06/18 12:34:12 ache Exp $"; +static char *rcsid = "$Id: str.c,v 1.4.4.1 1995/08/08 04:00:29 ache Exp $"; #endif /* not lint */ #include "make.h" diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile index a240c05b1fa5a..ef9a00e688a82 100644 --- a/usr.bin/mk_cmds/Makefile +++ b/usr.bin/mk_cmds/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/01/19 22:27:57 wollman Exp $ PROG= mk_cmds # diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile index fb6161fedf1bd..413c7767eaa81 100644 --- a/usr.bin/mklocale/data/Makefile +++ b/usr.bin/mklocale/data/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1995/11/03 14:51:45 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile index 4780c07209fb5..c643c8bacebb4 100644 --- a/usr.bin/modstat/Makefile +++ b/usr.bin/modstat/Makefile @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: Makefile,v 1.1.6.2 1996/06/05 02:57:14 jkh Exp $ +# $Id: Makefile,v 1.1.6.3 1997/02/05 22:58:44 jgreco Exp $ # PROG= modstat diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8 index 99667e2614898..68f9b77e0ab42 100644 --- a/usr.bin/modstat/modstat.8 +++ b/usr.bin/modstat/modstat.8 @@ -23,7 +23,7 @@ .\" (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: modstat.8,v 1.1 1994/08/19 12:14:04 davidg Exp $ +.\" $Id: modstat.8,v 1.2 1994/08/19 13:38:29 davidg Exp $ .\" .Dd June 7, 1993 .Dt MODSTAT 8 diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c index 7184223d48449..dc09b9e1d63ba 100644 --- a/usr.bin/modstat/modstat.c +++ b/usr.bin/modstat/modstat.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: modstat.c,v 1.3 1995/04/20 05:08:53 wpaul Exp $ + * $Id: modstat.c,v 1.3.4.1 1997/02/05 22:58:47 jgreco Exp $ */ #include <stdio.h> diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile index 534d1608fc76c..573ea127e53bf 100644 --- a/usr.bin/more/Makefile +++ b/usr.bin/more/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id$ +# $Id: Makefile,v 1.3 1995/02/21 03:46:45 wollman Exp $ PROG= more CFLAGS+=-I${.CURDIR} -DTERMIOS diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 8613f79cb5eab..922893f5d2e5c 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id$ +# $Id: Makefile,v 1.3 1995/02/21 04:15:13 wollman Exp $ PROG= msgs DPADD= ${LIBTERMCAP} diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c index 72fbf32666016..78b42165a9d0b 100644 --- a/usr.bin/netstat/iso.c +++ b/usr.bin/netstat/iso.c @@ -36,8 +36,8 @@ static char sccsid[] = "@(#)iso.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/netstat/iso.c,v 1.2 1995/04/09 05:33:17 davidg Exp $ - * $Source: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/netstat/iso.c,v $ + * $Header: /home/ncvs/src/usr.bin/netstat/iso.c,v 1.2.4.1 1996/06/05 02:57:17 jkh Exp $ + * $Source: /home/ncvs/src/usr.bin/netstat/iso.c,v $ */ /******************************************************************************* Copyright IBM Corporation 1987 diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index e3331db1489d3..d8a8b08bd7f60 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -36,7 +36,7 @@ static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$Id: route.c,v 1.5 1995/05/30 06:32:53 rgrimes Exp $"; + "$Id: route.c,v 1.5.4.1 1996/06/24 00:13:50 peter Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1 index 9e778c7aec87d..6ce86578b97cc 100644 --- a/usr.bin/nfsstat/nfsstat.1 +++ b/usr.bin/nfsstat/nfsstat.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93 -.\" $Id$ +.\" $Id: nfsstat.1,v 1.3 1994/10/23 23:25:42 wollman Exp $ .\" .Dd June 6, 1993 .Dt NFSSTAT 1 diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 169e8d10d4638..f386f1f0ed3b1 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -43,7 +43,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";*/ static const char rcsid[] = - "$Id$"; + "$Id: nfsstat.c,v 1.2 1994/10/23 23:25:43 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 511b2c432f552..2d9734fc1bbad 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $Id: Makefile,v 1.18 1995/09/14 21:02:16 gibbs Exp $ +# $Id: Makefile,v 1.14.2.3 1995/10/06 01:58:43 davidg Exp $ PROG= passwd SRCS= local_passwd.c yp_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h index 7a4bd127c98d6..43c2d8e6ab26c 100644 --- a/usr.bin/passwd/extern.h +++ b/usr.bin/passwd/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)extern.h 8.1 (Berkeley) 4/2/94 - * $Id$ + * $Id: extern.h,v 1.2 1995/01/20 22:03:36 wollman Exp $ */ int krb_passwd __P((char *, char *, char *, char *)); diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index 15d916d193c23..d1f371dc4b38b 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: local_passwd.c,v 1.8 1995/12/16 09:45:12 markm Exp $ + * $Id: local_passwd.c,v 1.2.6.4 1996/02/07 15:10:16 peter Exp $ */ #ifndef lint diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c index ff1e1861a4591..5c2dea57746fe 100644 --- a/usr.bin/passwd/passwd.c +++ b/usr.bin/passwd/passwd.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint static char sccsid[] = "From: @(#)passwd.c 8.3 (Berkeley) 4/2/94"; static const char rcsid[] = - "$Id: passwd.c,v 1.6 1995/09/02 04:02:27 wpaul Exp $"; + "$Id: passwd.c,v 1.3.4.2 1995/10/06 01:58:45 davidg Exp $"; #endif /* not lint */ #include <err.h> diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c index 07006f30cc1e4..89d225ee388ae 100644 --- a/usr.bin/rdist/docmd.c +++ b/usr.bin/rdist/docmd.c @@ -34,7 +34,7 @@ #ifndef lint /*static char sccsid[] = "From: @(#)docmd.c 8.1 (Berkeley) 6/9/93";*/ static const char rcsid[] = - "$Id: docmd.c,v 1.3.4.1 1996/07/12 06:19:46 pst Exp $"; + "$Id: docmd.c,v 1.3.4.2 1997/02/09 15:03:27 eivind Exp $"; #endif /* not lint */ #include "defs.h" diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile index 3379b2751b15b..5769095e68a10 100644 --- a/usr.bin/rpcgen/Makefile +++ b/usr.bin/rpcgen/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/08/07 18:01:27 wollman Exp $ +# $Id: Makefile,v 1.2 1995/05/30 06:33:08 rgrimes Exp $ PROG= rpcgen SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \ diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index b410fa3118328..d8606db9054a0 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_clntout.c 1.2 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_clntout.c,v 1.1 1994/08/07 18:01:28 wollman Exp $"; +static char rcsid[] = "$Id: rpc_clntout.c,v 1.2 1995/05/30 06:33:09 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c index 734b2d2cca541..ef08944e44e44 100644 --- a/usr.bin/rpcgen/rpc_cout.c +++ b/usr.bin/rpcgen/rpc_cout.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_cout.c 1.8 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_cout.c,v 1.1 1994/08/07 18:01:29 wollman Exp $"; +static char rcsid[] = "$Id: rpc_cout.c,v 1.2 1995/05/30 06:33:10 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 9c2cd4edca745..3a51bae507906 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_hout.c 1.6 87/07/28 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_hout.c,v 1.1 1994/08/07 18:01:30 wollman Exp $"; +static char rcsid[] = "$Id: rpc_hout.c,v 1.2 1995/05/30 06:33:11 rgrimes Exp $"; #endif static int pconstdef(), pstructdef(), puniondef(), pdefine(), pprogramdef(), diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index 1344eb4277a75..40a9e2d31898b 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_main.c 1.7 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_main.c,v 1.2 1995/03/04 17:47:49 nate Exp $"; +static char rcsid[] = "$Id: rpc_main.c,v 1.3 1995/05/30 06:33:12 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c index d042b586ba8c8..8022105cbfb81 100644 --- a/usr.bin/rpcgen/rpc_parse.c +++ b/usr.bin/rpcgen/rpc_parse.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_parse.c 1.4 87/04/28 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_parse.c,v 1.2 1995/05/15 00:03:32 ache Exp $"; +static char rcsid[] = "$Id: rpc_parse.c,v 1.3 1995/05/30 06:33:14 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h index 38b8644b84060..25e203daba9e0 100644 --- a/usr.bin/rpcgen/rpc_parse.h +++ b/usr.bin/rpcgen/rpc_parse.h @@ -27,7 +27,7 @@ * Mountain View, California 94043 * * from: @(#)rpc_parse.h 1.3 87/03/09 (C) 1987 SMI - * $Id: rpc_parse.h,v 1.1 1994/08/07 18:01:33 wollman Exp $ + * $Id: rpc_parse.h,v 1.2 1995/05/30 06:33:14 rgrimes Exp $ */ /* diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c index 6450ab25a6d20..ecddaad88f22c 100644 --- a/usr.bin/rpcgen/rpc_scan.c +++ b/usr.bin/rpcgen/rpc_scan.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_scan.c 1.6 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_scan.c,v 1.1 1994/08/07 18:01:34 wollman Exp $"; +static char rcsid[] = "$Id: rpc_scan.c,v 1.2 1995/05/30 06:33:15 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h index 579df0f705f3d..a6e67bd97d0b9 100644 --- a/usr.bin/rpcgen/rpc_scan.h +++ b/usr.bin/rpcgen/rpc_scan.h @@ -28,7 +28,7 @@ * * from: @(#)rpc_scan.h 1.3 87/03/09 (C) 1987 SMI * from: @(#)rpc_scan.h 2.1 88/08/01 4.0 RPCSRC - * $Id: rpc_scan.h,v 1.1 1994/08/07 18:01:35 wollman Exp $ + * $Id: rpc_scan.h,v 1.2 1995/05/30 06:33:18 rgrimes Exp $ */ /* diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index c27fff06b6653..06558ad40a7b1 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_svcout.c 1.6 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_svcout.c,v 1.2 1995/03/04 17:47:50 nate Exp $"; +static char rcsid[] = "$Id: rpc_svcout.c,v 1.3 1995/05/30 06:33:20 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c index fb3307d158c1f..c2e4db138a35b 100644 --- a/usr.bin/rpcgen/rpc_util.c +++ b/usr.bin/rpcgen/rpc_util.c @@ -29,7 +29,7 @@ */ #ifndef lint /*static char sccsid[] = "from: @(#)rpc_util.c 1.5 87/06/24 (C) 1987 SMI";*/ -static char rcsid[] = "$Id: rpc_util.c,v 1.1 1994/08/07 18:01:37 wollman Exp $"; +static char rcsid[] = "$Id: rpc_util.c,v 1.2 1995/05/30 06:33:21 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h index 8aeea3516ccb9..3d655af22b1af 100644 --- a/usr.bin/rpcgen/rpc_util.h +++ b/usr.bin/rpcgen/rpc_util.h @@ -28,7 +28,7 @@ * * from: @(#)rpc_util.h 1.6 87/06/24 (C) 1987 SMI * from: @(#)rpc_util.h 2.1 88/08/01 4.0 RPCSRC - * $Id: rpc_util.h,v 1.1 1994/08/07 18:01:38 wollman Exp $ + * $Id: rpc_util.h,v 1.2 1995/05/30 06:33:22 rgrimes Exp $ */ /* diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1 index 5fd9274c740f3..dd40fc8003c9b 100644 --- a/usr.bin/rpcgen/rpcgen.1 +++ b/usr.bin/rpcgen/rpcgen.1 @@ -1,5 +1,5 @@ .\" from: @(#)rpcgen.1 2.2 88/08/02 4.0 RPCSRC -.\" $Id: rpcgen.1,v 1.1 1993/09/13 23:20:21 jtc Exp $ +.\" $Id: rpcgen.1,v 1.1 1994/08/07 18:01:39 wollman Exp $ .\" .Dd January 18, 1988 .Dt RPCGEN 1 diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile index 1605846fbea1e..4b2f3ee88fa73 100644 --- a/usr.bin/rpcinfo/Makefile +++ b/usr.bin/rpcinfo/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.2 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.2 1993/11/10 03:46:45 smace Exp $ +# $Id: Makefile,v 1.1 1994/08/07 18:23:23 wollman Exp $ PROG= rpcinfo MAN8 = rpcinfo.8 diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8 index c2c556decc81d..e52253b99b701 100644 --- a/usr.bin/rpcinfo/rpcinfo.8 +++ b/usr.bin/rpcinfo/rpcinfo.8 @@ -1,5 +1,5 @@ .\" from: @(#)rpcinfo.8c 2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI -.\" $Id: rpcinfo.8,v 1.1 1993/09/13 23:22:41 jtc Exp $ +.\" $Id: rpcinfo.8,v 1.1 1994/08/07 18:23:24 wollman Exp $ .\" .Dd December 17, 1987 .Dt RPCINFO 8 diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index 0258461202be4..aa203368f085c 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -1,7 +1,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/ /*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/ -static char rcsid[] = "$Id: rpcinfo.c,v 1.1 1994/08/07 18:23:25 wollman Exp $"; +static char rcsid[] = "$Id: rpcinfo.c,v 1.2 1995/05/30 06:33:23 rgrimes Exp $"; #endif /* diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index ac2deec15c70e..a7b4607fafc12 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint static char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94"; static char rcsid[] = - "$Id: rsh.c,v 1.4 1995/05/30 06:33:24 rgrimes Exp $"; + "$Id: rsh.c,v 1.4.4.1 1996/06/23 13:08:36 markm Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile index 1d53109f824f4..4882354332bcd 100644 --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/10 03:47:06 smace Exp $ +# $Id: Makefile,v 1.1.1.1 1994/08/28 15:01:31 csgr Exp $ PROG= rup MAN1= rup.1 diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1 index c228e44403137..bdb6b7a28bff8 100644 --- a/usr.bin/rup/rup.1 +++ b/usr.bin/rup/rup.1 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rup.1,v 1.2 1994/11/18 21:37:40 ats Exp $ +.\" $Id: rup.1,v 1.2.4.1 1996/01/30 14:01:21 mpp Exp $ .\" .Dd June 7, 1993 .Dt RUP 1 diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index e248be1e3fa08..8fcd5bb637a85 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rup.c,v 1.1.1.1 1994/08/28 15:01:31 csgr Exp $"; +static char rcsid[] = "$Id: rup.c,v 1.2 1995/05/30 06:33:26 rgrimes Exp $"; #endif /* not lint */ #include <stdio.h> diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 27ca0938be313..0672f43bd7f45 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: ruptime.c,v 1.6 1995/09/08 20:33:21 jkh Exp $ */ +/* $Id: ruptime.c,v 1.2.4.2 1995/10/06 02:00:09 davidg Exp $ */ #ifndef lint static char copyright[] = diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile index 6e2fd6ab2fc61..eeb303266378a 100644 --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/10 03:47:23 smace Exp $ +# $Id: Makefile,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $ PROG = rusers MAN1 = rusers.1 diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1 index 31156fdd46ba2..be77965af0599 100644 --- a/usr.bin/rusers/rusers.1 +++ b/usr.bin/rusers/rusers.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91 -.\" $Id: rusers.1,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $ +.\" $Id: rusers.1,v 1.1.1.1.6.1 1996/01/30 14:01:25 mpp Exp $ .\" .Dd April 23, 1991 .Dt RUSERS 1 diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c index 9c7234239698b..6f6b365517726 100644 --- a/usr.bin/rusers/rusers.c +++ b/usr.bin/rusers/rusers.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rusers.c,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $"; +static char rcsid[] = "$Id: rusers.c,v 1.2 1995/05/30 06:33:28 rgrimes Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile index 07bb67880ebd6..e78348bc308f2 100644 --- a/usr.bin/rwall/Makefile +++ b/usr.bin/rwall/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/11/10 03:47:37 smace Exp $ +# $Id: Makefile,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $ PROG = rwall MAN1 = rwall.1 diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1 index 0bab417eb2483..fe280274aa3ae 100644 --- a/usr.bin/rwall/rwall.1 +++ b/usr.bin/rwall/rwall.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91 -.\" $Id: rwall.1,v 1.1 1993/09/16 01:11:03 jtc Exp $ +.\" $Id: rwall.1,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $ .\" .Dd April 23, 1991 .Dt RWALL 1 diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c index 8a2e2b3fa2a58..a1d85e2007503 100644 --- a/usr.bin/rwall/rwall.c +++ b/usr.bin/rwall/rwall.c @@ -40,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/ -static char rcsid[] = "$Id: rwall.c,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $"; +static char rcsid[] = "$Id: rwall.c,v 1.2 1995/05/30 06:33:30 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.bin/sgmlfmt/Makefile b/usr.bin/sgmlfmt/Makefile index a97bf58d47193..574e7b8283afc 100644 --- a/usr.bin/sgmlfmt/Makefile +++ b/usr.bin/sgmlfmt/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/07/25 00:36:45 bde Exp $ +# $Id: Makefile,v 1.1.1.1.4.1 1995/09/17 23:40:07 davidg Exp $ MAN1= sgmlfmt.1 diff --git a/usr.bin/sgmlfmt/sgmlfmt.pl b/usr.bin/sgmlfmt/sgmlfmt.pl index 1d1e2c12a47ec..b3146b111e31a 100755 --- a/usr.bin/sgmlfmt/sgmlfmt.pl +++ b/usr.bin/sgmlfmt/sgmlfmt.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: sgmlfmt.pl,v 1.2.4.2 1995/10/11 23:19:16 jfieber Exp $ +# $Id: sgmlfmt.pl,v 1.2.4.3 1996/06/19 20:54:14 jkh Exp $ # Format an sgml document tagged according to the linuxdoc DTD. # by John Fieber <jfieber@freebsd.org> for the FreeBSD documentation diff --git a/usr.bin/sgmls/Makefile b/usr.bin/sgmls/Makefile index 62c6ceaed214d..5965067655eb4 100644 --- a/usr.bin/sgmls/Makefile +++ b/usr.bin/sgmls/Makefile @@ -1,6 +1,6 @@ # # Bmake file for sgmls -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1995/04/27 16:03:39 jfieber Exp $ # SUBDIR= libsgmls sgmls sgmlsasp rast diff --git a/usr.bin/sgmls/Makefile.inc b/usr.bin/sgmls/Makefile.inc index 7109ec06c1caa..fcc0711307205 100644 --- a/usr.bin/sgmls/Makefile.inc +++ b/usr.bin/sgmls/Makefile.inc @@ -1,7 +1,7 @@ # # Bmakefile for rast # -# $Id: Makefile.inc,v 1.3 1996/06/19 20:36:35 jkh Exp $ +# $Id: Makefile.inc,v 1.1.1.1.4.1 1996/06/19 20:55:10 jkh Exp $ # .if exists(${.CURDIR}/../../Makefile.inc) diff --git a/usr.bin/sgmls/README b/usr.bin/sgmls/README index dd6e2578f8c25..10916316bd280 100644 --- a/usr.bin/sgmls/README +++ b/usr.bin/sgmls/README @@ -1,4 +1,4 @@ -$Id:$ +$Id: README,v 1.1.1.1 1995/04/27 16:03:39 jfieber Exp $ This the sgmls release 1.1 SGML parser written by James Clark jjc@jclark.com, repackaged for FreeBSD. The original source may be diff --git a/usr.bin/sgmls/sgmls/Makefile b/usr.bin/sgmls/sgmls/Makefile index 1c3c26b99d757..5cf708e6b8f32 100644 --- a/usr.bin/sgmls/sgmls/Makefile +++ b/usr.bin/sgmls/sgmls/Makefile @@ -1,7 +1,7 @@ # # Bmakefile for sgmls # -# $Id: Makefile,v 1.2 1996/06/04 19:08:26 jfieber Exp $ +# $Id: Makefile,v 1.1.1.1.4.1 1996/06/19 20:55:25 jkh Exp $ # PROG= sgmls diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c index 42cc96e1809d5..c5a073cc5935b 100644 --- a/usr.bin/strip/strip.c +++ b/usr.bin/strip/strip.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)strip.c 8.1 (Berkeley) 6/6/93";*/ -static char RCSid[] = "$Id: strip.c,v 1.4 1994/12/18 01:18:17 ache Exp $"; +static char RCSid[] = "$Id: strip.c,v 1.5 1995/05/30 06:34:16 rgrimes Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index a33866cb60a83..f0b094ad13655 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94"; */ static const char rcsid[] = - "$Id: su.c,v 1.6.4.4 1996/06/23 14:07:40 markm Exp $"; + "$Id: su.c,v 1.6.4.5 1996/10/07 10:02:48 joerg Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index 047b347c2d463..49bc1543443f8 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id: Makefile,v 1.4 1996/03/09 19:22:49 joerg Exp $ +# $Id: Makefile,v 1.3.4.1 1996/06/23 11:47:00 joerg Exp $ PROG= talk DPADD= ${LIBCURSES} ${LIBTERMCAP} diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c index 741392e3db7e8..03448055f4a42 100644 --- a/usr.bin/talk/get_iface.c +++ b/usr.bin/talk/get_iface.c @@ -29,7 +29,7 @@ * From: * Id: find_interface.c,v 1.1 1995/08/14 16:08:39 wollman Exp * - * $Id: get_iface.c,v 1.1 1996/03/09 19:22:52 joerg Exp $ + * $Id: get_iface.c,v 1.2 1996/03/12 10:23:30 ache Exp $ */ #include <unistd.h> diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile index 11b45dba3a66d..b86086acc1184 100644 --- a/usr.bin/tconv/Makefile +++ b/usr.bin/tconv/Makefile @@ -1,5 +1,5 @@ # Makefile for tconv -# $Id: Makefile,v 1.1.1.1 1994/10/09 17:40:30 ache Exp $ +# $Id: Makefile,v 1.2 1995/01/15 06:19:01 jkh Exp $ PROG= tconv SRCS= tconv.c quit.c diff --git a/usr.bin/vi/USD.doc/vi.ref/index b/usr.bin/vi/USD.doc/vi.ref/index new file mode 100644 index 0000000000000..b52dd59f2cb82 --- /dev/null +++ b/usr.bin/vi/USD.doc/vi.ref/index @@ -0,0 +1,270 @@ +<interrupt> 12 +<literal next> 12 +current pathname 12 +alternate pathname 12 +buffer 12 +unnamed buffer 13 +previous context 15 +motion 15 +count 16 +bigword 17 +word 17 +paragraph 17 +section 17 +sentence 18 +<control-A> 18 +<control-B> 18 +<control-D> 19 +<control-E> 19 +<control-F> 19 +<control-G> 20 +<control-H> 20 +<control-J> 20 +<control-N> 20 +j 20 +<control-L> 20 +<control-R> 20 +<control-M> 21 ++ 21 +<control-P> 21 +k 21 +<control-T> 21 +<control-U> 21 +<control-W> 22 +<control-Y> 22 +<control-Z> 22 +<escape> 22 +<control-]> 23 +<control-^> 23 +<space> 23 +l 23 +! 24 +# 24 +$ 25 +% 25 +& 26 +SQUOTE<character> 26 +`<character> 26 +( 27 +) 27 +, 27 +MINUSSIGN 27 +. 28 +/RE/ 28 +?RE? 28 +N 28 +n 28 +0 29 +: 29 +; 30 +< 30 +> 30 +@ 30 +A 31 +B 31 +C 31 +D 32 +E 32 +F 32 +G 33 +H 33 +I 33 +J 33 +L 34 +M 34 +O 34 +P 35 +Q 35 +R 35 +S 35 +T 35 +U 36 +W 36 +X 36 +Y 37 +ZZ 37 +[[ 37 +]] 37 +^ 38 +_ 38 +a 38 +b 38 +c 39 +d 39 +e 39 +f 40 +i 40 +m 40 +o 40 +p 41 +r 41 +s 41 +t 41 +u 42 +w 42 +x 42 +y 43 +z 43 +{ 44 +| 44 +} 44 +~ 45 +~ 45 +<interrupt> 45 +<nul> 46 +<control-D> 46 +^<control-D> 46 +0<control-D> 47 +<control-T> 47 +<erase> 47 +<control-H> 47 +<literal next> 47 +<escape> 47 +<line erase> 47 +<control-W> 47 +<word erase> 47 +<control-X> 47 +<interrupt> 47 +<eof> 50 +line 50 +range 50 +count 50 +flags 50 +file 51 +DOUBLEQUOTE 52 +<end-of-file> 52 +! 52 +number 53 +# 53 +@ 53 +* 53 +< 53 += 54 +> 54 +abbrev 54 +append 54 +args 55 +bg 55 +change 55 +cd 55 +chdir 55 +copy 56 +t 56 +delete 56 +display 56 +edit 56 +exusage 57 +file 57 +fg 57 +global 57 +v 58 +help 58 +insert 58 +join 59 +list 59 +map 59 +mark 60 +k 60 +move 60 +mkexrc 60 +next 60 +open 61 +preserve 61 +previous 61 +print 61 +put 61 +quit 62 +read 62 +recover 62 +resize 63 +rewind 63 +set 63 +shell 64 +source 64 +split 64 +substitute 64 +& 64 +~ 64 +suspend 65 +stop 65 +<control-Z> 65 +tag 65 +tagpop 66 +tagtop 66 +unabbrev 66 +undo 66 +unmap 67 +version 67 +visual 67 +visual 67 +viusage 67 +write 67 +wn 67 +wq 67 +xit 68 +yank 69 +z 69 +altwerase 70 +autoindent 70 +autoprint 71 +autowrite 71 +beautify 71 +cdpath 72 +columns 72 +comment 72 +directory 72 +edcompatible 72 +errorbells 72 +exrc 73 +extended 73 +flash 73 +hardtabs 73 +ignorecase 73 +keytime 73 +leftright 73 +lines 73 +lisp 74 +list 74 +magic 74 +matchtime 74 +mesg 74 +modelines 74 +number 75 +octal 75 +open 75 +optimize 75 +paragraphs 75 +prompt 75 +readonly 76 +recdir 76 +redraw 76 +remap 76 +report 76 +ruler 77 +scroll 77 +sections 77 +shell 77 +shiftwidth 77 +showdirty 77 +showmatch 77 +showmode 77 +sidescroll 78 +slowopen 78 +sourceany 78 +tabstop 78 +taglength 78 +tags 78 +term 78 +terse 78 +tildeop 79 +timeout 79 +ttywerase 79 +verbose 79 +w300 79 +w1200 79 +w9600 79 +warn 79 +window 79 +wrapmargin 80 +wrapscan 80 +writeany 80 diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 8828ffde377d0..b5a807b1641f0 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -42,7 +42,7 @@ static const char copyright[] = static const char sccsid[] = "@(#)wc.c 8.1 (Berkeley) 6/6/93"; #else static const char rcsid[] = - "$Id: wc.c,v 1.4 1996/04/13 11:35:54 bde Exp $"; + "$Id: wc.c,v 1.1.1.1.6.1 1996/07/02 17:22:17 bde Exp $"; #endif #endif /* not lint */ diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1 index b94418869bc13..8c6f4621afe82 100644 --- a/usr.bin/which/which.1 +++ b/usr.bin/which/which.1 @@ -27,7 +27,7 @@ .\" (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: which.1,v 1.2 1995/01/28 17:35:54 asami Exp $ +.\" $Id: which.1,v 1.3 1995/01/30 22:21:28 jkh Exp $ .Dd January 26, 1995 .Dt WHICH 1 .Os FreeBSD diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl index 08aabda79e0f3..5ee31abbec790 100755 --- a/usr.bin/which/which.pl +++ b/usr.bin/which/which.pl @@ -31,7 +31,7 @@ # # [whew!] # -# $Id: which.pl,v 1.4 1995/01/30 22:21:29 jkh Exp $ +# $Id: which.pl,v 1.4.4.1 1995/08/26 10:33:20 davidg Exp $ $all = 0; $silent = 0; diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index 220f195157aec..9fa69fd156194 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)install.1 8.1 (Berkeley) 6/6/93 -.\" $Id: install.1,v 1.3 1996/01/30 13:52:33 mpp Exp $ +.\" $Id: install.1,v 1.1.1.1.6.1 1996/02/22 19:43:36 peter Exp $ .\" .Dd October 9, 1995 .Dt INSTALL 1 diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 99440bfd99a66..5d17d70d7443c 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -40,7 +40,7 @@ static const char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)xinstall.c 8.1 (Berkeley) 7/21/93";*/ static const char rcsid[] = - "$Id: xinstall.c,v 1.1.1.1.6.3 1996/02/22 19:43:36 peter Exp $"; + "$Id: xinstall.c,v 1.1.1.1.6.4 1996/06/23 14:24:57 bde Exp $"; #endif /* not lint */ /*- diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile index c133eb52a80ef..132817542ac60 100644 --- a/usr.bin/ypcat/Makefile +++ b/usr.bin/ypcat/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.3 1994/02/17 07:06:10 rgrimes Exp $ +# $Id: Makefile,v 1.1 1994/08/08 01:13:28 wollman Exp $ PROG= ypcat diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1 index 86bc355e02f70..fdf3afd07ae9f 100644 --- a/usr.bin/ypcat/ypcat.1 +++ b/usr.bin/ypcat/ypcat.1 @@ -26,7 +26,7 @@ .\" (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: ypcat.1,v 1.1.6.1 1996/01/30 14:03:45 mpp Exp $ +.\" $Id: ypcat.1,v 1.1.6.2 1996/06/27 05:32:57 gpalmer Exp $ .\" .Dd December 3, 1993 .Dt YPCAT 1 diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile index cf79ca74de20d..94491c43bf3cc 100644 --- a/usr.bin/ypmatch/Makefile +++ b/usr.bin/ypmatch/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.3 1994/02/17 07:06:13 rgrimes Exp $ +# $Id: Makefile,v 1.1 1994/08/08 01:13:31 wollman Exp $ PROG= ypmatch diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1 index 6c73fdb486faa..f4cd7649ed250 100644 --- a/usr.bin/ypmatch/ypmatch.1 +++ b/usr.bin/ypmatch/ypmatch.1 @@ -26,7 +26,7 @@ .\" (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: ypmatch.1,v 1.1.6.1 1996/01/30 14:03:50 mpp Exp $ +.\" $Id: ypmatch.1,v 1.1.6.2 1996/06/27 05:32:59 gpalmer Exp $ .\" .Dd December 3, 1993 .Dt YPMATCH 1 diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile index 1c964b2e8df53..45b81e525ba62 100644 --- a/usr.bin/ypwhich/Makefile +++ b/usr.bin/ypwhich/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.2 1994/02/17 07:06:22 rgrimes Exp $ +# $Id: Makefile,v 1.1 1994/08/08 01:13:34 wollman Exp $ PROG= ypwhich NOMAN= diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 1f6f5f271b7a2..dbbb210d1e612 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $Id: Makefile,v 1.62.4.9 1996/08/01 12:17:16 jkh Exp $ +# $Id: Makefile,v 1.62.4.10 1997/02/07 19:12:19 jkh Exp $ # XXX MISSING: mkproto SUBDIR= ac accton adduser amd arp bootparamd cdcontrol chown chroot cron \ diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile index 349e9ce83e784..d746bd2401bc0 100644 --- a/usr.sbin/ac/Makefile +++ b/usr.sbin/ac/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/05/18 08:00:44 csgr Exp $ +# $Id: Makefile,v 1.1 1994/09/26 22:12:24 davidg Exp $ PROG= ac MAN8= ac.8 diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8 index 7cea9b6a75187..7eda1d1b6cd7a 100644 --- a/usr.sbin/ac/ac.8 +++ b/usr.sbin/ac/ac.8 @@ -28,7 +28,7 @@ .\" (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: ac.8,v 1.2 1994/09/26 22:12:25 davidg Exp $ +.\" $Id: ac.8,v 1.2.6.1 1996/01/30 13:58:33 mpp Exp $ .\" .Dd March 15, 1994 .Dt AC 8 diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 030590940abf5..75b0f24116c7f 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ac.c,v 1.2 1994/11/14 20:26:52 ache Exp $"; +static char rcsid[] = "$Id: ac.c,v 1.3 1995/05/30 03:45:34 rgrimes Exp $"; #endif #include <sys/types.h> diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8 index eeed671044110..fdec9570d31ca 100644 --- a/usr.sbin/adduser/adduser.8 +++ b/usr.sbin/adduser/adduser.8 @@ -28,7 +28,7 @@ .\" .\" /usr/sbin/adduser - add new user(s) .\" -.\" $Id: adduser.8,v 1.9 1996/06/09 20:45:35 wosch Exp $ +.\" $Id: adduser.8,v 1.7.4.2 1996/06/12 00:03:34 wosch Exp $ .Dd Jan, 9, 1995 .Dt ADDUSER 8 diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 6d46f421f2cab..2affb662328b8 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -32,7 +32,7 @@ # # Email: Wolfram Schneider <wosch@cs.tu-berlin.de> # -# $Id: adduser.perl,v 1.11 1996/05/06 06:15:19 gclarkii Exp $ +# $Id: adduser.perl,v 1.7.4.3 1996/06/12 00:03:35 wosch Exp $ # # read variables diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c index 73f39a828e0cc..45088b0a4a1ec 100644 --- a/usr.sbin/amd/amd/afs_ops.c +++ b/usr.sbin/amd/amd/afs_ops.c @@ -37,7 +37,7 @@ * * @(#)afs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: afs_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ + * $Id: afs_ops.c,v 1.2 1995/05/30 03:45:43 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/am_ops.c b/usr.sbin/amd/amd/am_ops.c index 436011010fef4..881eea934f0c1 100644 --- a/usr.sbin/amd/amd/am_ops.c +++ b/usr.sbin/amd/amd/am_ops.c @@ -37,7 +37,7 @@ * * @(#)am_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: am_ops.c,v 5.2.2.1 1992/02/09 15:08:17 jsp beta $ + * $Id: am_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8 index 9fa01a2b469d0..b51bcc95b9f91 100644 --- a/usr.sbin/amd/amd/amd.8 +++ b/usr.sbin/amd/amd/amd.8 @@ -37,7 +37,7 @@ .\" .\" @(#)amd.8 5.10 (Berkeley) 4/19/94 .\" -.\" $Id: amd.8,v 5.2.2.1 1992/02/09 15:11:39 jsp beta $ +.\" $Id: amd.8,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ .\" .Dd "April 19, 1994" .Dt AMD 8 diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c index c3b2b61f3ed2c..f32df37aacf0a 100644 --- a/usr.sbin/amd/amd/amd.c +++ b/usr.sbin/amd/amd/amd.c @@ -37,7 +37,7 @@ * * @(#)amd.c 8.1 (Berkeley) 6/6/93 * - * $Id: amd.c,v 5.2.2.1 1992/02/09 15:08:15 jsp beta $ + * $Id: amd.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c index cf04d9d4160bf..76ac6cdd748c6 100644 --- a/usr.sbin/amd/amd/amq_subr.c +++ b/usr.sbin/amd/amd/amq_subr.c @@ -37,7 +37,7 @@ * * @(#)amq_subr.c 8.1 (Berkeley) 6/6/93 * - * $Id: amq_subr.c,v 5.2.2.1 1992/02/09 15:08:18 jsp beta $ + * $Id: amq_subr.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ /* diff --git a/usr.sbin/amd/amd/clock.c b/usr.sbin/amd/amd/clock.c index 91e11eec49625..d1d519b9cc7e1 100644 --- a/usr.sbin/amd/amd/clock.c +++ b/usr.sbin/amd/amd/clock.c @@ -37,7 +37,7 @@ * * @(#)clock.c 8.1 (Berkeley) 6/6/93 * - * $Id: clock.c,v 5.2.2.1 1992/02/09 15:08:20 jsp beta $ + * $Id: clock.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/efs_ops.c b/usr.sbin/amd/amd/efs_ops.c index 6630277eab4c0..d06790351c864 100644 --- a/usr.sbin/amd/amd/efs_ops.c +++ b/usr.sbin/amd/amd/efs_ops.c @@ -37,7 +37,7 @@ * * @(#)efs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: efs_ops.c,v 5.2.2.1 1992/02/09 15:08:21 jsp beta $ + * $Id: efs_ops.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c index 0567d5dd5ea3b..540d869e3c4b6 100644 --- a/usr.sbin/amd/amd/get_args.c +++ b/usr.sbin/amd/amd/get_args.c @@ -37,7 +37,7 @@ * * @(#)get_args.c 8.1 (Berkeley) 6/6/93 * - * $Id: get_args.c,v 5.2.2.1 1992/02/09 15:08:23 jsp beta $ + * $Id: get_args.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/host_ops.c b/usr.sbin/amd/amd/host_ops.c index d290fb62377bd..97616bfa3ccfb 100644 --- a/usr.sbin/amd/amd/host_ops.c +++ b/usr.sbin/amd/amd/host_ops.c @@ -37,7 +37,7 @@ * * @(#)host_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: host_ops.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ + * $Id: host_ops.c,v 1.2 1995/05/30 03:45:45 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/ifs_ops.c b/usr.sbin/amd/amd/ifs_ops.c index 14df832b24c63..a7108ed786fed 100644 --- a/usr.sbin/amd/amd/ifs_ops.c +++ b/usr.sbin/amd/amd/ifs_ops.c @@ -37,7 +37,7 @@ * * @(#)ifs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: ifs_ops.c,v 5.2.2.1 1992/02/09 15:08:26 jsp beta $ + * $Id: ifs_ops.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_file.c b/usr.sbin/amd/amd/info_file.c index c43b2a7b07c24..d5fdfdeb9a6f6 100644 --- a/usr.sbin/amd/amd/info_file.c +++ b/usr.sbin/amd/amd/info_file.c @@ -37,7 +37,7 @@ * * @(#)info_file.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_file.c,v 5.2.2.1 1992/02/09 15:08:28 jsp beta $ + * $Id: info_file.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_hes.c b/usr.sbin/amd/amd/info_hes.c index 513eda7a4622f..893ea3e4f73ce 100644 --- a/usr.sbin/amd/amd/info_hes.c +++ b/usr.sbin/amd/amd/info_hes.c @@ -37,7 +37,7 @@ * * @(#)info_hes.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_hes.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ + * $Id: info_hes.c,v 1.2 1995/05/30 03:45:47 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_ndbm.c b/usr.sbin/amd/amd/info_ndbm.c index d3deaa187f9fb..435cafa9e8ff6 100644 --- a/usr.sbin/amd/amd/info_ndbm.c +++ b/usr.sbin/amd/amd/info_ndbm.c @@ -37,7 +37,7 @@ * * @(#)info_ndbm.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_ndbm.c,v 5.2.2.1 1992/02/09 15:08:31 jsp beta $ + * $Id: info_ndbm.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_nis.c b/usr.sbin/amd/amd/info_nis.c index ac80f5f975dd7..f478dec83bfbb 100644 --- a/usr.sbin/amd/amd/info_nis.c +++ b/usr.sbin/amd/amd/info_nis.c @@ -37,7 +37,7 @@ * * @(#)info_nis.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_nis.c,v 5.2.2.1 1992/02/09 15:08:32 jsp beta $ + * $Id: info_nis.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_passwd.c b/usr.sbin/amd/amd/info_passwd.c index 694dd53294b1c..ac509381e237f 100644 --- a/usr.sbin/amd/amd/info_passwd.c +++ b/usr.sbin/amd/amd/info_passwd.c @@ -37,7 +37,7 @@ * * @(#)info_passwd.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_passwd.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ + * $Id: info_passwd.c,v 1.2 1995/05/30 03:45:48 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/info_union.c b/usr.sbin/amd/amd/info_union.c index e3062adaa5a39..ea6a1c0f1122b 100644 --- a/usr.sbin/amd/amd/info_union.c +++ b/usr.sbin/amd/amd/info_union.c @@ -37,7 +37,7 @@ * * @(#)info_union.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_union.c,v 5.2.2.1 1992/02/09 15:08:34 jsp beta $ + * $Id: info_union.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c index 21c8d3187eff9..d819e83cf913f 100644 --- a/usr.sbin/amd/amd/map.c +++ b/usr.sbin/amd/amd/map.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: map.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ + * $Id: map.c,v 1.2 1995/05/30 03:45:49 rgrimes Exp $ */ #ifndef lint diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c index 1004644eff0c2..0f37ba9d540fd 100644 --- a/usr.sbin/amd/amd/mapc.c +++ b/usr.sbin/amd/amd/mapc.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mapc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ + * $Id: mapc.c,v 1.2 1995/05/30 03:45:50 rgrimes Exp $ */ #ifndef lint diff --git a/usr.sbin/amd/amd/misc_rpc.c b/usr.sbin/amd/amd/misc_rpc.c index e982f786f092d..a8bd1de39c849 100644 --- a/usr.sbin/amd/amd/misc_rpc.c +++ b/usr.sbin/amd/amd/misc_rpc.c @@ -37,7 +37,7 @@ * * @(#)misc_rpc.c 8.1 (Berkeley) 6/6/93 * - * $Id: misc_rpc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ + * $Id: misc_rpc.c,v 1.2 1995/05/30 03:45:51 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/mntfs.c b/usr.sbin/amd/amd/mntfs.c index ef8f17f2cbf1e..108f676904f3a 100644 --- a/usr.sbin/amd/amd/mntfs.c +++ b/usr.sbin/amd/amd/mntfs.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mntfs.c,v 5.2.2.1 1992/02/09 15:08:42 jsp beta $ + * $Id: mntfs.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ */ #ifndef lint diff --git a/usr.sbin/amd/amd/mount_fs.c b/usr.sbin/amd/amd/mount_fs.c index e923ae7a7d012..2452ecacdb6be 100644 --- a/usr.sbin/amd/amd/mount_fs.c +++ b/usr.sbin/amd/amd/mount_fs.c @@ -37,7 +37,7 @@ * * @(#)mount_fs.c 8.1 (Berkeley) 6/6/93 * - * $Id: mount_fs.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ + * $Id: mount_fs.c,v 1.1.1.1.6.1 1997/02/09 04:53:42 imp Exp $ * */ diff --git a/usr.sbin/amd/amd/mtab.c b/usr.sbin/amd/amd/mtab.c index 43b3a26e9a7f1..359687620845b 100644 --- a/usr.sbin/amd/amd/mtab.c +++ b/usr.sbin/amd/amd/mtab.c @@ -37,7 +37,7 @@ * * @(#)mtab.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab.c,v 5.2.2.1 1992/02/09 15:08:45 jsp beta $ + * $Id: mtab.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c index 1d92974bf2ff9..f9da3450270bc 100644 --- a/usr.sbin/amd/amd/nfs_ops.c +++ b/usr.sbin/amd/amd/nfs_ops.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: nfs_ops.c,v 1.2 1995/02/13 01:56:22 wpaul Exp $ + * $Id: nfs_ops.c,v 1.3 1995/05/30 03:45:52 rgrimes Exp $ */ #ifndef lint diff --git a/usr.sbin/amd/amd/nfs_start.c b/usr.sbin/amd/amd/nfs_start.c index aad227d1ce63a..6f250492d63a9 100644 --- a/usr.sbin/amd/amd/nfs_start.c +++ b/usr.sbin/amd/amd/nfs_start.c @@ -37,7 +37,7 @@ * * @(#)nfs_start.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_start.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ + * $Id: nfs_start.c,v 1.2 1995/05/30 03:45:53 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/nfs_subr.c b/usr.sbin/amd/amd/nfs_subr.c index def2db1452655..6b84cb571e62b 100644 --- a/usr.sbin/amd/amd/nfs_subr.c +++ b/usr.sbin/amd/amd/nfs_subr.c @@ -37,7 +37,7 @@ * * @(#)nfs_subr.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_subr.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ + * $Id: nfs_subr.c,v 1.2 1995/05/30 03:45:54 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/nfsx_ops.c b/usr.sbin/amd/amd/nfsx_ops.c index ba18cdcfebe82..75975d136f04e 100644 --- a/usr.sbin/amd/amd/nfsx_ops.c +++ b/usr.sbin/amd/amd/nfsx_ops.c @@ -37,7 +37,7 @@ * * @(#)nfsx_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfsx_ops.c,v 5.2.2.3 1992/05/31 16:13:07 jsp Exp $ + * $Id: nfsx_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/opts.c b/usr.sbin/amd/amd/opts.c index 54c967528c440..d3cc5760dca45 100644 --- a/usr.sbin/amd/amd/opts.c +++ b/usr.sbin/amd/amd/opts.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: opts.c,v 5.2.2.3 1992/05/31 16:34:13 jsp Exp $ + * $Id: opts.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ */ #ifndef lint diff --git a/usr.sbin/amd/amd/pfs_ops.c b/usr.sbin/amd/amd/pfs_ops.c index 314f62bdf66f1..78606b3017894 100644 --- a/usr.sbin/amd/amd/pfs_ops.c +++ b/usr.sbin/amd/amd/pfs_ops.c @@ -37,7 +37,7 @@ * * @(#)pfs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: pfs_ops.c,v 5.2.2.1 1992/02/09 15:08:56 jsp beta $ + * $Id: pfs_ops.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c index 421c2a1fe3ecf..dc8d0c4888c23 100644 --- a/usr.sbin/amd/amd/restart.c +++ b/usr.sbin/amd/amd/restart.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: restart.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ + * $Id: restart.c,v 1.2 1995/05/30 03:45:55 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/rpc_fwd.c b/usr.sbin/amd/amd/rpc_fwd.c index a2e49ef99406f..d093bc7c22505 100644 --- a/usr.sbin/amd/amd/rpc_fwd.c +++ b/usr.sbin/amd/amd/rpc_fwd.c @@ -37,7 +37,7 @@ * * @(#)rpc_fwd.c 8.1 (Berkeley) 6/6/93 * - * $Id: rpc_fwd.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ + * $Id: rpc_fwd.c,v 1.2 1995/05/30 03:45:56 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/sched.c b/usr.sbin/amd/amd/sched.c index cd12e3bf4b702..905ca5b092ff2 100644 --- a/usr.sbin/amd/amd/sched.c +++ b/usr.sbin/amd/amd/sched.c @@ -37,7 +37,7 @@ * * @(#)sched.c 8.1 (Berkeley) 6/6/93 * - * $Id: sched.c,v 5.2.2.1 1992/02/09 15:09:02 jsp beta $ + * $Id: sched.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/sfs_ops.c b/usr.sbin/amd/amd/sfs_ops.c index c1b1ebae840ca..190c9cf0fb67d 100644 --- a/usr.sbin/amd/amd/sfs_ops.c +++ b/usr.sbin/amd/amd/sfs_ops.c @@ -37,7 +37,7 @@ * * @(#)sfs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: sfs_ops.c,v 5.2.2.1 1992/02/09 15:09:04 jsp beta $ + * $Id: sfs_ops.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/srvr_afs.c b/usr.sbin/amd/amd/srvr_afs.c index 044077758a854..67bae8a441900 100644 --- a/usr.sbin/amd/amd/srvr_afs.c +++ b/usr.sbin/amd/amd/srvr_afs.c @@ -37,7 +37,7 @@ * * @(#)srvr_afs.c 8.1 (Berkeley) 6/6/93 * - * $Id: srvr_afs.c,v 5.2.2.1 1992/02/09 15:09:05 jsp beta $ + * $Id: srvr_afs.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c index a025640827d45..4efb5fb70a797 100644 --- a/usr.sbin/amd/amd/srvr_nfs.c +++ b/usr.sbin/amd/amd/srvr_nfs.c @@ -37,7 +37,7 @@ * * @(#)srvr_nfs.c 8.1 (Berkeley) 6/6/93 * - * $Id: srvr_nfs.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ + * $Id: srvr_nfs.c,v 1.2 1995/05/30 03:45:58 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/ufs_ops.c b/usr.sbin/amd/amd/ufs_ops.c index fd81c37155f04..5242958fa6ded 100644 --- a/usr.sbin/amd/amd/ufs_ops.c +++ b/usr.sbin/amd/amd/ufs_ops.c @@ -37,7 +37,7 @@ * * @(#)ufs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: ufs_ops.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $ + * $Id: ufs_ops.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/umount_fs.c b/usr.sbin/amd/amd/umount_fs.c index 66b413bddc4a8..1027f12134c0c 100644 --- a/usr.sbin/amd/amd/umount_fs.c +++ b/usr.sbin/amd/amd/umount_fs.c @@ -37,7 +37,7 @@ * * @(#)umount_fs.c 8.1 (Berkeley) 6/6/93 * - * $Id: umount_fs.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ + * $Id: umount_fs.c,v 1.2 1995/05/30 03:45:59 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/util.c b/usr.sbin/amd/amd/util.c index 8503cc828bfb7..b682daba84d4d 100644 --- a/usr.sbin/amd/amd/util.c +++ b/usr.sbin/amd/amd/util.c @@ -37,7 +37,7 @@ * * @(#)util.c 8.1 (Berkeley) 6/6/93 * - * $Id: util.c,v 5.2.2.2 1992/03/07 17:52:06 jsp Exp $ + * $Id: util.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c index f1103e8f360c2..cd5d86498b571 100644 --- a/usr.sbin/amd/amd/wire.c +++ b/usr.sbin/amd/amd/wire.c @@ -37,7 +37,7 @@ * * @(#)wire.c 8.1 (Berkeley) 6/6/93 * - * $Id: wire.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ + * $Id: wire.c,v 1.2 1995/05/30 03:46:01 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amd/xutil.c b/usr.sbin/amd/amd/xutil.c index 8af6951d0b90f..d916bcecd3582 100644 --- a/usr.sbin/amd/amd/xutil.c +++ b/usr.sbin/amd/amd/xutil.c @@ -37,7 +37,7 @@ * * @(#)xutil.c 8.1 (Berkeley) 6/6/93 * - * $Id: xutil.c,v 5.2.2.3 1992/03/07 10:36:09 jsp Exp $ + * $Id: xutil.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/amq/amq.8 b/usr.sbin/amd/amq/amq.8 index 5485925b809f3..79ccca2690898 100644 --- a/usr.sbin/amd/amq/amq.8 +++ b/usr.sbin/amd/amq/amq.8 @@ -37,7 +37,7 @@ .\" .\" @(#)amq.8 8.3 (Berkeley) 4/18/94 .\" -.\" $Id: amq.8,v 5.2.2.1 1992/02/09 15:11:41 jsp beta $ +.\" $Id: amq.8,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c index 68363ed50761a..19092b6fb1791 100644 --- a/usr.sbin/amd/amq/amq.c +++ b/usr.sbin/amd/amq/amq.c @@ -37,7 +37,7 @@ * * @(#)amq.c 8.1 (Berkeley) 6/7/93 * - * $Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $ + * $Id: amq.c,v 1.2 1995/05/30 03:46:02 rgrimes Exp $ * */ @@ -54,7 +54,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.2 1995/05/30 03:46:02 rgrimes Exp $"; static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93"; #endif /* not lint */ diff --git a/usr.sbin/amd/config/Configure b/usr.sbin/amd/config/Configure index 2851786f5032c..602b9a725bae0 100644 --- a/usr.sbin/amd/config/Configure +++ b/usr.sbin/amd/config/Configure @@ -38,7 +38,7 @@ # # @(#)Configure 8.1 (Berkeley) 6/6/93 # -# $Id: Configure,v 5.2.1.2 91/05/07 22:20:26 jsp Alpha $ +# $Id: Configure,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ # echo "Making ./arch and ./os-type executable ..." until chmod +x ./arch ./os-type; do echo "Error: chmod command failed" >&2; exit 1; done diff --git a/usr.sbin/amd/config/Makefile.aix3 b/usr.sbin/amd/config/Makefile.aix3 index c4bdd3afc85c3..b11728f3305d1 100644 --- a/usr.sbin/amd/config/Makefile.aix3 +++ b/usr.sbin/amd/config/Makefile.aix3 @@ -1,5 +1,5 @@ # @(#)Makefile.aix3 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.aix3,v 5.2.2.1 1992/02/09 15:10:06 jsp beta $ +# $Id: Makefile.aix3,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ # SYSLIB = -lbsd diff --git a/usr.sbin/amd/config/Makefile.bsd44 b/usr.sbin/amd/config/Makefile.bsd44 index a41ff2dba0d48..bca7b94b24e24 100644 --- a/usr.sbin/amd/config/Makefile.bsd44 +++ b/usr.sbin/amd/config/Makefile.bsd44 @@ -1,6 +1,6 @@ # @(#)Makefile.bsd44 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.bsd44,v 5.2.2.1 1992/02/09 15:10:12 jsp beta $ +# $Id: Makefile.bsd44,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # # Extra Makefile definitions for 4.4 BSD # diff --git a/usr.sbin/amd/config/Makefile.config b/usr.sbin/amd/config/Makefile.config index 0c4d7befb5620..6071dd77299e5 100644 --- a/usr.sbin/amd/config/Makefile.config +++ b/usr.sbin/amd/config/Makefile.config @@ -1,6 +1,6 @@ # @(#)Makefile.config 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.config,v 5.2.2.1 1992/02/09 15:11:17 jsp beta $ +# $Id: Makefile.config,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # # diff --git a/usr.sbin/amd/config/Makefile.hpux b/usr.sbin/amd/config/Makefile.hpux index dd92f9eb4b967..67e0f42e232a6 100644 --- a/usr.sbin/amd/config/Makefile.hpux +++ b/usr.sbin/amd/config/Makefile.hpux @@ -1,6 +1,6 @@ # @(#)Makefile.hpux 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.hpux,v 5.2.2.1 1992/02/09 15:10:26 jsp beta $ +# $Id: Makefile.hpux,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # # Extra Makefile definitions for HP-UX # diff --git a/usr.sbin/amd/config/Makefile.irix b/usr.sbin/amd/config/Makefile.irix index e936b4540bdb1..d077b5b472efd 100644 --- a/usr.sbin/amd/config/Makefile.irix +++ b/usr.sbin/amd/config/Makefile.irix @@ -1,6 +1,6 @@ # @(#)Makefile.irix 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.irix,v 5.2.2.1 1992/02/09 15:10:31 jsp beta $ +# $Id: Makefile.irix,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # # Extra Makefile definitions for IRIX # diff --git a/usr.sbin/amd/config/Makefile.irix3 b/usr.sbin/amd/config/Makefile.irix3 index 9f208bb205df1..74879d49290bc 100644 --- a/usr.sbin/amd/config/Makefile.irix3 +++ b/usr.sbin/amd/config/Makefile.irix3 @@ -1,6 +1,6 @@ # @(#)Makefile.irix3 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.irix3,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ +# $Id: Makefile.irix3,v 1.2 1995/05/30 03:46:04 rgrimes Exp $ # # Extra Makefile definitions for IRIX # diff --git a/usr.sbin/amd/config/Makefile.irix4 b/usr.sbin/amd/config/Makefile.irix4 index 4480e932a5a91..fd73ca8bde6d0 100644 --- a/usr.sbin/amd/config/Makefile.irix4 +++ b/usr.sbin/amd/config/Makefile.irix4 @@ -1,6 +1,6 @@ # @(#)Makefile.irix4 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.irix4,v 5.2 1992/05/31 16:40:22 jsp Exp $ +# $Id: Makefile.irix4,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ # # Extra Makefile definitions for IRIX # diff --git a/usr.sbin/amd/config/Makefile.stellix b/usr.sbin/amd/config/Makefile.stellix index 0bcfff6895c25..27957ef0805ff 100644 --- a/usr.sbin/amd/config/Makefile.stellix +++ b/usr.sbin/amd/config/Makefile.stellix @@ -1,6 +1,6 @@ # @(#)Makefile.stellix 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.stellix,v 5.2.2.1 1992/02/09 15:10:45 jsp beta $ +# $Id: Makefile.stellix,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ # # Extra Makefile definitions for STELLIX # diff --git a/usr.sbin/amd/config/RELEASE b/usr.sbin/amd/config/RELEASE index 36f8f1f978b8c..43be6c3c0f4af 100644 --- a/usr.sbin/amd/config/RELEASE +++ b/usr.sbin/amd/config/RELEASE @@ -1 +1 @@ -$Revision: 5.2.3.1 $ of $Date: 1993/06/01 11:43:31 $ bsd44 +$Revision: 1.1.1.1 $ of $Date: 1994/05/26 05:22:08 $ bsd44 diff --git a/usr.sbin/amd/config/arch b/usr.sbin/amd/config/arch index 191c0c1ca79f5..d5803037864a0 100644 --- a/usr.sbin/amd/config/arch +++ b/usr.sbin/amd/config/arch @@ -38,7 +38,7 @@ # # @(#)arch 8.1 (Berkeley) 6/6/93 # -# $Id: arch,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ +# $Id: arch,v 1.2 1995/02/02 03:36:51 jkh Exp $ # # Figure out machine architecture # diff --git a/usr.sbin/amd/config/misc-aix3.h b/usr.sbin/amd/config/misc-aix3.h index 2c97d816cd108..35feea432d8ba 100644 --- a/usr.sbin/amd/config/misc-aix3.h +++ b/usr.sbin/amd/config/misc-aix3.h @@ -37,7 +37,7 @@ * * @(#)misc-aix3.h 8.1 (Berkeley) 6/6/93 * - * $Id: misc-aix3.h,v 5.2.2.1 1992/02/09 15:10:05 jsp beta $ + * $Id: misc-aix3.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/misc-hpux.h b/usr.sbin/amd/config/misc-hpux.h index d808627dac25d..386b5b9949f60 100644 --- a/usr.sbin/amd/config/misc-hpux.h +++ b/usr.sbin/amd/config/misc-hpux.h @@ -37,7 +37,7 @@ * * @(#)misc-hpux.h 8.1 (Berkeley) 6/6/93 * - * $Id: misc-hpux.h,v 5.2.2.1 1992/02/09 15:10:24 jsp beta $ + * $Id: misc-hpux.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/misc-irix.h b/usr.sbin/amd/config/misc-irix.h index f7d6682063077..997911947993f 100644 --- a/usr.sbin/amd/config/misc-irix.h +++ b/usr.sbin/amd/config/misc-irix.h @@ -37,7 +37,7 @@ * * @(#)misc-irix.h 8.1 (Berkeley) 6/6/93 * - * $Id: misc-irix.h,v 5.2.2.1 1992/02/09 15:10:30 jsp beta $ + * $Id: misc-irix.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/misc-next.h b/usr.sbin/amd/config/misc-next.h index 46a498e51215a..542d69c24bea6 100644 --- a/usr.sbin/amd/config/misc-next.h +++ b/usr.sbin/amd/config/misc-next.h @@ -37,7 +37,7 @@ * * @(#)misc-next.h 8.1 (Berkeley) 6/6/93 * - * $Id: misc-next.h,v 5.2.2.1 1992/02/09 15:10:34 jsp beta $ + * $Id: misc-next.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/misc-ultrix.h b/usr.sbin/amd/config/misc-ultrix.h index 640c5a784a723..d43caa8ec5a24 100644 --- a/usr.sbin/amd/config/misc-ultrix.h +++ b/usr.sbin/amd/config/misc-ultrix.h @@ -37,7 +37,7 @@ * * @(#)misc-ultrix.h 8.1 (Berkeley) 6/6/93 * - * $Id: misc-ultrix.h,v 5.2.2.1 1992/02/09 15:10:49 jsp beta $ + * $Id: misc-ultrix.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mount_aix.c b/usr.sbin/amd/config/mount_aix.c index 07d9e803a673b..34d7735b850d8 100644 --- a/usr.sbin/amd/config/mount_aix.c +++ b/usr.sbin/amd/config/mount_aix.c @@ -37,7 +37,7 @@ * * @(#)mount_aix.c 8.1 (Berkeley) 6/6/93 * - * $Id: mount_aix.c,v 5.2.2.1 1992/02/09 15:10:08 jsp beta $ + * $Id: mount_aix.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mount_irix.c b/usr.sbin/amd/config/mount_irix.c index 992696009d81a..6b5fa2ccb15ca 100644 --- a/usr.sbin/amd/config/mount_irix.c +++ b/usr.sbin/amd/config/mount_irix.c @@ -37,7 +37,7 @@ * * @(#)mount_irix.c 8.1 (Berkeley) 6/6/93 * - * $Id: mount_irix.c,v 5.2.2.1 1992/02/09 15:10:32 jsp beta $ + * $Id: mount_irix.c,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mtab_aix.c b/usr.sbin/amd/config/mtab_aix.c index 78bf941fc6a99..9008936e4223f 100644 --- a/usr.sbin/amd/config/mtab_aix.c +++ b/usr.sbin/amd/config/mtab_aix.c @@ -37,7 +37,7 @@ * * @(#)mtab_aix.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab_aix.c,v 5.2.2.1 1992/02/09 15:10:07 jsp beta $ + * $Id: mtab_aix.c,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mtab_bsd.c b/usr.sbin/amd/config/mtab_bsd.c index 1d81127a29a77..21a8676ad886a 100644 --- a/usr.sbin/amd/config/mtab_bsd.c +++ b/usr.sbin/amd/config/mtab_bsd.c @@ -37,7 +37,7 @@ * * @(#)mtab_bsd.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab_bsd.c,v 5.2.2.1 1992/02/09 15:10:13 jsp beta $ + * $Id: mtab_bsd.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mtab_file.c b/usr.sbin/amd/config/mtab_file.c index 5a82cd7eb6271..a97ae765dfc02 100644 --- a/usr.sbin/amd/config/mtab_file.c +++ b/usr.sbin/amd/config/mtab_file.c @@ -37,7 +37,7 @@ * * @(#)mtab_file.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab_file.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ + * $Id: mtab_file.c,v 1.2 1995/05/30 03:46:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/mtab_ultrix.c b/usr.sbin/amd/config/mtab_ultrix.c index 241ea883f6cf0..0e43fc6d93dab 100644 --- a/usr.sbin/amd/config/mtab_ultrix.c +++ b/usr.sbin/amd/config/mtab_ultrix.c @@ -37,7 +37,7 @@ * * @(#)mtab_ultrix.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab_ultrix.c,v 5.2.2.1 1992/02/09 15:10:50 jsp beta $ + * $Id: mtab_ultrix.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/config/newvers.sh b/usr.sbin/amd/config/newvers.sh index a5109662d3b8a..b6bfe2ea4a0e1 100644 --- a/usr.sbin/amd/config/newvers.sh +++ b/usr.sbin/amd/config/newvers.sh @@ -38,7 +38,7 @@ # # @(#)newvers.sh 8.1 (Berkeley) 6/6/93 # -# $Id: newvers.sh,v 5.2.2.1 1992/02/09 15:11:19 jsp beta $ +# $Id: newvers.sh,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # PATH=/usr/ucb:/bin:/usr/bin:$PATH if [ $# -ne 3 ]; then echo "Usage: newvers program arch os" >&2; exit 1; fi diff --git a/usr.sbin/amd/config/os-acis43.h b/usr.sbin/amd/config/os-acis43.h index bcc44d54a6004..01bd85f022730 100644 --- a/usr.sbin/amd/config/os-acis43.h +++ b/usr.sbin/amd/config/os-acis43.h @@ -37,7 +37,7 @@ * * @(#)os-acis43.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-acis43.h,v 5.2.2.1 1992/02/09 15:10:02 jsp beta $ + * $Id: os-acis43.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * IBM RT ACIS4.3 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-aix3.h b/usr.sbin/amd/config/os-aix3.h index c70b15919fb57..5669ef39ebd07 100644 --- a/usr.sbin/amd/config/os-aix3.h +++ b/usr.sbin/amd/config/os-aix3.h @@ -37,7 +37,7 @@ * * @(#)os-aix3.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-aix3.h,v 5.2.2.2 1992/05/31 16:38:49 jsp Exp $ + * $Id: os-aix3.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * AIX 3.1 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-aux.h b/usr.sbin/amd/config/os-aux.h index edd85a47e7647..fe88223dc4525 100644 --- a/usr.sbin/amd/config/os-aux.h +++ b/usr.sbin/amd/config/os-aux.h @@ -37,7 +37,7 @@ * * @(#)os-aux.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-aux.h,v 5.2.2.1 1992/02/09 15:10:10 jsp beta $ + * $Id: os-aux.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * A/UX macII definitions for Amd (automounter) * Contributed by Julian Onions <jpo@cs.nott.ac.uk> diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h index fa41cfecb68d9..dc70a09593fca 100644 --- a/usr.sbin/amd/config/os-bsd44.h +++ b/usr.sbin/amd/config/os-bsd44.h @@ -37,7 +37,7 @@ * * @(#)os-bsd44.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-bsd44.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ + * $Id: os-bsd44.h,v 1.2 1995/01/20 20:58:54 wollman Exp $ * * 4.4 BSD definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-concentrix.h b/usr.sbin/amd/config/os-concentrix.h index 4a130e00a10de..8bed52a3607eb 100644 --- a/usr.sbin/amd/config/os-concentrix.h +++ b/usr.sbin/amd/config/os-concentrix.h @@ -37,7 +37,7 @@ * * @(#)os-concentrix.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-concentrix.h,v 5.2.2.1 1992/02/09 15:10:14 jsp beta $ + * $Id: os-concentrix.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * Alliant Concentrix 5.0.0 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-convex.h b/usr.sbin/amd/config/os-convex.h index 224655530171d..b32ae88ca737c 100644 --- a/usr.sbin/amd/config/os-convex.h +++ b/usr.sbin/amd/config/os-convex.h @@ -37,7 +37,7 @@ * * @(#)os-convex.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-convex.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ + * $Id: os-convex.h,v 1.2 1995/05/30 03:46:06 rgrimes Exp $ * * Convex C220, version 7.1 definitions for Amd (automounter) * from Eitan Mizrotsky <eitan@shum.huji.ac.il> diff --git a/usr.sbin/amd/config/os-defaults.h b/usr.sbin/amd/config/os-defaults.h index ce10ae202f587..6190aef536fd6 100644 --- a/usr.sbin/amd/config/os-defaults.h +++ b/usr.sbin/amd/config/os-defaults.h @@ -37,7 +37,7 @@ * * @(#)os-defaults.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-defaults.h,v 5.2.2.1 1992/02/09 15:10:17 jsp beta $ + * $Id: os-defaults.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * Common OS definitions. These may be overridden in * the OS specific files ("os-foo.h"). diff --git a/usr.sbin/amd/config/os-dgux.h b/usr.sbin/amd/config/os-dgux.h index 98c81bfb1d8dd..eb704604fe0ad 100644 --- a/usr.sbin/amd/config/os-dgux.h +++ b/usr.sbin/amd/config/os-dgux.h @@ -37,7 +37,7 @@ * * @(#)os-dgux.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-dgux.h,v 5.2.2.1 1992/02/09 15:10:18 jsp beta $ + * $Id: os-dgux.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * dg/ux definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-fpx4.h b/usr.sbin/amd/config/os-fpx4.h index 8c6942118c982..b98d0fa6eb167 100644 --- a/usr.sbin/amd/config/os-fpx4.h +++ b/usr.sbin/amd/config/os-fpx4.h @@ -37,7 +37,7 @@ * * @(#)os-fpx4.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-fpx4.h,v 5.2.2.2 1992/05/31 16:39:34 jsp Exp $ + * $Id: os-fpx4.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Celerity FPX 4.1/2 definitions for Amd (automounter) * from Stephen Pope <scp@grizzly.acl.lanl.gov> diff --git a/usr.sbin/amd/config/os-hcx.h b/usr.sbin/amd/config/os-hcx.h index 5b3fb3033e249..78cb27afde2b7 100644 --- a/usr.sbin/amd/config/os-hcx.h +++ b/usr.sbin/amd/config/os-hcx.h @@ -37,7 +37,7 @@ * * @(#)os-hcx.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-hcx.h,v 5.2.2.1 1992/02/09 15:10:20 jsp beta $ + * $Id: os-hcx.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * Harris HCX/UX Release 3.0 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-hlh42.h b/usr.sbin/amd/config/os-hlh42.h index 43d2d0b315c44..dda22918a1508 100644 --- a/usr.sbin/amd/config/os-hlh42.h +++ b/usr.sbin/amd/config/os-hlh42.h @@ -37,7 +37,7 @@ * * @(#)os-hlh42.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-hlh42.h,v 5.2.2.1 1992/02/09 15:10:22 jsp beta $ + * $Id: os-hlh42.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * HLH OTS definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-hpux.h b/usr.sbin/amd/config/os-hpux.h index 42b6b8b5b03c6..9d160485087ad 100644 --- a/usr.sbin/amd/config/os-hpux.h +++ b/usr.sbin/amd/config/os-hpux.h @@ -37,7 +37,7 @@ * * @(#)os-hpux.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-hpux.h,v 5.2.2.1 1992/02/09 15:10:23 jsp beta $ + * $Id: os-hpux.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * HP/9000 HP-UX definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-irix.h b/usr.sbin/amd/config/os-irix.h index 1d854f7d7f218..0e45d573ab190 100644 --- a/usr.sbin/amd/config/os-irix.h +++ b/usr.sbin/amd/config/os-irix.h @@ -37,7 +37,7 @@ * * @(#)os-irix.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-irix.h,v 5.2.2.1 1992/02/09 15:10:28 jsp beta $ + * $Id: os-irix.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * IRIX 3.3 definitions for Amd (automounter) * Contributed by Scott R. Presnell <srp@cgl.ucsf.edu> diff --git a/usr.sbin/amd/config/os-irix3.h b/usr.sbin/amd/config/os-irix3.h index 867097dbe7f94..7e9f956b0f64d 100644 --- a/usr.sbin/amd/config/os-irix3.h +++ b/usr.sbin/amd/config/os-irix3.h @@ -37,7 +37,7 @@ * * @(#)os-irix3.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-irix3.h,v 5.2 1992/05/31 16:40:22 jsp Exp $ + * $Id: os-irix3.h,v 1.1.1.1 1994/05/26 05:22:10 rgrimes Exp $ * * IRIX 3.3 definitions for Amd (automounter) * Contributed by Scott R. Presnell <srp@cgl.ucsf.edu> diff --git a/usr.sbin/amd/config/os-irix4.h b/usr.sbin/amd/config/os-irix4.h index 31cb6b1753271..d9c1785d0aad3 100644 --- a/usr.sbin/amd/config/os-irix4.h +++ b/usr.sbin/amd/config/os-irix4.h @@ -37,7 +37,7 @@ * * @(#)os-irix4.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-irix4.h,v 1.1.1.1 1994/05/26 05:22:10 rgrimes Exp $ + * $Id: os-irix4.h,v 1.2 1995/05/30 03:46:07 rgrimes Exp $ * * IRIX 4.0.X definitions for Amd (automounter) * Contributed by Scott R. Presnell <srp@cgl.ucsf.edu> diff --git a/usr.sbin/amd/config/os-next.h b/usr.sbin/amd/config/os-next.h index c9b1cc2e72551..a3af45ac8df1c 100644 --- a/usr.sbin/amd/config/os-next.h +++ b/usr.sbin/amd/config/os-next.h @@ -37,7 +37,7 @@ * * @(#)os-next.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-next.h,v 5.2.2.1 1992/02/09 15:10:33 jsp beta $ + * $Id: os-next.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * NeXT OS definitions for Amd (automounter) * By Bill Trost, Reed College diff --git a/usr.sbin/amd/config/os-pyrOSx.h b/usr.sbin/amd/config/os-pyrOSx.h index 21b5fdd91d45d..52c13e8fe1840 100644 --- a/usr.sbin/amd/config/os-pyrOSx.h +++ b/usr.sbin/amd/config/os-pyrOSx.h @@ -37,7 +37,7 @@ * * @(#)os-pyrOSx.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-pyrOSx.h,v 5.2.2.1 1992/02/09 15:10:37 jsp beta $ + * $Id: os-pyrOSx.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * * Pyramid OSx definitions for Amd (automounter) * from Stefan Petri <petri@tubsibr.UUCP> diff --git a/usr.sbin/amd/config/os-riscix.h b/usr.sbin/amd/config/os-riscix.h index cff795160a784..fea086094dfb2 100644 --- a/usr.sbin/amd/config/os-riscix.h +++ b/usr.sbin/amd/config/os-riscix.h @@ -37,7 +37,7 @@ * * @(#)os-riscix.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-riscix.h,v 5.2.2.1 1992/02/09 15:10:38 jsp beta $ + * $Id: os-riscix.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Acorn Archimedes RISC iX definitions for Amd (automounter) * Contributed by Piete Brooks. diff --git a/usr.sbin/amd/config/os-sos3.h b/usr.sbin/amd/config/os-sos3.h index 15c632cf31dda..311bbaab3acd9 100644 --- a/usr.sbin/amd/config/os-sos3.h +++ b/usr.sbin/amd/config/os-sos3.h @@ -37,7 +37,7 @@ * * @(#)os-sos3.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-sos3.h,v 5.2.2.1 1992/02/09 15:10:39 jsp beta $ + * $Id: os-sos3.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * SunOS 3.2 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-sos4.h b/usr.sbin/amd/config/os-sos4.h index 3853a6c1b76f0..c73f96183c2f6 100644 --- a/usr.sbin/amd/config/os-sos4.h +++ b/usr.sbin/amd/config/os-sos4.h @@ -37,7 +37,7 @@ * * @(#)os-sos4.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-sos4.h,v 5.2.2.1 1992/02/09 15:10:41 jsp beta $ + * $Id: os-sos4.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * SunOS 4.0 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-stellix.h b/usr.sbin/amd/config/os-stellix.h index 8c6290a5be2cd..377e22549fbec 100644 --- a/usr.sbin/amd/config/os-stellix.h +++ b/usr.sbin/amd/config/os-stellix.h @@ -40,7 +40,7 @@ * Amd (automounter) definitions for Stellix. * From Stephen C. Pope <scp@acl.lanl.gov> * - * $Id: os-stellix.h,v 5.2.2.1 1992/02/09 15:10:43 jsp beta $ + * $Id: os-stellix.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ */ #define RPC_3 diff --git a/usr.sbin/amd/config/os-type b/usr.sbin/amd/config/os-type index 4871d79d0aa5c..b741e98132ae0 100644 --- a/usr.sbin/amd/config/os-type +++ b/usr.sbin/amd/config/os-type @@ -38,7 +38,7 @@ # # @(#)os-type 8.1 (Berkeley) 6/6/93 # -# $Id: os-type,v 5.2.2.2 1992/05/31 16:45:46 jsp Exp $ +# $Id: os-type,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ # # diff --git a/usr.sbin/amd/config/os-u2_2.h b/usr.sbin/amd/config/os-u2_2.h index aece17110cf36..34e343bfdd3e5 100644 --- a/usr.sbin/amd/config/os-u2_2.h +++ b/usr.sbin/amd/config/os-u2_2.h @@ -37,7 +37,7 @@ * * @(#)os-u2_2.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-u2_2.h,v 5.2.2.1 1992/02/09 15:10:48 jsp beta $ + * $Id: os-u2_2.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Ultrix 2.2 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-u3_0.h b/usr.sbin/amd/config/os-u3_0.h index 08a4f36b20f16..b02f3343d0656 100644 --- a/usr.sbin/amd/config/os-u3_0.h +++ b/usr.sbin/amd/config/os-u3_0.h @@ -37,7 +37,7 @@ * * @(#)os-u3_0.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-u3_0.h,v 5.2.2.1 1992/02/09 15:10:52 jsp beta $ + * $Id: os-u3_0.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Ultrix 3.0 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-u4_0.h b/usr.sbin/amd/config/os-u4_0.h index 07c9833055052..7d37c97e21017 100644 --- a/usr.sbin/amd/config/os-u4_0.h +++ b/usr.sbin/amd/config/os-u4_0.h @@ -37,7 +37,7 @@ * * @(#)os-u4_0.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-u4_0.h,v 5.2.2.1 1992/02/09 15:10:53 jsp beta $ + * $Id: os-u4_0.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Ultrix 4.0 definitions for Amd (automounter) * from Chris Lindblad <cjl@ai.mit.edu> diff --git a/usr.sbin/amd/config/os-u4_2.h b/usr.sbin/amd/config/os-u4_2.h index f8f039c679986..295a32d9e39df 100644 --- a/usr.sbin/amd/config/os-u4_2.h +++ b/usr.sbin/amd/config/os-u4_2.h @@ -37,7 +37,7 @@ * * @(#)os-u4_2.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-u4_2.h,v 5.2.2.1 1992/02/09 15:10:54 jsp beta $ + * $Id: os-u4_2.h,v 1.1.1.1 1994/05/26 05:22:10 rgrimes Exp $ * * Ultrix 4.2 definitions for Amd (automounter) * from Chris Lindblad <cjl@ai.mit.edu> diff --git a/usr.sbin/amd/config/os-umax43.h b/usr.sbin/amd/config/os-umax43.h index 3e80872f7edc8..5312775a34f4a 100644 --- a/usr.sbin/amd/config/os-umax43.h +++ b/usr.sbin/amd/config/os-umax43.h @@ -37,7 +37,7 @@ * * @(#)os-umax43.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-umax43.h,v 5.2.2.1 1992/02/09 15:10:55 jsp beta $ + * $Id: os-umax43.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ * * UMAX 4.3 definitions for Amd (automounter) */ diff --git a/usr.sbin/amd/config/os-utek.h b/usr.sbin/amd/config/os-utek.h index eb1be04d1f3d9..99e057e286c0c 100644 --- a/usr.sbin/amd/config/os-utek.h +++ b/usr.sbin/amd/config/os-utek.h @@ -37,7 +37,7 @@ * * @(#)os-utek.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-utek.h,v 5.2.2.1 1992/02/09 15:10:56 jsp beta $ + * $Id: os-utek.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * Utek 4.0 definitions for Amd (automounter) * from Bill Trost <trost%reed@cse.ogi.edu> diff --git a/usr.sbin/amd/config/os-utx32.h b/usr.sbin/amd/config/os-utx32.h index 29612c4bb2b83..29f28e0980dee 100644 --- a/usr.sbin/amd/config/os-utx32.h +++ b/usr.sbin/amd/config/os-utx32.h @@ -1,4 +1,4 @@ -/* $Id: os-utx32.h,v 5.2.1.1 90/10/21 22:31:11 jsp Exp $ */ +/* $Id: os-utx32.h,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ */ /* * Gould UTX/32 definitions for Amd (automounter) diff --git a/usr.sbin/amd/config/os-xinu43.h b/usr.sbin/amd/config/os-xinu43.h index e85cea249eb7d..a44d67d23a8dd 100644 --- a/usr.sbin/amd/config/os-xinu43.h +++ b/usr.sbin/amd/config/os-xinu43.h @@ -37,7 +37,7 @@ * * @(#)os-xinu43.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-xinu43.h,v 5.2.2.1 1992/02/09 15:10:58 jsp beta $ + * $Id: os-xinu43.h,v 1.1.1.1 1994/05/26 05:22:08 rgrimes Exp $ * * mt Xinu 4.3 (MORE/bsd) definitions for Amd (automounter) * Should work on both Vax and HP ... diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile index eba12704fb3f8..3fe6e2ec875ec 100644 --- a/usr.sbin/amd/doc/Makefile +++ b/usr.sbin/amd/doc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1.1.1 1994/05/26 05:22:14 rgrimes Exp $ +# $Id: Makefile,v 1.2 1995/02/19 09:10:53 jkh Exp $ # # Copyright (c) 1990 Jan-Simon Pendry # Copyright (c) 1990 Imperial College of Science, Technology & Medicine diff --git a/usr.sbin/amd/doc/amdref.texinfo b/usr.sbin/amd/doc/amdref.texinfo index 89cd5e12c46af..310cf800a92ee 100644 --- a/usr.sbin/amd/doc/amdref.texinfo +++ b/usr.sbin/amd/doc/amdref.texinfo @@ -37,7 +37,7 @@ @c @c @(#)amdref.texinfo 8.1 (Berkeley) 6/6/93 @c -@c $Id: amdref.texinfo,v 1.1.1.1 1994/05/26 05:22:11 rgrimes Exp $ +@c $Id: amdref.texinfo,v 1.2 1995/02/19 09:11:07 jkh Exp $ @c @setfilename amdref.info @c @setfilename /usr/local/emacs/info/amd diff --git a/usr.sbin/amd/fsinfo/conf/csg_sun3 b/usr.sbin/amd/fsinfo/conf/csg_sun3 index 7d75db2e4e2a3..68f8dfa9044fa 100644 --- a/usr.sbin/amd/fsinfo/conf/csg_sun3 +++ b/usr.sbin/amd/fsinfo/conf/csg_sun3 @@ -1,4 +1,4 @@ -// $Id$ +// $Id: csg_sun3,v 1.1.1.1 1994/05/26 05:22:19 rgrimes Exp $ // standard setups for DoC tsuns. // note that no /var/spool/rwho is mounted as we now expect amd to do this as /vol/rwho diff --git a/usr.sbin/amd/fsinfo/conf/csg_vax b/usr.sbin/amd/fsinfo/conf/csg_vax index 356ff7b1c3e90..d3ec6ae0ff6ca 100644 --- a/usr.sbin/amd/fsinfo/conf/csg_vax +++ b/usr.sbin/amd/fsinfo/conf/csg_vax @@ -1,4 +1,4 @@ -// $Id: csg_vax,v 1.1.1.1 1994/05/26 05:22:19 rgrimes Exp $ +// $Id: csg_vax,v 1.2 1995/02/04 20:01:53 phk Exp $ // csg vax config - really just for {s,r}vax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk index 31f1be024a2fa..94a96002ed142 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for flamingo -// $Id$ +// $Id: flamingo.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:19 rgrimes Exp $ host flamingo.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk index 8804c8e24edae..7d83253328774 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for gould -// $Id$ +// $Id: gould.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:19 rgrimes Exp $ host gould.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk index c8fcb5df88e3a..d97a25bc59cc3 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id$ +// $Id: ivax.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ // ivax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk index dd9f0f7c67e98..1335827d9d10d 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id$ +// $Id: obsidian.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ // conf for obsidian #define FSTYPE_UFS hfs diff --git a/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk index 1ffd8d7c78c22..d1f212750e0c2 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for pelican -// $Id$ +// $Id: pelican.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ host pelican.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk index 05038ba532e05..2d33e06d06c29 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: rvax.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ +// $Id: rvax.doc.ic.ac.uk,v 1.2 1995/02/04 20:01:59 phk Exp $ // rvax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk index c0ed79aae586f..c1d65bf203904 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: sky.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ +// $Id: sky.doc.ic.ac.uk,v 1.2 1995/02/04 20:02:00 phk Exp $ // sky #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk index 795ef54cf315e..4cf8cf3ba53e2 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id: svax.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:20 rgrimes Exp $ +// $Id: svax.doc.ic.ac.uk,v 1.2 1995/02/04 20:02:01 phk Exp $ // svax #define FSTYPE_UFS 4.2 diff --git a/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk index b09db9dc898c1..56200df599893 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk @@ -1,5 +1,5 @@ // mkfsinfo for tsunfs -// $Id$ +// $Id: tsunfs.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:22 rgrimes Exp $ host tsunfs.doc.ic.ac.uk diff --git a/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk b/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk index 831053bd48541..b073044b55836 100644 --- a/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk +++ b/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk @@ -1,4 +1,4 @@ -// $Id$ +// $Id: whoops.doc.ic.ac.uk,v 1.1.1.1 1994/05/26 05:22:22 rgrimes Exp $ // sm's bastardised csg_sun3 // note that no /var/spool/rwho is mounted as we now expect amd to do this as /vol/rwho diff --git a/usr.sbin/amd/fsinfo/fsi_analyze.c b/usr.sbin/amd/fsinfo/fsi_analyze.c index d436a49ca4b60..4d495baeeb9f2 100644 --- a/usr.sbin/amd/fsinfo/fsi_analyze.c +++ b/usr.sbin/amd/fsinfo/fsi_analyze.c @@ -37,7 +37,7 @@ * * @(#)fsi_analyze.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_analyze.c,v 5.2.2.1 1992/02/09 15:09:41 jsp beta $ + * $Id: fsi_analyze.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_data.h b/usr.sbin/amd/fsinfo/fsi_data.h index 5ee39c20d38b5..c56136275f331 100644 --- a/usr.sbin/amd/fsinfo/fsi_data.h +++ b/usr.sbin/amd/fsinfo/fsi_data.h @@ -37,7 +37,7 @@ * * @(#)fsi_data.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_data.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ + * $Id: fsi_data.h,v 1.2 1995/05/30 03:46:09 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_dict.c b/usr.sbin/amd/fsinfo/fsi_dict.c index 3aced3da76771..83663dd55b8f0 100644 --- a/usr.sbin/amd/fsinfo/fsi_dict.c +++ b/usr.sbin/amd/fsinfo/fsi_dict.c @@ -37,7 +37,7 @@ * * @(#)fsi_dict.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_dict.c,v 1.1.1.1 1994/05/26 05:22:17 rgrimes Exp $ + * $Id: fsi_dict.c,v 1.2 1995/05/30 03:46:10 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_gram.y b/usr.sbin/amd/fsinfo/fsi_gram.y index b4aa2459e69dd..285fbc0dd3e21 100644 --- a/usr.sbin/amd/fsinfo/fsi_gram.y +++ b/usr.sbin/amd/fsinfo/fsi_gram.y @@ -37,7 +37,7 @@ * * @(#)fsi_gram.y 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_gram.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $ + * $Id: fsi_gram.y,v 1.1.1.1 1994/05/26 05:22:17 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_lex.l b/usr.sbin/amd/fsinfo/fsi_lex.l index f7dcbbc818531..573555fae5c27 100644 --- a/usr.sbin/amd/fsinfo/fsi_lex.l +++ b/usr.sbin/amd/fsinfo/fsi_lex.l @@ -38,7 +38,7 @@ * * @(#)fsi_lex.l 8.2 (Berkeley) 2/17/94 * - * $Id: fsi_lex.l,v 1.1.1.1 1994/05/26 05:22:17 rgrimes Exp $ + * $Id: fsi_lex.l,v 1.2 1995/05/08 16:50:19 gpalmer Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsi_util.c b/usr.sbin/amd/fsinfo/fsi_util.c index f6371ca0b09d0..41c1870c888e4 100644 --- a/usr.sbin/amd/fsinfo/fsi_util.c +++ b/usr.sbin/amd/fsinfo/fsi_util.c @@ -34,7 +34,7 @@ * * @(#)fsi_util.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_util.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ + * $Id: fsi_util.c,v 1.2 1995/05/30 03:46:11 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c index a4b867b926343..46b531c3da487 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.c +++ b/usr.sbin/amd/fsinfo/fsinfo.c @@ -37,7 +37,7 @@ * * @(#)fsinfo.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsinfo.c,v 5.2.2.1 1992/02/09 15:09:33 jsp beta $ + * $Id: fsinfo.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/fsinfo.h b/usr.sbin/amd/fsinfo/fsinfo.h index 0d07e21b0f87d..d45baafc348a6 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.h +++ b/usr.sbin/amd/fsinfo/fsinfo.h @@ -37,7 +37,7 @@ * * @(#)fsinfo.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsinfo.h,v 5.2.2.1 1992/02/09 15:09:51 jsp beta $ + * $Id: fsinfo.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_atab.c b/usr.sbin/amd/fsinfo/wr_atab.c index 95e942644bb71..987cf9ea0123b 100644 --- a/usr.sbin/amd/fsinfo/wr_atab.c +++ b/usr.sbin/amd/fsinfo/wr_atab.c @@ -37,7 +37,7 @@ * * @(#)wr_atab.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_atab.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ + * $Id: wr_atab.c,v 1.2 1995/05/30 03:46:12 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_bparam.c b/usr.sbin/amd/fsinfo/wr_bparam.c index 9ef0fcd8f0881..8d3dff1b0cb17 100644 --- a/usr.sbin/amd/fsinfo/wr_bparam.c +++ b/usr.sbin/amd/fsinfo/wr_bparam.c @@ -37,7 +37,7 @@ * * @(#)wr_bparam.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_bparam.c,v 5.2.2.1 1992/02/09 15:09:46 jsp beta $ + * $Id: wr_bparam.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_dumpset.c b/usr.sbin/amd/fsinfo/wr_dumpset.c index d118feb83d392..8b6711c158976 100644 --- a/usr.sbin/amd/fsinfo/wr_dumpset.c +++ b/usr.sbin/amd/fsinfo/wr_dumpset.c @@ -37,7 +37,7 @@ * * @(#)wr_dumpset.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_dumpset.c,v 5.2.2.1 1992/02/09 15:09:47 jsp beta $ + * $Id: wr_dumpset.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_exportfs.c b/usr.sbin/amd/fsinfo/wr_exportfs.c index 982b538fd850c..38bfdc597a77f 100644 --- a/usr.sbin/amd/fsinfo/wr_exportfs.c +++ b/usr.sbin/amd/fsinfo/wr_exportfs.c @@ -37,7 +37,7 @@ * * @(#)wr_exportfs.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_exportfs.c,v 5.2.2.1 1992/02/09 15:09:48 jsp beta $ + * $Id: wr_exportfs.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/fsinfo/wr_fstab.c b/usr.sbin/amd/fsinfo/wr_fstab.c index 85d36876c9e8f..1505ece626b2a 100644 --- a/usr.sbin/amd/fsinfo/wr_fstab.c +++ b/usr.sbin/amd/fsinfo/wr_fstab.c @@ -37,7 +37,7 @@ * * @(#)wr_fstab.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_fstab.c,v 5.2.2.1 1992/02/09 15:09:49 jsp beta $ + * $Id: wr_fstab.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/include/am.h b/usr.sbin/amd/include/am.h index 14a728dbb7e93..fc2bfac71dca1 100644 --- a/usr.sbin/amd/include/am.h +++ b/usr.sbin/amd/include/am.h @@ -37,7 +37,7 @@ * * @(#)am.h 5.6 (Berkeley) 6/6/93 * - * $Id: am.h,v 5.2.2.1 1992/02/09 15:09:54 jsp beta $ + * $Id: am.h,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index 09b77bf95f8e8..14af42295c5b5 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -37,7 +37,7 @@ * * @(#)config.h 8.1 (Berkeley) 6/6/93 * - * $Id: config.h,v 5.2.2.1 1992/02/09 15:09:56 jsp beta $ + * $Id: config.h,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/include/fstype.h b/usr.sbin/amd/include/fstype.h index 03493d25110f4..e939ce7afadbe 100644 --- a/usr.sbin/amd/include/fstype.h +++ b/usr.sbin/amd/include/fstype.h @@ -37,7 +37,7 @@ * * @(#)fstype.h 8.1 (Berkeley) 6/6/93 * - * $Id: fstype.h,v 5.2.2.1 1992/02/09 15:09:57 jsp beta $ + * $Id: fstype.h,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/include/uwait.h b/usr.sbin/amd/include/uwait.h index c3f8cbefb149d..e34f16b349c75 100644 --- a/usr.sbin/amd/include/uwait.h +++ b/usr.sbin/amd/include/uwait.h @@ -37,7 +37,7 @@ * * @(#)uwait.h 8.1 (Berkeley) 6/6/93 * - * $Id: uwait.h,v 5.2.2.1 1992/02/09 15:10:01 jsp beta $ + * $Id: uwait.h,v 1.1.1.1 1994/05/26 05:22:06 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c index c2dfb71b12c67..79fe749fa6f91 100644 --- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c +++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c @@ -37,7 +37,7 @@ * * @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93 * - * $Id: mk-amd-map.c,v 5.2.2.1 1992/02/09 15:09:18 jsp beta $ + * $Id: mk-amd-map.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $ */ /* @@ -53,7 +53,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: mk-amd-map.c,v 5.2.2.1 1992/02/09 15:09:18 jsp beta $"; +static char rcsid[] = "$Id: mk-amd-map.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $"; static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93"; #endif /* not lint */ diff --git a/usr.sbin/amd/rpcx/amq.h b/usr.sbin/amd/rpcx/amq.h index 7ec4d5512026d..0865a94601d8a 100644 --- a/usr.sbin/amd/rpcx/amq.h +++ b/usr.sbin/amd/rpcx/amq.h @@ -37,7 +37,7 @@ * * @(#)amq.h 8.1 (Berkeley) 6/6/93 * - * $Id: amq.h,v 5.2.2.1 1992/02/09 15:09:22 jsp beta $ + * $Id: amq.h,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/amq.x b/usr.sbin/amd/rpcx/amq.x index d75805dc21d55..59e5322f1eca5 100644 --- a/usr.sbin/amd/rpcx/amq.x +++ b/usr.sbin/amd/rpcx/amq.x @@ -37,7 +37,7 @@ * * @(#)amq.x 8.1 (Berkeley) 6/6/93 * - * $Id: amq.x,v 5.2.2.1 1992/02/09 15:09:20 jsp beta $ + * $Id: amq.x,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/amq_clnt.c b/usr.sbin/amd/rpcx/amq_clnt.c index 5b70d1171cffc..8ce237281392c 100644 --- a/usr.sbin/amd/rpcx/amq_clnt.c +++ b/usr.sbin/amd/rpcx/amq_clnt.c @@ -37,7 +37,7 @@ * * @(#)amq_clnt.c 8.1 (Berkeley) 6/6/93 * - * $Id: amq_clnt.c,v 5.2.2.1 1992/02/09 15:09:24 jsp beta $ + * $Id: amq_clnt.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/amq_svc.c b/usr.sbin/amd/rpcx/amq_svc.c index 0d3599f07ce20..3dd2433404591 100644 --- a/usr.sbin/amd/rpcx/amq_svc.c +++ b/usr.sbin/amd/rpcx/amq_svc.c @@ -37,7 +37,7 @@ * * @(#)amq_svc.c 8.1 (Berkeley) 6/6/93 * - * $Id: amq_svc.c,v 5.2.2.1 1992/02/09 15:09:26 jsp beta $ + * $Id: amq_svc.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/amq_xdr.c b/usr.sbin/amd/rpcx/amq_xdr.c index 8a123a711a6a6..832de80be1831 100644 --- a/usr.sbin/amd/rpcx/amq_xdr.c +++ b/usr.sbin/amd/rpcx/amq_xdr.c @@ -37,7 +37,7 @@ * * @(#)amq_xdr.c 8.1 (Berkeley) 6/6/93 * - * $Id: amq_xdr.c,v 5.2.2.1 1992/02/09 15:09:23 jsp beta $ + * $Id: amq_xdr.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/mount.h b/usr.sbin/amd/rpcx/mount.h index d30b0c3809dd8..0281fb730e431 100644 --- a/usr.sbin/amd/rpcx/mount.h +++ b/usr.sbin/amd/rpcx/mount.h @@ -37,7 +37,7 @@ * * @(#)mount.h 8.1 (Berkeley) 6/6/93 * - * $Id: mount.h,v 5.2.2.1 1992/02/09 15:09:27 jsp beta $ + * $Id: mount.h,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/mount_xdr.c b/usr.sbin/amd/rpcx/mount_xdr.c index f8d8f57f0fca3..25ea5fef8f31f 100644 --- a/usr.sbin/amd/rpcx/mount_xdr.c +++ b/usr.sbin/amd/rpcx/mount_xdr.c @@ -37,7 +37,7 @@ * * @(#)mount_xdr.c 8.1 (Berkeley) 6/6/93 * - * $Id: mount_xdr.c,v 5.2.2.1 1992/02/09 15:09:28 jsp beta $ + * $Id: mount_xdr.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/nfs_prot.h b/usr.sbin/amd/rpcx/nfs_prot.h index 62a75f7993fab..da660d0a5261d 100644 --- a/usr.sbin/amd/rpcx/nfs_prot.h +++ b/usr.sbin/amd/rpcx/nfs_prot.h @@ -37,7 +37,7 @@ * * @(#)nfs_prot.h 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_prot.h,v 5.2.2.1 1992/02/09 15:09:29 jsp beta $ + * $Id: nfs_prot.h,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/nfs_prot_svc.c b/usr.sbin/amd/rpcx/nfs_prot_svc.c index 21e47e3399623..ab68f7b13809c 100644 --- a/usr.sbin/amd/rpcx/nfs_prot_svc.c +++ b/usr.sbin/amd/rpcx/nfs_prot_svc.c @@ -37,7 +37,7 @@ * * @(#)nfs_prot_svc.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_prot_svc.c,v 5.2.2.1 1992/02/09 15:09:30 jsp beta $ + * $Id: nfs_prot_svc.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/rpcx/nfs_prot_xdr.c b/usr.sbin/amd/rpcx/nfs_prot_xdr.c index 1786d01bd642c..91458be0428fd 100644 --- a/usr.sbin/amd/rpcx/nfs_prot_xdr.c +++ b/usr.sbin/amd/rpcx/nfs_prot_xdr.c @@ -37,7 +37,7 @@ * * @(#)nfs_prot_xdr.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_prot_xdr.c,v 5.2.2.1 1992/02/09 15:09:32 jsp beta $ + * $Id: nfs_prot_xdr.c,v 1.1.1.1 1994/05/26 05:22:05 rgrimes Exp $ * */ diff --git a/usr.sbin/amd/text/INSTALL b/usr.sbin/amd/text/INSTALL index d35aaaabaae12..df9b2bb547af6 100644 --- a/usr.sbin/amd/text/INSTALL +++ b/usr.sbin/amd/text/INSTALL @@ -191,4 +191,4 @@ mapping root to nobody. If anything interesting happened, eg it didn't work, please report it to me -- Jan-Simon Pendry <jsp@doc.ic.ac.uk> -- as detailed in the README file. -$Id: INSTALL,v 5.2.2.2 1992/05/31 16:49:22 jsp Exp $ +$Id: INSTALL,v 1.1.1.1 1994/05/26 05:22:16 rgrimes Exp $ diff --git a/usr.sbin/amd/text/README b/usr.sbin/amd/text/README index 01d3a8b11ff70..298f80fa33319 100644 --- a/usr.sbin/amd/text/README +++ b/usr.sbin/amd/text/README @@ -34,4 +34,4 @@ being used. Thanks. The manual page (amd/amd.8) only lists the command line options. See the texinfo document doc/amdref.texinfo for a more detailed discussion. -$Id: README,v 5.2.2.1 1992/02/09 15:11:35 jsp beta $ +$Id: README,v 1.1.1.1 1994/05/26 05:22:16 rgrimes Exp $ diff --git a/usr.sbin/amd/text/amd.start.ex b/usr.sbin/amd/text/amd.start.ex index d7cdc1f7ddae2..28bf7ee965b8a 100644 --- a/usr.sbin/amd/text/amd.start.ex +++ b/usr.sbin/amd/text/amd.start.ex @@ -40,7 +40,7 @@ # # Start amd # -# $Id: amd.start.ex,v 5.2.2.1 1992/02/09 15:11:32 jsp beta $ +# $Id: amd.start.ex,v 1.1.1.1 1994/05/26 05:22:16 rgrimes Exp $ # PATH=/usr/sbin:/bin:/usr/bin:$PATH export PATH diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile index 337a177b36f3c..c4a27ec387a87 100644 --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.5.4.1 1995/10/06 10:11:44 davidg Exp $ +# $Id: Makefile,v 1.5.4.2 1996/03/28 20:57:49 joerg Exp $ PROG= bootparamd SRCS= bootparam_prot_xdr.c bootparam_prot_svc.c bootparamd.c main.c diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c index 02c2f67ae4a90..32614e1c7d36f 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparamd.c +++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c @@ -5,7 +5,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to Klas Heggemann <klas@nada.kth.se> - $Id: bootparamd.c,v 1.2 1995/05/30 03:46:27 rgrimes Exp $ + $Id: bootparamd.c,v 1.2.4.1 1995/08/26 11:32:30 davidg Exp $ */ diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5 index ecb391c4cb0fd..3977e10a5f8db 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparams.5 +++ b/usr.sbin/bootparamd/bootparamd/bootparams.5 @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" from: Id: bootparams.5,v 1.2 1994/10/03 19:26:13 gwr Exp -.\" $Id$ +.\" $Id: bootparams.5,v 1.1 1996/03/28 20:49:31 joerg Exp $ .\" .Dd October 2, 1994 .Dt BOOTPARAMS 5 diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c index 0a3618a064dd1..3c74db5d2a9f7 100644 --- a/usr.sbin/bootparamd/bootparamd/main.c +++ b/usr.sbin/bootparamd/bootparamd/main.c @@ -6,7 +6,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to Klas Heggemann <klas@nada.kth.se> - $Id: main.c,v 1.3 1995/07/25 22:44:14 wpaul Exp $ + $Id: main.c,v 1.2.4.1 1995/08/26 11:32:31 davidg Exp $ */ diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index f9123e6b1c182..07912f55a7b37 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.6 1995/07/04 08:39:07 bde Exp $ +# $Id: Makefile,v 1.5.4.1 1995/10/06 10:12:17 davidg Exp $ PROG= callbootd SRCS= bootparam_prot_xdr.c bootparam_prot_clnt.c callbootd.c diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c index 18cfac355e1f9..bcb1eb3bdabf1 100644 --- a/usr.sbin/bootparamd/callbootd/callbootd.c +++ b/usr.sbin/bootparamd/callbootd/callbootd.c @@ -5,7 +5,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to Klas Heggemann <klas@nada.kth.se> - $Id: callbootd.c,v 1.2 1995/03/26 03:15:39 wpaul Exp $ + $Id: callbootd.c,v 1.3 1995/05/30 03:46:30 rgrimes Exp $ */ diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h index ca851d17e64bb..549b2e9fcac96 100644 --- a/usr.sbin/cron/cron/compat.h +++ b/usr.sbin/cron/cron/compat.h @@ -16,7 +16,7 @@ */ /* - * $Id: compat.h,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $ + * $Id: compat.h,v 1.2 1995/04/29 15:16:41 ache Exp $ */ #ifndef __P diff --git a/usr.sbin/cron/cron/config.h b/usr.sbin/cron/cron/config.h index 640e001832f84..9d28b76203de2 100644 --- a/usr.sbin/cron/cron/config.h +++ b/usr.sbin/cron/cron/config.h @@ -17,7 +17,7 @@ /* config.h - configurables for Vixie Cron * - * $Id: config.h,v 1.3 1995/04/14 21:54:16 ache Exp $ + * $Id: config.h,v 1.4 1995/05/09 12:48:05 rgrimes Exp $ */ #if !defined(_PATH_SENDMAIL) diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8 index 1d6dcdad70f34..2e3c67e9f3545 100644 --- a/usr.sbin/cron/cron/cron.8 +++ b/usr.sbin/cron/cron/cron.8 @@ -15,7 +15,7 @@ .\" * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul .\" */ .\" -.\" $Id: cron.8,v 2.2 1993/12/28 08:34:43 vixie Exp $ +.\" $Id: cron.8,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ .\" .TH CRON 8 "20 December 1993" .UC 4 diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c index 624c37ac342d6..7bbdcd95ca1e6 100644 --- a/usr.sbin/cron/cron/cron.c +++ b/usr.sbin/cron/cron/cron.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: cron.c,v 2.11 1994/01/15 20:43:43 vixie Exp $"; +static char rcsid[] = "$Id: cron.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $"; #endif diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h index 66de64bcbe565..517b2b1637847 100644 --- a/usr.sbin/cron/cron/cron.h +++ b/usr.sbin/cron/cron/cron.h @@ -17,7 +17,7 @@ /* cron.h - header for vixie's cron * - * $Id: cron.h,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $ + * $Id: cron.h,v 1.2 1995/05/30 03:46:59 rgrimes Exp $ * * vix 14nov88 [rest of log is in RCS] * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley] diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c index f754ae12673d5..ab07db93694a6 100644 --- a/usr.sbin/cron/cron/database.c +++ b/usr.sbin/cron/cron/database.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: database.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $"; +static char rcsid[] = "$Id: database.c,v 1.1.1.1.6.1 1996/12/15 20:37:47 pst Exp $"; #endif /* vix 26jan87 [RCS has the log] diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c index b646d12789103..29db696fd03d8 100644 --- a/usr.sbin/cron/cron/do_command.c +++ b/usr.sbin/cron/cron/do_command.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: do_command.c,v 1.6 1995/09/10 13:02:56 joerg Exp $"; +static char rcsid[] = "$Id: do_command.c,v 1.5.4.1 1995/10/06 10:28:43 davidg Exp $"; #endif diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c index adaa072fd48a1..f63db47700849 100644 --- a/usr.sbin/cron/cron/job.c +++ b/usr.sbin/cron/cron/job.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: job.c,v 1.6 1994/01/15 20:43:43 vixie Exp $"; +static char rcsid[] = "$Id: job.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $"; #endif diff --git a/usr.sbin/cron/cron/pathnames.h b/usr.sbin/cron/cron/pathnames.h index 5ed9a9feba131..bb08fd9d1606d 100644 --- a/usr.sbin/cron/cron/pathnames.h +++ b/usr.sbin/cron/cron/pathnames.h @@ -16,7 +16,7 @@ */ /* - * $Id: pathnames.h,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $ + * $Id: pathnames.h,v 1.1.1.1.6.1 1995/08/26 11:35:17 davidg Exp $ */ #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX) diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c index 55708bb2400e3..179f470a5a197 100644 --- a/usr.sbin/cron/cron/popen.c +++ b/usr.sbin/cron/cron/popen.c @@ -24,7 +24,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: popen.c,v 1.5 1994/01/15 20:43:43 vixie Exp $"; +static char rcsid[] = "$Id: popen.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $"; static char sccsid[] = "@(#)popen.c 5.7 (Berkeley) 2/14/89"; #endif /* not lint */ diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c index 5f7ab137761d0..b6ac48ae0bb18 100644 --- a/usr.sbin/cron/cron/user.c +++ b/usr.sbin/cron/cron/user.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: user.c,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $"; +static char rcsid[] = "$Id: user.c,v 1.2 1995/05/30 03:47:01 rgrimes Exp $"; #endif /* vix 26jan87 [log is in RCS file] diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1 index c3c39431f7aed..b87a68ff1107a 100644 --- a/usr.sbin/cron/crontab/crontab.1 +++ b/usr.sbin/cron/crontab/crontab.1 @@ -15,7 +15,7 @@ .\" * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul .\" */ .\" -.\" $Id: crontab.1,v 2.4 1993/12/31 10:47:33 vixie Exp $ +.\" $Id: crontab.1,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $ .\" .TH CRONTAB 1 "29 December 1993" .UC 4 diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5 index 01b52f03fb316..6806b6a9917ee 100644 --- a/usr.sbin/cron/crontab/crontab.5 +++ b/usr.sbin/cron/crontab/crontab.5 @@ -15,7 +15,7 @@ .\" * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul .\" */ .\" -.\" $Id: crontab.5,v 2.4 1994/01/15 20:43:43 vixie Exp $ +.\" $Id: crontab.5,v 1.1.1.1 1994/08/27 13:43:04 jkh Exp $ .\" .TH CRONTAB 5 "24 January 1994" .UC 4 diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c index 2e9823f73d393..8c62712ff3e5b 100644 --- a/usr.sbin/cron/crontab/crontab.c +++ b/usr.sbin/cron/crontab/crontab.c @@ -17,7 +17,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: crontab.c,v 1.3.4.1 1996/04/09 21:23:11 scrappy Exp $"; +static char rcsid[] = "$Id: crontab.c,v 1.3.4.2 1996/12/15 20:37:59 pst Exp $"; #endif /* crontab - install and manage per-user crontab files diff --git a/usr.sbin/cron/doc/CONVERSION b/usr.sbin/cron/doc/CONVERSION index b86427d72cc8d..e8c2846b2fffd 100644 --- a/usr.sbin/cron/doc/CONVERSION +++ b/usr.sbin/cron/doc/CONVERSION @@ -1,4 +1,4 @@ -$Id: CONVERSION,v 2.2 1993/12/28 08:34:43 vixie Exp $ +$Id: CONVERSION,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ Conversion of BSD 4.[23] crontab files: diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES index 209b1e99a96c7..88255eeda807f 100644 --- a/usr.sbin/cron/doc/FEATURES +++ b/usr.sbin/cron/doc/FEATURES @@ -1,4 +1,4 @@ -$Id: FEATURES,v 2.1 1993/12/28 08:34:43 vixie Exp $ +$Id: FEATURES,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ Features of Vixie's cron relative to BSD 4.[23] and SysV crons: diff --git a/usr.sbin/cron/doc/INSTALL b/usr.sbin/cron/doc/INSTALL index cc660ffdaa696..9b128611a908d 100644 --- a/usr.sbin/cron/doc/INSTALL +++ b/usr.sbin/cron/doc/INSTALL @@ -15,7 +15,7 @@ * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul */ -$Id: INSTALL,v 2.5 1994/01/15 20:43:43 vixie Exp $ +$Id: INSTALL,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ Read the comments at the top of the Makefile, then edit the area marked 'configurable stuff'. diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL index b066e7e8e39d0..76d200ee9d612 100644 --- a/usr.sbin/cron/doc/MAIL +++ b/usr.sbin/cron/doc/MAIL @@ -3,7 +3,7 @@ version of cron. it is presented here for its entertainment value. --vix ] -$Id: MAIL,v 1.1 1993/12/28 08:30:36 vixie Exp $ +$Id: MAIL,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ From ptsfa!lll-crg!ames!acornrc!bob Wed Dec 31 10:07:08 1986 Date: Wed, 31 Dec 86 08:59:31 pst diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie index 2ce05b94c47c9..825eac9c9249c 100644 --- a/usr.sbin/cron/doc/Makefile.vixie +++ b/usr.sbin/cron/doc/Makefile.vixie @@ -17,7 +17,7 @@ # Makefile for vixie's cron # -# $Id: Makefile.vixie,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ +# $Id: Makefile.vixie,v 1.2 1995/05/30 03:47:08 rgrimes Exp $ # # vix 03mar88 [moved to RCS, rest of log is in there] # vix 30mar87 [goodbye, time.c; hello, getopt] diff --git a/usr.sbin/cron/doc/README b/usr.sbin/cron/doc/README index 751f04f646fc4..c42622b83d0ae 100644 --- a/usr.sbin/cron/doc/README +++ b/usr.sbin/cron/doc/README @@ -69,4 +69,4 @@ have to go edit a couple of files... So, here's the checklist: if you like it, change your /etc/{rc,rc.local} to use it instead of the old one. -$Id: README,v 2.3 1993/12/28 08:34:43 vixie Exp $ +$Id: README,v 1.1.1.1 1994/08/27 13:43:03 jkh Exp $ diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c index 87eeacce1936d..ef9a38f4172a8 100644 --- a/usr.sbin/cron/lib/compat.c +++ b/usr.sbin/cron/lib/compat.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: compat.c,v 1.1.1.1 1994/08/27 13:43:02 jkh Exp $"; +static char rcsid[] = "$Id: compat.c,v 1.2 1995/05/30 03:47:09 rgrimes Exp $"; #endif /* vix 30dec93 [broke this out of misc.c - see RCS log for history] diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c index 58ecf4ee7fbc0..a9e4638713db7 100644 --- a/usr.sbin/cron/lib/entry.c +++ b/usr.sbin/cron/lib/entry.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: entry.c,v 1.4 1995/08/28 21:30:46 mpp Exp $"; +static char rcsid[] = "$Id: entry.c,v 1.3.4.1 1995/09/02 14:39:59 davidg Exp $"; #endif /* vix 26jan87 [RCS'd; rest of log is in RCS file] diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c index f370601b223e7..9fd1ab0001f4b 100644 --- a/usr.sbin/cron/lib/env.c +++ b/usr.sbin/cron/lib/env.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: env.c,v 1.1.1.1 1994/08/27 13:43:02 jkh Exp $"; +static char rcsid[] = "$Id: env.c,v 1.1.1.1.6.1 1996/12/16 18:21:49 pst Exp $"; #endif diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c index b6313b8b52b42..561f498031d20 100644 --- a/usr.sbin/cron/lib/misc.c +++ b/usr.sbin/cron/lib/misc.c @@ -16,7 +16,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: misc.c,v 1.2 1995/04/29 13:25:13 ache Exp $"; +static char rcsid[] = "$Id: misc.c,v 1.3 1995/05/30 03:47:11 rgrimes Exp $"; #endif /* vix 26jan87 [RCS has the rest of the log] diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf index 96feb5376263a..fdca85d7c2342 100644 --- a/usr.sbin/crunch/examples/filesystem.conf +++ b/usr.sbin/crunch/examples/filesystem.conf @@ -1,4 +1,4 @@ -# $Id: filesystem.conf,v 1.4 1994/10/04 14:06:13 ache Exp $ +# $Id: filesystem.conf,v 1.5 1995/03/10 08:36:19 rgrimes Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin srcdirs /usr/src/sbin/i386 diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf index 5a3476d23522a..67ababf3c9b2b 100644 --- a/usr.sbin/crunch/examples/kcopy.conf +++ b/usr.sbin/crunch/examples/kcopy.conf @@ -1,4 +1,4 @@ -# $Id: kcopy.conf,v 1.3 1994/06/24 16:39:30 jkh Exp $ +# $Id: kcopy.conf,v 1.4 1994/09/09 16:02:04 rgrimes Exp $ srcdirs /usr/src/bin /usr/src/sbin diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc index 2ecf884239342..1ec0270afb370 100644 --- a/usr.sbin/ctm/Makefile.inc +++ b/usr.sbin/ctm/Makefile.inc @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1995/01/31 19:09:38 phk Exp $ .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/ctm/README b/usr.sbin/ctm/README index d887912492bec..d2d18608399a1 100644 --- a/usr.sbin/ctm/README +++ b/usr.sbin/ctm/README @@ -5,7 +5,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id$ +# $Id: README,v 1.4 1994/09/22 02:49:07 phk Exp $ # What will I not find in this file ? diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile index eb76ff11a4633..797c13d90d7be 100644 --- a/usr.sbin/ctm/ctm/Makefile +++ b/usr.sbin/ctm/ctm/Makefile @@ -6,7 +6,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: Makefile,v 1.9 1995/07/12 18:35:22 bde Exp $ +# $Id: Makefile,v 1.8.4.1 1995/09/06 14:20:18 davidg Exp $ # PROG= ctm diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1 index 2bc871f1f845a..c133c5ae4ed39 100644 --- a/usr.sbin/ctm/ctm/ctm.1 +++ b/usr.sbin/ctm/ctm/ctm.1 @@ -10,7 +10,7 @@ .\" .\" CTM and ctm(1) by <phk@login.dknet.dk> .\" -.\" $Id: ctm.1,v 1.2 1995/03/26 20:09:46 phk Exp $ +.\" $Id: ctm.1,v 1.2.4.1 1996/01/31 02:01:56 nate Exp $ .\" .Dd Mar 25, 1995 .Os diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5 index bf6ee50b09abe..5a3f2c9a9f1bf 100644 --- a/usr.sbin/ctm/ctm/ctm.5 +++ b/usr.sbin/ctm/ctm/ctm.5 @@ -10,7 +10,7 @@ .\" .\" CTM and ctm(1) by <phk@login.dknet.dk> .\" -.\" $Id: ctm.5,v 1.1 1995/03/25 18:14:26 joerg Exp $ +.\" $Id: ctm.5,v 1.2 1995/03/26 20:09:48 phk Exp $ .\" .Dd March 25, 1995 .Os diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c index 05ab0ccefa9f6..c43626e71f23d 100644 --- a/usr.sbin/ctm/ctm/ctm.c +++ b/usr.sbin/ctm/ctm/ctm.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm.c,v 1.10 1995/03/26 20:09:50 phk Exp $ + * $Id: ctm.c,v 1.11 1995/05/30 03:47:19 rgrimes Exp $ * * This is the client program of 'CTM'. It will apply a CTM-patch to a * collection of files. diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h index a444f983ec319..e7125da446f6d 100644 --- a/usr.sbin/ctm/ctm/ctm.h +++ b/usr.sbin/ctm/ctm/ctm.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm.h,v 1.6 1995/03/04 20:36:45 phk Exp $ + * $Id: ctm.h,v 1.7 1995/05/30 03:47:21 rgrimes Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c index a78be73cd0a59..29dd25a19d073 100644 --- a/usr.sbin/ctm/ctm/ctm_ed.c +++ b/usr.sbin/ctm/ctm/ctm_ed.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_ed.c,v 1.5 1995/04/16 22:40:49 bde Exp $ + * $Id: ctm_ed.c,v 1.6 1995/05/30 03:47:22 rgrimes Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c index 582bdf7bb5e08..d6903b6035aa3 100644 --- a/usr.sbin/ctm/ctm/ctm_input.c +++ b/usr.sbin/ctm/ctm/ctm_input.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: ctm_input.c,v 1.4 1994/09/22 02:49:18 phk Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c index 700002a1a91fc..dfd98ce4a564b 100644 --- a/usr.sbin/ctm/ctm/ctm_pass1.c +++ b/usr.sbin/ctm/ctm/ctm_pass1.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_pass1.c,v 1.11 1995/07/12 09:16:08 phk Exp $ + * $Id: ctm_pass1.c,v 1.10.4.1 1995/09/06 14:20:20 davidg Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c index d71149f238d4b..9a1e7a92757e1 100644 --- a/usr.sbin/ctm/ctm/ctm_pass2.c +++ b/usr.sbin/ctm/ctm/ctm_pass2.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_pass2.c,v 1.9 1995/07/12 09:16:10 phk Exp $ + * $Id: ctm_pass2.c,v 1.8.4.1 1995/09/06 14:20:21 davidg Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c index 8e35b51573d02..5d0d7cd24aba3 100644 --- a/usr.sbin/ctm/ctm/ctm_pass3.c +++ b/usr.sbin/ctm/ctm/ctm_pass3.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_pass3.c,v 1.11 1995/07/12 09:16:13 phk Exp $ + * $Id: ctm_pass3.c,v 1.10.4.1 1995/09/06 14:20:22 davidg Exp $ * */ diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c index 89ea54ff6115a..e82a29e608ef1 100644 --- a/usr.sbin/ctm/ctm/ctm_syntax.c +++ b/usr.sbin/ctm/ctm/ctm_syntax.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_syntax.c,v 1.4 1994/09/22 02:49:21 phk Exp $ + * $Id: ctm_syntax.c,v 1.5 1995/05/30 03:47:28 rgrimes Exp $ * */ diff --git a/usr.sbin/ctm/ctm_scan/Makefile b/usr.sbin/ctm/ctm_scan/Makefile index f009338aa9856..312b59b66434b 100644 --- a/usr.sbin/ctm/ctm_scan/Makefile +++ b/usr.sbin/ctm/ctm_scan/Makefile @@ -6,7 +6,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: Makefile,v 1.5 1994/09/22 02:49:22 phk Exp $ +# $Id: Makefile,v 1.6 1994/10/24 20:09:27 phk Exp $ # PROG= ctm_scan LDADD+= -lmd diff --git a/usr.sbin/ctm/ctm_scan/ctm_scan.c b/usr.sbin/ctm/ctm_scan/ctm_scan.c index 6637edec6417c..fd88b60e7d746 100644 --- a/usr.sbin/ctm/ctm_scan/ctm_scan.c +++ b/usr.sbin/ctm/ctm_scan/ctm_scan.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_scan.c,v 1.12 1995/07/13 15:33:42 phk Exp $ + * $Id: ctm_scan.c,v 1.11.4.1 1995/09/06 14:20:37 davidg Exp $ * */ #include <stdio.h> diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile index a860090a9e806..21061b8317fbc 100644 --- a/usr.sbin/fdwrite/Makefile +++ b/usr.sbin/fdwrite/Makefile @@ -6,7 +6,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: Makefile,v 1.1.1.1 1994/09/18 07:39:19 phk Exp $ +# $Id: Makefile,v 1.2 1994/10/14 16:03:32 joerg Exp $ # # diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1 index f41c117f8da74..9c2c1da905404 100644 --- a/usr.sbin/fdwrite/fdwrite.1 +++ b/usr.sbin/fdwrite/fdwrite.1 @@ -6,7 +6,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $Id: fdwrite.1,v 1.1.1.1 1994/09/18 07:39:19 phk Exp $ +.\" $Id: fdwrite.1,v 1.1.1.1.6.1 1996/01/30 13:59:17 mpp Exp $ .\" .\" .Dd September 16, 1993 diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c index d77040bc754ec..660d0c8451cf7 100644 --- a/usr.sbin/fdwrite/fdwrite.c +++ b/usr.sbin/fdwrite/fdwrite.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: fdwrite.c,v 1.2 1994/10/14 16:03:33 joerg Exp $ + * $Id: fdwrite.c,v 1.3 1995/05/30 03:47:40 rgrimes Exp $ * */ diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index eb9acff4d86b9..cf0e11869b222 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)inetd.8 8.3 (Berkeley) 4/13/94 -.\" $Id: inetd.8,v 1.4.4.1 1996/01/30 13:59:35 mpp Exp $ +.\" $Id: inetd.8,v 1.4.4.2 1996/05/07 03:11:55 gpalmer Exp $ .\" .Dd April 13, 1994 .Dt INETD 8 diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 6e6dbbef69bba..1a5ec21649b6f 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /* from: @(#)inetd.c 8.4 (Berkeley) 4/13/94"; */ static char inetd_c_rcsid[] = - "$Id: inetd.c,v 1.6.2.1 1996/05/07 03:11:58 gpalmer Exp $"; + "$Id: inetd.c,v 1.6.2.2 1996/10/28 23:03:54 joerg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 65fb1f2951f9b..0f4f889b5e9a4 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -25,7 +25,7 @@ * (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: kbdcontrol.c,v 1.8 1996/11/09 16:16:19 joerg Exp $ + * $Id: kbdcontrol.c,v 1.7.2.1 1996/11/10 12:45:04 jkh Exp $ */ #include <ctype.h> diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h index 9d9033de953f9..c3c91aac8df67 100644 --- a/usr.sbin/kbdcontrol/lex.h +++ b/usr.sbin/kbdcontrol/lex.h @@ -25,7 +25,7 @@ * (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: lex.h,v 1.1 1994/08/17 08:59:35 sos Exp $ + * $Id: lex.h,v 1.2 1995/01/28 22:17:21 sos Exp $ */ #define TNOP 256 diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l index d738a712a4194..47b3d5fce039f 100644 --- a/usr.sbin/kbdcontrol/lex.l +++ b/usr.sbin/kbdcontrol/lex.l @@ -25,7 +25,7 @@ * (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: lex.l,v 1.2 1995/01/28 22:17:22 sos Exp $ + * $Id: lex.l,v 1.3 1995/01/30 21:41:14 sos Exp $ */ %{ diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index 58a1e6954c052..b4d0622f56ebd 100644 --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -1,5 +1,5 @@ # Makefile for kbdmap / vidfont -# $Id: Makefile,v 1.5 1995/07/25 00:37:15 bde Exp $ +# $Id: Makefile,v 1.3.4.1 1995/09/20 07:30:33 davidg Exp $ SCRIPT= ${.CURDIR}/kbdmap.pl LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1 index 2e2ef64cf5023..464c38887941f 100644 --- a/usr.sbin/kbdmap/kbdmap.1 +++ b/usr.sbin/kbdmap/kbdmap.1 @@ -34,7 +34,7 @@ .\" .\" E-Mail: Wolfram Schneider <wosch@cs.tu-berlin.de> .\" -.\" $Id: kbdmap.1,v 1.1.4.1 1996/01/30 13:59:42 mpp Exp $ +.\" $Id: kbdmap.1,v 1.1.4.2 1996/06/27 05:33:04 gpalmer Exp $ .\" .Dd Mar 25, 1995 diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl index 8736d610d27cf..080b254d684f9 100644 --- a/usr.sbin/kbdmap/kbdmap.pl +++ b/usr.sbin/kbdmap/kbdmap.pl @@ -35,7 +35,7 @@ # # E-Mail: Wolfram Schneider <wosch@cs.tu-berlin.de> # -# $Id: kbdmap.pl,v 1.10 1995/04/03 21:13:52 w Exp $ +# $Id: kbdmap.pl,v 1.2 1995/04/05 08:09:24 jkh Exp $ # # simple test if syscons works diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile index ad5f6aae4cd32..6a424c9426b24 100644 --- a/usr.sbin/kernbb/Makefile +++ b/usr.sbin/kernbb/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/03/10 08:53:54 phk Exp $ +# $Id: Makefile,v 1.2 1995/04/28 04:52:33 phk Exp $ PROG= kernbb MAN8= kernbb.8 diff --git a/usr.sbin/kernbb/kernbb.c b/usr.sbin/kernbb/kernbb.c index 72b5bc1588121..a31ddb2b928cc 100644 --- a/usr.sbin/kernbb/kernbb.c +++ b/usr.sbin/kernbb/kernbb.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: kernbb.c,v 1.1 1995/03/10 08:53:55 phk Exp $ + * $Id: kernbb.c,v 1.2 1995/04/28 04:58:19 phk Exp $ * */ diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1 index 4d7acffb782ec..18f6b1fda0d0e 100644 --- a/usr.sbin/lpr/lp/lp.1 +++ b/usr.sbin/lpr/lp/lp.1 @@ -31,7 +31,7 @@ .\" (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: lp.1,v 1.1 1995/01/23 19:22:37 joerg Exp $ +.\" $Id: lp.1,v 1.1.4.1 1996/06/25 18:32:45 joerg Exp $ .\" .Dd January 22, 1995 .Dt LP 1 diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh index f3f78f57644bc..1ad3aaeed7c87 100644 --- a/usr.sbin/lpr/lp/lp.sh +++ b/usr.sbin/lpr/lp/lp.sh @@ -36,7 +36,7 @@ # # Posix 1003.2 compliant print spooler interface. # -# $Id: lp.sh,v 1.1.4.1 1995/08/26 11:38:27 davidg Exp $ +# $Id: lp.sh,v 1.1.4.2 1996/06/25 18:32:46 joerg Exp $ # ncopies="" diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8 index 4a02390a73a55..d4bba51552e7a 100644 --- a/usr.sbin/lptcontrol/lptcontrol.8 +++ b/usr.sbin/lptcontrol/lptcontrol.8 @@ -11,7 +11,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.\" $Id: lptcontrol.1,v 1.3 1994/05/22 12:31:54 csgr Exp $ +.\" $Id: lptcontrol.8,v 1.2 1994/09/03 22:46:49 csgr Exp $ .Dd September 3, 1994 .Dt LPTCONTROL 8 .Os FreeBSD 2 diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c index f297b330d5ec4..4f7fc1006a443 100644 --- a/usr.sbin/lptcontrol/lptcontrol.c +++ b/usr.sbin/lptcontrol/lptcontrol.c @@ -27,7 +27,7 @@ * (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: lptcontrol.c,v 1.2 1994/09/03 22:46:50 csgr Exp $ + * $Id: lptcontrol.c,v 1.3 1995/05/30 03:48:07 rgrimes Exp $ */ #include <ctype.h> diff --git a/usr.sbin/lsdev/Makefile b/usr.sbin/lsdev/Makefile index 061a86fd2bda5..cedebb25c0f09 100644 --- a/usr.sbin/lsdev/Makefile +++ b/usr.sbin/lsdev/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1994/10/17 23:26:10 wollman Exp $ PROG= lsdev MAN8= lsdev.8 diff --git a/usr.sbin/lsdev/lsdev.8 b/usr.sbin/lsdev/lsdev.8 index fb54517469d70..f3d4da670dc0f 100644 --- a/usr.sbin/lsdev/lsdev.8 +++ b/usr.sbin/lsdev/lsdev.8 @@ -1,4 +1,4 @@ -.\" $Id: lsdev.8,v 1.3 1994/12/12 00:35:01 ats Exp $ +.\" $Id: lsdev.8,v 1.3.4.1 1996/01/30 13:59:53 mpp Exp $ .\" Garrett A. Wollman, October 1994 .\" This file is in the public domain. .\" diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile index c3bf191080003..2a08d2cc440aa 100644 --- a/usr.sbin/manctl/Makefile +++ b/usr.sbin/manctl/Makefile @@ -1,5 +1,5 @@ # Makefile -# $Id: Makefile,v 1.7 1996/01/23 23:59:34 wosch Exp $ +# $Id: Makefile,v 1.4.6.1 1996/06/23 22:03:53 wosch Exp $ MAN8= manctl.8 diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8 index 68447aae07f6e..da908a01c56d7 100644 --- a/usr.sbin/manctl/manctl.8 +++ b/usr.sbin/manctl/manctl.8 @@ -1,7 +1,7 @@ .\" .\" (c) Wolfram Schneider, Berlin, Germany. Public domain. .\" -.\" $Id: manctl.8,v 1.1 1996/01/23 23:59:35 wosch Exp $ +.\" $Id: manctl.8,v 1.2 1996/01/30 13:49:46 mpp Exp $ .Dd Jan 1996 .Dt manctl 8 diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh index f75c234460a34..fbc44727e8676 100644 --- a/usr.sbin/manctl/manctl.sh +++ b/usr.sbin/manctl/manctl.sh @@ -30,7 +30,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: manctl.sh,v 1.6 1996/01/23 23:59:36 wosch Exp $ +# $Id: manctl.sh,v 1.5.4.1 1996/06/23 22:03:54 wosch Exp $ # # manctl: # a utility for manipulating manual pages diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile index 8a4f886b87eb6..c92a88bbca0f1 100644 --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1995/02/15 17:33:04 ache Exp $ PROG = mixer NOMAN = noman diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile index 64d370442c40e..1ba2094380998 100644 --- a/usr.sbin/mrouted/Makefile +++ b/usr.sbin/mrouted/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/06/15 19:23:02 wollman Exp $ +# $Id: Makefile,v 1.1.6.2 1996/11/12 18:16:16 jkh Exp $ SUBDIR= common mrouted mrinfo map-mbone mtrace testrsrr diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c index 54d60470bec58..e18435445a7fa 100644 --- a/usr.sbin/mrouted/callout.c +++ b/usr.sbin/mrouted/callout.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: callout.c,v 1.7 1996/01/06 21:09:34 peter Exp $ + * $Id: callout.c,v 1.4.4.2 1996/11/12 18:16:24 jkh Exp $ */ #include "defs.h" diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y index 9a6905d97ef5f..94aede7c68219 100644 --- a/usr.sbin/mrouted/cfparse.y +++ b/usr.sbin/mrouted/cfparse.y @@ -4,7 +4,7 @@ * * Written by Bill Fenner, NRL, 1994 * - * $Id: cfparse.y,v 1.2.2.1 1996/11/12 18:16:32 jkh Exp $ + * $Id: cfparse.y,v 1.2.2.2 1997/02/10 06:46:37 fenner Exp $ */ #include <stdio.h> #ifdef __STDC__ diff --git a/usr.sbin/mrouted/common/Makefile b/usr.sbin/mrouted/common/Makefile index 9bcfb27462bc7..fcc9b32e85bb1 100644 --- a/usr.sbin/mrouted/common/Makefile +++ b/usr.sbin/mrouted/common/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/08 02:51:32 wollman Exp $ LIB= mrouted NOPROFILE= diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c index 91b6abdbcaef6..a05cd8f94ffa2 100644 --- a/usr.sbin/mrouted/config.c +++ b/usr.sbin/mrouted/config.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: config.c,v 1.8 1996/11/11 03:49:56 fenner Exp $ + * $Id: config.c,v 1.4.4.2 1996/11/12 18:16:41 jkh Exp $ */ diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index e7e29b8f014b9..27a7981fe0fbe 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: defs.h,v 1.7 1996/11/11 03:49:57 fenner Exp $ + * $Id: defs.h,v 1.3.4.2 1996/11/12 18:16:58 jkh Exp $ */ diff --git a/usr.sbin/mrouted/dvmrp.h b/usr.sbin/mrouted/dvmrp.h index b24989552839d..df30bd828949a 100644 --- a/usr.sbin/mrouted/dvmrp.h +++ b/usr.sbin/mrouted/dvmrp.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: dvmrp.h,v 1.5 1996/01/06 21:09:43 peter Exp $ + * $Id: dvmrp.h,v 1.2.6.2 1996/11/12 18:17:05 jkh Exp $ */ /* diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c index 80f678de1bd9d..633b184f3f07f 100644 --- a/usr.sbin/mrouted/igmp.c +++ b/usr.sbin/mrouted/igmp.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: igmp.c,v 1.11 1996/11/11 03:49:57 fenner Exp $ + * $Id: igmp.c,v 1.5.4.3 1996/11/12 18:17:12 jkh Exp $ */ diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c index cb5e7176578c9..25161ce766337 100644 --- a/usr.sbin/mrouted/inet.c +++ b/usr.sbin/mrouted/inet.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: inet.c,v 1.6 1996/11/11 03:49:58 fenner Exp $ + * $Id: inet.c,v 1.2.6.2 1996/11/12 18:17:20 jkh Exp $ */ diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c index c11758f4e56f9..aaf1cd8e57404 100644 --- a/usr.sbin/mrouted/kern.c +++ b/usr.sbin/mrouted/kern.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: kern.c,v 1.7 1996/11/11 03:49:58 fenner Exp $ + * $Id: kern.c,v 1.3.4.2 1996/11/12 18:17:31 jkh Exp $ */ diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c index 2e6f04ae6df03..6aba2312a4bc2 100644 --- a/usr.sbin/mrouted/main.c +++ b/usr.sbin/mrouted/main.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: main.c,v 1.9 1996/11/11 03:49:59 fenner Exp $ + * $Id: main.c,v 1.4.4.2 1996/11/12 18:17:40 jkh Exp $ */ /* @@ -34,7 +34,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: main.c,v 1.9 1996/11/11 03:49:59 fenner Exp $"; + "@(#) $Id: main.c,v 1.4.4.2 1996/11/12 18:17:40 jkh Exp $"; #endif extern char *configfilename; diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index 878c452c6a824..60900ff9b7737 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/usr.sbin/mrouted/map-mbone/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/06/24 04:25:11 jkh Exp $ +# $Id: Makefile,v 1.2.4.1 1996/11/12 18:20:28 jkh Exp $ PROG= map-mbone diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c index 4218ad335e40e..51c2e0f179e60 100644 --- a/usr.sbin/mrouted/mapper.c +++ b/usr.sbin/mrouted/mapper.c @@ -1,7 +1,7 @@ /* Mapper for connections between MRouteD multicast routers. * Written by Pavel Curtis <Pavel@PARC.Xerox.Com> * - * $Id: mapper.c,v 1.3.4.2 1996/11/12 18:17:47 jkh Exp $ + * $Id: mapper.c,v 1.3.4.3 1997/02/09 22:30:10 fenner Exp $ */ /* diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c index 91244cb0d9ca2..b7a633ec7e603 100644 --- a/usr.sbin/mrouted/mrinfo.c +++ b/usr.sbin/mrouted/mrinfo.c @@ -61,7 +61,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: mrinfo.c,v 1.4.4.2 1996/11/12 18:18:03 jkh Exp $"; + "@(#) $Id: mrinfo.c,v 1.4.4.3 1997/02/09 22:30:12 fenner Exp $"; /* original rcsid: "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)"; */ diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index 414dba8f8e1de..9615af850502b 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1996/06/24 04:25:17 jkh Exp $ +# $Id: Makefile,v 1.2.4.2 1996/11/12 18:20:42 jkh Exp $ PROG= mrinfo diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8 index e81d3e08b24db..64b3af685444c 100644 --- a/usr.sbin/mrouted/mrouted.8 +++ b/usr.sbin/mrouted/mrouted.8 @@ -1,5 +1,5 @@ '\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University. -'\"$Id: mrouted.8,v 1.6 1996/11/11 03:50:00 fenner Exp $ +'\"$Id: mrouted.8,v 1.2.4.2 1996/11/12 18:18:14 jkh Exp $ .TH MROUTED 8 .UC 5 .SH NAME diff --git a/usr.sbin/mrouted/mrouted.conf b/usr.sbin/mrouted/mrouted.conf index eb29baafd9bd3..8dc3ddf15e583 100644 --- a/usr.sbin/mrouted/mrouted.conf +++ b/usr.sbin/mrouted/mrouted.conf @@ -1,4 +1,4 @@ -# $Id: mrouted.conf,v 1.5 1996/01/06 21:10:02 peter Exp $ +# $Id: mrouted.conf,v 1.2.6.2 1996/11/12 18:18:21 jkh Exp $ # # This is the configuration file for "mrouted", an IP multicast router. # mrouted looks for it in "/etc/mrouted.conf". diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile index 1e3c61222fae3..c5fefe827a43f 100644 --- a/usr.sbin/mrouted/mrouted/Makefile +++ b/usr.sbin/mrouted/mrouted/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1996/06/24 04:25:19 jkh Exp $ +# $Id: Makefile,v 1.1.6.2 1996/11/12 18:20:48 jkh Exp $ PROG= mrouted diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8 index dee5364849b27..2b42d5bf1157c 100644 --- a/usr.sbin/mrouted/mtrace.8 +++ b/usr.sbin/mrouted/mtrace.8 @@ -29,7 +29,7 @@ .\" Copyright (c) 1988 The Regents of the University of California. .\" All rights reserved. .\" -.\" $Id: mtrace.8,v 1.4 1996/11/11 03:50:03 fenner Exp $ +.\" $Id: mtrace.8,v 1.2.2.1 1996/11/12 18:18:25 jkh Exp $ .\" .TH MTRACE 8 "May 8, 1995" .UC 6 diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c index d6d33c02ebf4e..fcda40fcf7169 100644 --- a/usr.sbin/mrouted/mtrace.c +++ b/usr.sbin/mrouted/mtrace.c @@ -50,7 +50,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: mtrace.c,v 1.4.4.2 1996/11/12 18:18:32 jkh Exp $"; + "@(#) $Id: mtrace.c,v 1.4.4.3 1997/02/09 22:30:14 fenner Exp $"; #endif #include <netdb.h> diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 7c92ff026f3c7..60c4e569e3ee6 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/usr.sbin/mrouted/mtrace/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1996/06/24 04:25:22 jkh Exp $ +# $Id: Makefile,v 1.1.6.2 1996/11/12 18:20:53 jkh Exp $ PROG= mtrace diff --git a/usr.sbin/mrouted/pathnames.h b/usr.sbin/mrouted/pathnames.h index 5c33776334303..016f72d25fa31 100644 --- a/usr.sbin/mrouted/pathnames.h +++ b/usr.sbin/mrouted/pathnames.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: pathnames.h,v 1.3 1996/01/06 21:10:09 peter Exp $ + * $Id: pathnames.h,v 1.2.2.1 1996/11/12 18:18:40 jkh Exp $ */ #define _PATH_MROUTED_CONF "/etc/mrouted.conf" diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c index 7f81fea83414f..f017ada935909 100644 --- a/usr.sbin/mrouted/prune.c +++ b/usr.sbin/mrouted/prune.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: prune.c,v 1.11 1996/11/11 03:50:08 fenner Exp $ + * $Id: prune.c,v 1.5.4.2 1996/11/12 18:18:49 jkh Exp $ */ diff --git a/usr.sbin/mrouted/prune.h b/usr.sbin/mrouted/prune.h index 9ed209d77cc2c..df8ab219f8e31 100644 --- a/usr.sbin/mrouted/prune.h +++ b/usr.sbin/mrouted/prune.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: prune.h,v 1.6 1996/01/06 21:10:15 peter Exp $ + * $Id: prune.h,v 1.3.4.2 1996/11/12 18:18:56 jkh Exp $ */ /* diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c index caf0da774d3d0..a7f9fd23c8ec7 100644 --- a/usr.sbin/mrouted/route.c +++ b/usr.sbin/mrouted/route.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: route.c,v 1.7 1996/11/11 03:50:11 fenner Exp $ + * $Id: route.c,v 1.3.4.2 1996/11/12 18:19:02 jkh Exp $ */ diff --git a/usr.sbin/mrouted/route.h b/usr.sbin/mrouted/route.h index 2e31e9d8e3462..620d229b34fc4 100644 --- a/usr.sbin/mrouted/route.h +++ b/usr.sbin/mrouted/route.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: route.h,v 1.5 1996/01/06 21:10:23 peter Exp $ + * $Id: route.h,v 1.2.6.2 1996/11/12 18:19:09 jkh Exp $ */ /* diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile index 9e710ff3a55e6..2a08981e63c58 100644 --- a/usr.sbin/mrouted/testrsrr/Makefile +++ b/usr.sbin/mrouted/testrsrr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/08 02:51:37 wollman Exp $ +# $Id: Makefile,v 1.1 1995/06/15 19:23:08 wollman Exp $ PROG= testrsrr diff --git a/usr.sbin/mrouted/testrsrr/testrsrr.c b/usr.sbin/mrouted/testrsrr/testrsrr.c index b99b593284f2c..54287631574df 100644 --- a/usr.sbin/mrouted/testrsrr/testrsrr.c +++ b/usr.sbin/mrouted/testrsrr/testrsrr.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: testrsrr.c,v 1.1 1995/06/15 19:23:08 wollman Exp $ */ #include <stddef.h> #include <stdlib.h> diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c index 0ccf133c97d37..cebbdbed1a451 100644 --- a/usr.sbin/mrouted/vif.c +++ b/usr.sbin/mrouted/vif.c @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: vif.c,v 1.9 1996/11/11 03:50:14 fenner Exp $ + * $Id: vif.c,v 1.4.4.3 1996/11/12 18:19:26 jkh Exp $ */ diff --git a/usr.sbin/mrouted/vif.h b/usr.sbin/mrouted/vif.h index e2e2f64944d7d..5c67edb1f7a02 100644 --- a/usr.sbin/mrouted/vif.h +++ b/usr.sbin/mrouted/vif.h @@ -7,7 +7,7 @@ * Leland Stanford Junior University. * * - * $Id: vif.h,v 1.6 1996/11/11 03:50:15 fenner Exp $ + * $Id: vif.h,v 1.2.6.2 1996/11/12 18:19:32 jkh Exp $ */ /* diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile index 9f78f8f71c29e..e1769f4f956c0 100644 --- a/usr.sbin/mtree/Makefile +++ b/usr.sbin/mtree/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $Id$ +# $Id: Makefile,v 1.4 1995/02/10 03:12:03 wollman Exp $ PROG= mtree SRCS= compare.c crc.c create.c misc.c mtree.c spec.c verify.c diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8 index 5b2c5e1b7aeae..9fa61c5078310 100644 --- a/usr.sbin/mtree/mtree.8 +++ b/usr.sbin/mtree/mtree.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93 -.\" $Id: mtree.8,v 1.5.4.1 1996/01/30 14:00:47 mpp Exp $ +.\" $Id: mtree.8,v 1.5.4.2 1996/06/27 05:33:08 gpalmer Exp $ .\" .Dd February 9, 1995 .Dt MTREE 8 diff --git a/usr.sbin/named/Version.c b/usr.sbin/named/Version.c index 7cbce2820e865..a883c489e0d58 100644 --- a/usr.sbin/named/Version.c +++ b/usr.sbin/named/Version.c @@ -1,11 +1,11 @@ /* * @(#)Version.c 4.9 (Berkeley) 7/21/90 - * $Id: Version.c,v 4.9.1.3 1994/06/01 21:09:39 vixie Exp $ + * $Id: Version.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ */ #ifndef lint char sccsid[] = "@(#)named %VERSION% %WHEN% %WHOANDWHERE%"; -char rcsid[] = "$Id: Version.c,v 4.9.1.3 1994/06/01 21:09:39 vixie Exp $"; +char rcsid[] = "$Id: Version.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ char Version[] = "named %VERSION% %WHEN%\n\t%WHOANDWHERE%"; diff --git a/usr.sbin/named/db_defs.h b/usr.sbin/named/db_defs.h index 115615f716695..906aabc3b308c 100644 --- a/usr.sbin/named/db_defs.h +++ b/usr.sbin/named/db_defs.h @@ -1,6 +1,6 @@ /* * from db.h 4.16 (Berkeley) 6/1/90 - * $Id: db_defs.h,v 1.2 1995/05/30 03:48:34 rgrimes Exp $ + * $Id: db_defs.h,v 1.2.4.1 1995/08/30 04:07:05 davidg Exp $ */ /* diff --git a/usr.sbin/named/db_dump.c b/usr.sbin/named/db_dump.c index d1256ffbd4150..f07ca7340ce23 100644 --- a/usr.sbin/named/db_dump.c +++ b/usr.sbin/named/db_dump.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_dump.c 4.33 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: db_dump.c,v 1.3 1995/05/30 03:48:35 rgrimes Exp $"; +static char rcsid[] = "$Id: db_dump.c,v 1.3.4.1 1995/08/30 04:07:07 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_func.h b/usr.sbin/named/db_func.h index 57a69fe63813f..c2122dab1d01d 100644 --- a/usr.sbin/named/db_func.h +++ b/usr.sbin/named/db_func.h @@ -1,6 +1,6 @@ /* db_proc.h - prototypes for functions in db_*.c * - * $Id: db_func.h,v 1.2 1995/05/30 03:48:36 rgrimes Exp $ + * $Id: db_func.h,v 1.2.4.1 1995/08/30 04:07:11 davidg Exp $ */ /* ++from db_update.c++ */ diff --git a/usr.sbin/named/db_glob.h b/usr.sbin/named/db_glob.h index 157e51344a6bb..59b0e4fcd7896 100644 --- a/usr.sbin/named/db_glob.h +++ b/usr.sbin/named/db_glob.h @@ -1,6 +1,6 @@ /* * from db.h 4.16 (Berkeley) 6/1/90 - * $Id: db_glob.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ + * $Id: db_glob.h,v 1.2 1995/05/30 03:48:37 rgrimes Exp $ */ /* diff --git a/usr.sbin/named/db_glue.c b/usr.sbin/named/db_glue.c index 17d6085f5f125..f0952f707d162 100644 --- a/usr.sbin/named/db_glue.c +++ b/usr.sbin/named/db_glue.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_glue.c 4.4 (Berkeley) 6/1/90"; -static char rcsid[] = "$Id: db_glue.c,v 1.2 1995/05/30 03:48:39 rgrimes Exp $"; +static char rcsid[] = "$Id: db_glue.c,v 1.2.4.1 1995/08/30 04:07:17 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_load.c b/usr.sbin/named/db_load.c index cbb6ad265266d..31ece54cb86dc 100644 --- a/usr.sbin/named/db_load.c +++ b/usr.sbin/named/db_load.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_load.c 4.38 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: db_load.c,v 1.3 1995/05/30 03:48:39 rgrimes Exp $"; +static char rcsid[] = "$Id: db_load.c,v 1.3.4.1 1995/08/30 04:07:20 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_lookup.c b/usr.sbin/named/db_lookup.c index c1d047d063249..f03b5ece1ea87 100644 --- a/usr.sbin/named/db_lookup.c +++ b/usr.sbin/named/db_lookup.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_lookup.c 4.18 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_lookup.c,v 1.2 1995/05/30 03:48:40 rgrimes Exp $"; +static char rcsid[] = "$Id: db_lookup.c,v 1.2.4.1 1995/08/30 04:07:23 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_reload.c b/usr.sbin/named/db_reload.c index 1145e4aa49213..917917ad7f462 100644 --- a/usr.sbin/named/db_reload.c +++ b/usr.sbin/named/db_reload.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_reload.c 4.22 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_reload.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $"; +static char rcsid[] = "$Id: db_reload.c,v 1.2 1995/05/30 03:48:41 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_save.c b/usr.sbin/named/db_save.c index 61471cef6f5ca..7aa25e0886811 100644 --- a/usr.sbin/named/db_save.c +++ b/usr.sbin/named/db_save.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_save.c 4.16 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_save.c,v 1.2 1995/05/30 03:48:42 rgrimes Exp $"; +static char rcsid[] = "$Id: db_save.c,v 1.2.4.1 1995/08/30 04:07:27 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/db_secure.c b/usr.sbin/named/db_secure.c index 62f2f9a85b99b..6ec172d436f84 100644 --- a/usr.sbin/named/db_secure.c +++ b/usr.sbin/named/db_secure.c @@ -1,5 +1,5 @@ #ifndef LINT -static char rcsid[] = "$Id: db_secure.c,v 1.2 1995/05/30 03:48:43 rgrimes Exp $"; +static char rcsid[] = "$Id: db_secure.c,v 1.2.4.1 1995/08/30 04:07:30 davidg Exp $"; #endif /* this file was contributed by Gregory Neil Shapiro of WPI in August 1993 */ diff --git a/usr.sbin/named/db_update.c b/usr.sbin/named/db_update.c index 40e88cd8e7db5..06f805bea3ec7 100644 --- a/usr.sbin/named/db_update.c +++ b/usr.sbin/named/db_update.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_update.c 4.28 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_update.c,v 1.2 1995/05/30 03:48:44 rgrimes Exp $"; +static char rcsid[] = "$Id: db_update.c,v 1.2.4.1 1995/08/30 04:07:32 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/dmalloc.c b/usr.sbin/named/dmalloc.c index 6f27adfffc73f..594e541fa8ac5 100644 --- a/usr.sbin/named/dmalloc.c +++ b/usr.sbin/named/dmalloc.c @@ -3,7 +3,7 @@ * vix 24mar92 [added size calcs, improved printout] * vix 22mar92 [original work] * - * $Id: dmalloc.c,v 1.2 1994/09/22 20:45:04 pst Exp $ + * $Id: dmalloc.c,v 1.3 1995/05/30 03:48:45 rgrimes Exp $ */ /* diff --git a/usr.sbin/named/dmalloc.h b/usr.sbin/named/dmalloc.h index 6d89ab825cbda..a6a971fa4c170 100644 --- a/usr.sbin/named/dmalloc.h +++ b/usr.sbin/named/dmalloc.h @@ -1,7 +1,7 @@ /* dmalloc - debugging layer on top of malloc * vix 22mar92 [written] * - * $Id: dmalloc.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ + * $Id: dmalloc.h,v 1.2 1995/05/30 03:48:46 rgrimes Exp $ */ /* diff --git a/usr.sbin/named/named.h b/usr.sbin/named/named.h index e3e795d429d8b..93f427b2044fa 100644 --- a/usr.sbin/named/named.h +++ b/usr.sbin/named/named.h @@ -1,7 +1,7 @@ /* named.h - include the local definitions in the right order * vix 28aug93 [original] * - * $Id: named.h,v 1.1 1993/09/08 04:57:40 vixie Exp $ + * $Id: named.h,v 1.2 1994/09/22 20:45:06 pst Exp $ */ #include "options.h" diff --git a/usr.sbin/named/ns_defs.h b/usr.sbin/named/ns_defs.h index e462e4454b810..a4434e904751b 100644 --- a/usr.sbin/named/ns_defs.h +++ b/usr.sbin/named/ns_defs.h @@ -1,6 +1,6 @@ /* * from ns.h 4.33 (Berkeley) 8/23/90 - * $Id: ns_defs.h,v 1.2 1995/05/30 03:48:47 rgrimes Exp $ + * $Id: ns_defs.h,v 1.2.4.1 1995/08/30 04:07:35 davidg Exp $ */ /* diff --git a/usr.sbin/named/ns_forw.c b/usr.sbin/named/ns_forw.c index 1d4ffbb860d26..bd7d6c14af479 100644 --- a/usr.sbin/named/ns_forw.c +++ b/usr.sbin/named/ns_forw.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_forw.c 4.32 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_forw.c,v 1.2 1995/05/30 03:48:49 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_forw.c,v 1.2.4.1 1995/08/30 04:07:39 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_func.h b/usr.sbin/named/ns_func.h index ba1847c3c1538..b8070f40fd123 100644 --- a/usr.sbin/named/ns_func.h +++ b/usr.sbin/named/ns_func.h @@ -1,6 +1,6 @@ /* ns_func.h - declarations for ns_*.c's externally visible functions * - * $Id: ns_func.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ + * $Id: ns_func.h,v 1.1.1.1.6.1 1995/08/30 04:07:41 davidg Exp $ */ /* ++from ns_resp.c++ */ diff --git a/usr.sbin/named/ns_glob.h b/usr.sbin/named/ns_glob.h index d229c955c1146..03a813bf2ea84 100644 --- a/usr.sbin/named/ns_glob.h +++ b/usr.sbin/named/ns_glob.h @@ -1,6 +1,6 @@ /* * from ns.h 4.33 (Berkeley) 8/23/90 - * $Id: ns_glob.h,v 1.2 1995/05/30 03:48:50 rgrimes Exp $ + * $Id: ns_glob.h,v 1.2.4.1 1995/08/30 04:07:47 davidg Exp $ */ /* diff --git a/usr.sbin/named/ns_main.c b/usr.sbin/named/ns_main.c index f1b974f6985af..d9ba8a72df894 100644 --- a/usr.sbin/named/ns_main.c +++ b/usr.sbin/named/ns_main.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; -static char rcsid[] = "$Id: ns_main.c,v 1.2 1995/05/30 03:48:52 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_main.c,v 1.2.4.1 1995/08/30 04:07:57 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_maint.c b/usr.sbin/named/ns_maint.c index 03cbf99aaa01a..ce59035487c1c 100644 --- a/usr.sbin/named/ns_maint.c +++ b/usr.sbin/named/ns_maint.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_maint.c 4.39 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: ns_maint.c,v 1.2 1995/05/30 03:48:53 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_maint.c,v 1.2.4.1 1995/08/30 04:08:01 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_req.c b/usr.sbin/named/ns_req.c index 94d765ba83c2e..b973b02345589 100644 --- a/usr.sbin/named/ns_req.c +++ b/usr.sbin/named/ns_req.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_req.c 4.47 (Berkeley) 7/1/91"; -static char rcsid[] = "$Id: ns_req.c,v 1.2 1995/05/30 03:48:55 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_req.c,v 1.2.4.1 1995/08/30 04:08:09 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_resp.c b/usr.sbin/named/ns_resp.c index fde341cf23eb2..045f967a3b6d8 100644 --- a/usr.sbin/named/ns_resp.c +++ b/usr.sbin/named/ns_resp.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_resp.c,v 1.2 1995/05/30 03:48:56 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_resp.c,v 1.2.4.1 1995/08/30 04:08:14 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_sort.c b/usr.sbin/named/ns_sort.c index 70da7fee30e2d..ded698dd2aa06 100644 --- a/usr.sbin/named/ns_sort.c +++ b/usr.sbin/named/ns_sort.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_sort.c 4.10 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_sort.c,v 1.2 1995/05/30 03:48:59 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_sort.c,v 1.2.4.1 1995/08/30 04:08:19 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/ns_stats.c b/usr.sbin/named/ns_stats.c index b4c8958d501ca..83b57348e2c13 100644 --- a/usr.sbin/named/ns_stats.c +++ b/usr.sbin/named/ns_stats.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_stats.c 4.10 (Berkeley) 6/27/90"; -static char rcsid[] = "$Id: ns_stats.c,v 1.2 1995/05/30 03:49:00 rgrimes Exp $"; +static char rcsid[] = "$Id: ns_stats.c,v 1.2.4.1 1995/08/30 04:08:25 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/named/options.h b/usr.sbin/named/options.h index b6be5048dbf54..d00ae8ec7bbcb 100644 --- a/usr.sbin/named/options.h +++ b/usr.sbin/named/options.h @@ -1,7 +1,7 @@ /* options.h - specify the conditionally-compiled features * vix 28mar92 [moved out of the Makefile because they were getting too big] * - * $Id: options.h,v 1.3 1995/05/30 03:49:02 rgrimes Exp $ + * $Id: options.h,v 1.3.4.1 1995/08/30 04:08:36 davidg Exp $ */ /* diff --git a/usr.sbin/named/pathnames.h b/usr.sbin/named/pathnames.h index 5adf1a2ac4f58..d26571b80bf92 100644 --- a/usr.sbin/named/pathnames.h +++ b/usr.sbin/named/pathnames.h @@ -1,6 +1,6 @@ /* * @(#)pathnames.h 5.4 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ + * $Id: pathnames.h,v 1.2 1995/05/30 03:49:03 rgrimes Exp $ */ /* diff --git a/usr.sbin/named/portability.h b/usr.sbin/named/portability.h index a673279abdba0..ce1d21e5f26f6 100644 --- a/usr.sbin/named/portability.h +++ b/usr.sbin/named/portability.h @@ -1,7 +1,7 @@ /* defs.h - include or define things that aren't present on all systems * vixie@decwrl 26dec92 [new] * - * $Id: portability.h,v 1.2 1995/05/30 03:49:04 rgrimes Exp $ + * $Id: portability.h,v 1.2.4.1 1995/08/30 04:08:39 davidg Exp $ */ /* diff --git a/usr.sbin/named/storage.c b/usr.sbin/named/storage.c index 15623f4580b76..d241cda27720a 100644 --- a/usr.sbin/named/storage.c +++ b/usr.sbin/named/storage.c @@ -85,7 +85,7 @@ extern void panic __P((int, const char *)); * All rights reserved. */ #ifndef lint -static char RCSid[] = "$Id: storage.c,v 1.3 1995/05/30 03:49:05 rgrimes Exp $"; +static char RCSid[] = "$Id: storage.c,v 1.3.4.1 1995/08/30 04:08:42 davidg Exp $"; #endif #undef malloc diff --git a/usr.sbin/named/tools/named.reload/named.reload.sh b/usr.sbin/named/tools/named.reload/named.reload.sh index c800023ec63ff..f26cca1d5077b 100644 --- a/usr.sbin/named/tools/named.reload/named.reload.sh +++ b/usr.sbin/named/tools/named.reload/named.reload.sh @@ -1,7 +1,7 @@ #!/bin/sh - # # from named.reload 5.2 (Berkeley) 6/27/89 -# $Id: named.reload.sh,v 1.2 1994/09/22 20:45:23 pst Exp $ +# $Id: named.reload.sh,v 1.2.6.1 1995/08/30 04:08:56 davidg Exp $ # exec %DESTSBIN%/%INDOT%ndc reload diff --git a/usr.sbin/named/tools/named.restart/Makefile b/usr.sbin/named/tools/named.restart/Makefile index bbeec2ab11928..2bd09aaff9c24 100644 --- a/usr.sbin/named/tools/named.restart/Makefile +++ b/usr.sbin/named/tools/named.restart/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.1 (Berkeley) 5/28/90 -# $Id: Makefile,v 1.3 1995/05/03 03:26:53 rgrimes Exp $ +# $Id: Makefile,v 1.3.4.1 1995/08/30 04:09:02 davidg Exp $ MAN8= named.restart.8 CLEANFILES+=named.restart diff --git a/usr.sbin/named/tools/named.restart/named.restart.8 b/usr.sbin/named/tools/named.restart/named.restart.8 index 2e66615c7c010..dcfe87ee46251 100644 --- a/usr.sbin/named/tools/named.restart/named.restart.8 +++ b/usr.sbin/named/tools/named.restart/named.restart.8 @@ -52,7 +52,7 @@ .\" --Copyright-- .\" .\" from hostname.7 6.4 (Berkeley) 1/16/90 -.\" $Id$ +.\" $Id: named.restart.8,v 1.3 1995/05/03 03:26:56 rgrimes Exp $ .\" .TH NAMED.RESTART 8 "May 2, 1995" .UC 5 diff --git a/usr.sbin/named/tools/named.restart/named.restart.sh b/usr.sbin/named/tools/named.restart/named.restart.sh index eb4c7ecb6ba0c..92906ced1af48 100644 --- a/usr.sbin/named/tools/named.restart/named.restart.sh +++ b/usr.sbin/named/tools/named.restart/named.restart.sh @@ -1,7 +1,7 @@ #!/bin/sh - # # from named.restart 5.4 (Berkeley) 6/27/89 -# $Id: named.restart.sh,v 1.3 1995/05/03 03:26:59 rgrimes Exp $ +# $Id: named.restart.sh,v 1.3.4.1 1995/08/30 04:09:05 davidg Exp $ # exec %DESTSBIN%/%INDOT%ndc restart diff --git a/usr.sbin/named/tools/nsquery/nsquery.c b/usr.sbin/named/tools/nsquery/nsquery.c index c1ac28ea88f6c..81124b071997f 100644 --- a/usr.sbin/named/tools/nsquery/nsquery.c +++ b/usr.sbin/named/tools/nsquery/nsquery.c @@ -62,7 +62,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)nsquery.c 4.8 (Berkeley) 6/1/90"; -static char rcsid[] = "$Id: nsquery.c,v 1.2 1994/09/22 20:45:28 pst Exp $"; +static char rcsid[] = "$Id: nsquery.c,v 1.3 1995/05/30 03:49:08 rgrimes Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/named/tools/nstest/nstest.c b/usr.sbin/named/tools/nstest/nstest.c index d40e748fa1e32..efb622119dd49 100644 --- a/usr.sbin/named/tools/nstest/nstest.c +++ b/usr.sbin/named/tools/nstest/nstest.c @@ -62,7 +62,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)nstest.c 4.15 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: nstest.c,v 1.2 1994/09/22 20:45:31 pst Exp $"; +static char rcsid[] = "$Id: nstest.c,v 1.3 1995/05/30 03:49:09 rgrimes Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/named/tree.h b/usr.sbin/named/tree.h index 2cad7c1233ae6..f04bf4706605e 100644 --- a/usr.sbin/named/tree.h +++ b/usr.sbin/named/tree.h @@ -3,7 +3,7 @@ * vix 22jan93 [revisited; uses RCS, ANSI, POSIX; has bug fixes] * vix 27jun86 [broken out of tree.c] * - * $Id: tree.h,v 1.1 1994/04/09 04:05:46 vixie Exp $ + * $Id: tree.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ */ diff --git a/usr.sbin/named/xfer/named-xfer.c b/usr.sbin/named/xfer/named-xfer.c index f9533a751b785..ca77ceec6da0d 100644 --- a/usr.sbin/named/xfer/named-xfer.c +++ b/usr.sbin/named/xfer/named-xfer.c @@ -70,7 +70,7 @@ char copyright[] = #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)named-xfer.c 4.18 (Berkeley) 3/7/91"; -static char rcsid[] = "$Id: named-xfer.c,v 1.3 1995/05/30 03:49:10 rgrimes Exp $"; +static char rcsid[] = "$Id: named-xfer.c,v 1.3.4.1 1995/08/30 04:09:14 davidg Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/ncrcontrol/ncrcontrol.8 b/usr.sbin/ncrcontrol/ncrcontrol.8 index cc7f0b25861c5..defdd62fedaae 100644 --- a/usr.sbin/ncrcontrol/ncrcontrol.8 +++ b/usr.sbin/ncrcontrol/ncrcontrol.8 @@ -22,7 +22,7 @@ .\" (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: ncrcontrol.8,v 1.2.4.1 1996/01/30 14:00:50 mpp Exp $ +.\" $Id: ncrcontrol.8,v 1.2.4.2 1996/06/27 05:33:10 gpalmer Exp $ .\" .Dd September 16, 1994 .Dt NCRCONTROL 8 diff --git a/usr.sbin/ncrcontrol/ncrcontrol.c b/usr.sbin/ncrcontrol/ncrcontrol.c index f1ffbe1783ad3..41a74581c6bdf 100644 --- a/usr.sbin/ncrcontrol/ncrcontrol.c +++ b/usr.sbin/ncrcontrol/ncrcontrol.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncrcontrol.c,v 1.8.4.1 1995/10/06 10:50:53 davidg Exp $ +** $Id: ncrcontrol.c,v 1.8.4.3 1996/06/05 02:57:39 jkh Exp $ ** ** Utility for NCR 53C810 device driver. ** diff --git a/usr.sbin/nslookup/debug.c b/usr.sbin/nslookup/debug.c index 24a5ca7e60fc0..c1021f3af470f 100644 --- a/usr.sbin/nslookup/debug.c +++ b/usr.sbin/nslookup/debug.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)debug.c 5.26 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: debug.c,v 1.3 1995/05/30 03:49:13 rgrimes Exp $"; +static char rcsid[] = "$Id: debug.c,v 1.3.4.1 1995/08/30 04:09:18 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/getinfo.c b/usr.sbin/nslookup/getinfo.c index 83efe4fcc72ae..8fdeb225bf624 100644 --- a/usr.sbin/nslookup/getinfo.c +++ b/usr.sbin/nslookup/getinfo.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)getinfo.c 5.26 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: getinfo.c,v 1.2 1994/09/22 21:50:33 pst Exp $"; +static char rcsid[] = "$Id: getinfo.c,v 1.3 1995/05/30 03:49:14 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/list.c b/usr.sbin/nslookup/list.c index da9c7e07fb8bf..7d86dbd8428d5 100644 --- a/usr.sbin/nslookup/list.c +++ b/usr.sbin/nslookup/list.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)list.c 5.23 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: list.c,v 1.3 1995/05/30 03:49:15 rgrimes Exp $"; +static char rcsid[] = "$Id: list.c,v 1.3.4.1 1995/08/30 04:09:22 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/main.c b/usr.sbin/nslookup/main.c index 083acecb39cc5..3e55aa4f76cb1 100644 --- a/usr.sbin/nslookup/main.c +++ b/usr.sbin/nslookup/main.c @@ -61,7 +61,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)main.c 5.42 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: main.c,v 1.2 1994/09/22 21:50:36 pst Exp $"; +static char rcsid[] = "$Id: main.c,v 1.3 1995/05/30 03:49:16 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/nslookup.help b/usr.sbin/nslookup/nslookup.help index 1e8b97c9d814e..0641491e878e9 100644 --- a/usr.sbin/nslookup/nslookup.help +++ b/usr.sbin/nslookup/nslookup.help @@ -1,4 +1,4 @@ -$Id: nslookup.help,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $ +$Id: nslookup.help,v 1.1.1.1.6.1 1995/08/30 04:09:24 davidg Exp $ Commands: (identifiers are shown in uppercase, [] means optional) NAME - print info about the host/domain NAME using default server diff --git a/usr.sbin/nslookup/pathnames.h b/usr.sbin/nslookup/pathnames.h index 84a2e33cbca04..013a012d2d55f 100644 --- a/usr.sbin/nslookup/pathnames.h +++ b/usr.sbin/nslookup/pathnames.h @@ -55,7 +55,7 @@ /* * @(#)pathnames.h 5.1 (Berkeley) 5/28/90 - * $Id: pathnames.h,v 1.2 1994/09/22 21:50:37 pst Exp $ + * $Id: pathnames.h,v 1.3 1995/05/30 03:49:17 rgrimes Exp $ */ #define _PATH_NSLOOKUPRC "/.nslookuprc" diff --git a/usr.sbin/nslookup/res.h b/usr.sbin/nslookup/res.h index fcad610ad980f..057790f4ab3b6 100644 --- a/usr.sbin/nslookup/res.h +++ b/usr.sbin/nslookup/res.h @@ -55,7 +55,7 @@ /* * @(#)res.h 5.10 (Berkeley) 6/1/90 - * $Id: res.h,v 1.1.1.1 1994/09/22 21:36:02 pst Exp $ + * $Id: res.h,v 1.2 1995/05/30 03:49:17 rgrimes Exp $ */ /* diff --git a/usr.sbin/nslookup/send.c b/usr.sbin/nslookup/send.c index 8f34de38ba740..b7605dbc13e47 100644 --- a/usr.sbin/nslookup/send.c +++ b/usr.sbin/nslookup/send.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)send.c 5.18 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: send.c,v 1.2 1994/09/22 21:50:38 pst Exp $"; +static char rcsid[] = "$Id: send.c,v 1.3 1995/05/30 03:49:18 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/skip.c b/usr.sbin/nslookup/skip.c index 068f8179dbb00..2f5a7a61a3f1c 100644 --- a/usr.sbin/nslookup/skip.c +++ b/usr.sbin/nslookup/skip.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)skip.c 5.12 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: skip.c,v 1.2 1994/09/22 21:50:39 pst Exp $"; +static char rcsid[] = "$Id: skip.c,v 1.3 1995/05/30 03:49:19 rgrimes Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/nslookup/subr.c b/usr.sbin/nslookup/subr.c index d7cca0e2a66a2..2227d09783dce 100644 --- a/usr.sbin/nslookup/subr.c +++ b/usr.sbin/nslookup/subr.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)subr.c 5.24 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: subr.c,v 1.3 1995/05/30 03:49:20 rgrimes Exp $"; +static char rcsid[] = "$Id: subr.c,v 1.3.4.1 1995/08/30 04:09:27 davidg Exp $"; #endif /* not lint */ /* diff --git a/usr.sbin/pcvt/kbdio/kbdio.y b/usr.sbin/pcvt/kbdio/kbdio.y index e5261c5e63c30..911b660bc99ac 100644 --- a/usr.sbin/pcvt/kbdio/kbdio.y +++ b/usr.sbin/pcvt/kbdio/kbdio.y @@ -34,10 +34,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/kbdio/kbdio.y,v 1.2 1995/04/01 17:16:26 joerg Exp $" +#ident "$Header: /home/ncvs/src/usr.sbin/pcvt/kbdio/kbdio.y,v 1.2.4.1 1996/06/05 02:57:41 jkh Exp $" /* * $Log: kbdio.y,v $ + * Revision 1.2.4.1 1996/06/05 02:57:41 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/04/01 17:16:26 joerg * Update pcvt to 3.20b23 * diff --git a/usr.sbin/pcvt/kbdio/lex.l b/usr.sbin/pcvt/kbdio/lex.l index 361ba277ce035..2ef512bf465ec 100644 --- a/usr.sbin/pcvt/kbdio/lex.l +++ b/usr.sbin/pcvt/kbdio/lex.l @@ -33,10 +33,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/kbdio/lex.l,v 1.2 1995/04/01 17:16:27 joerg Exp $" +#ident "$Header: /home/ncvs/src/usr.sbin/pcvt/kbdio/lex.l,v 1.2.4.1 1996/06/05 02:57:42 jkh Exp $" /* * $Log: lex.l,v $ + * Revision 1.2.4.1 1996/06/05 02:57:42 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/04/01 17:16:27 joerg * Update pcvt to 3.20b23 * diff --git a/usr.sbin/pcvt/set2061/compiler.h b/usr.sbin/pcvt/set2061/compiler.h index 0f55d729d0873..a0d11b06065a7 100644 --- a/usr.sbin/pcvt/set2061/compiler.h +++ b/usr.sbin/pcvt/set2061/compiler.h @@ -20,7 +20,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/set2061/compiler.h,v 1.2 1995/05/30 03:49:45 rgrimes Exp $ + * $Header: /home/ncvs/src/usr.sbin/pcvt/set2061/compiler.h,v 1.2.4.1 1996/06/05 02:57:44 jkh Exp $ */ diff --git a/usr.sbin/pcvt/vgaio/lex.l b/usr.sbin/pcvt/vgaio/lex.l index 77fa100f3f8fd..cbc71409e77de 100644 --- a/usr.sbin/pcvt/vgaio/lex.l +++ b/usr.sbin/pcvt/vgaio/lex.l @@ -33,10 +33,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/vgaio/lex.l,v 1.1.1.1 1995/02/05 13:49:23 jkh Exp $" +#ident "$Header: /home/ncvs/src/usr.sbin/pcvt/vgaio/lex.l,v 1.1.1.1.4.1 1996/06/05 02:57:46 jkh Exp $" /* * $Log: lex.l,v $ + * Revision 1.1.1.1.4.1 1996/06/05 02:57:46 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.1.1.1 1995/02/05 13:49:23 jkh * PCVT userland utilities. * Submitted by: hm diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8 index 6a577d8907b28..69cfc54563712 100644 --- a/usr.sbin/pcvt/vgaio/vgaio.8 +++ b/usr.sbin/pcvt/vgaio/vgaio.8 @@ -31,7 +31,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/vgaio/vgaio.8,v 1.1.1.1 1995/02/05 13:49:23 jkh Exp $ +.\" $Header: /home/ncvs/src/usr.sbin/pcvt/vgaio/vgaio.8,v 1.1.1.1.4.1 1996/06/05 02:57:47 jkh Exp $ .\" -hm updated 31.12.94 .\" .Dd December 31, 1994 diff --git a/usr.sbin/pcvt/vgaio/vgaio.h b/usr.sbin/pcvt/vgaio/vgaio.h index e313f861aa1ae..61b90641817f0 100644 --- a/usr.sbin/pcvt/vgaio/vgaio.h +++ b/usr.sbin/pcvt/vgaio/vgaio.h @@ -37,6 +37,9 @@ * The author may be reached unter <joerg_wunsch@uriah.sax.de> * * $Log: vgaio.h,v $ + * Revision 1.2 1995/03/05 22:46:27 joerg + * Upgrade to beta 3.20/b22 + * * Revision 1.1 1994/03/29 02:47:25 mycroft * pcvt 3.0, with some performance enhancements by Joerg Wunsch and me. * diff --git a/usr.sbin/pcvt/vgaio/vgaio.y b/usr.sbin/pcvt/vgaio/vgaio.y index 87aa8486dd130..2865a5148266b 100644 --- a/usr.sbin/pcvt/vgaio/vgaio.y +++ b/usr.sbin/pcvt/vgaio/vgaio.y @@ -33,10 +33,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ident "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/pcvt/vgaio/vgaio.y,v 1.1.1.1 1995/02/05 13:49:24 jkh Exp $" +#ident "$Header: /home/ncvs/src/usr.sbin/pcvt/vgaio/vgaio.y,v 1.1.1.1.4.1 1996/06/05 02:57:48 jkh Exp $" /* * $Log: vgaio.y,v $ + * Revision 1.1.1.1.4.1 1996/06/05 02:57:48 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.1.1.1 1995/02/05 13:49:24 jkh * PCVT userland utilities. * Submitted by: hm diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h index 9b72abe342477..d9b45f485ef2a 100644 --- a/usr.sbin/pkg_install/add/add.h +++ b/usr.sbin/pkg_install/add/add.h @@ -1,4 +1,4 @@ -/* $Id: add.h,v 1.6 1995/10/25 15:37:45 jkh Exp $ */ +/* $Id: add.h,v 1.5.4.3 1996/10/15 18:36:03 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c index d300f56429c90..fb41195e97fb4 100644 --- a/usr.sbin/pkg_install/add/extract.c +++ b/usr.sbin/pkg_install/add/extract.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: extract.c,v 1.7.4.1 1997/02/14 01:54:12 jkh Exp $"; +static const char *rcsid = "$Id: extract.c,v 1.7.4.2 1997/02/15 16:35:38 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c index 7cf18e66ca1f7..f27e49678eb96 100644 --- a/usr.sbin/pkg_install/add/futil.c +++ b/usr.sbin/pkg_install/add/futil.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: futil.c,v 1.3 1994/12/06 00:51:32 jkh Exp $"; +static const char *rcsid = "$Id: futil.c,v 1.4 1995/05/30 03:49:52 rgrimes Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index 6d875ee9dbb98..3637a63804e25 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -1,5 +1,5 @@ #ifndef lint -static char *rcsid = "$Id: main.c,v 1.11 1996/07/30 10:48:09 jkh Exp $"; +static char *rcsid = "$Id: main.c,v 1.7.4.7 1996/10/15 18:36:09 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 9c4a9cac2f796..a0d00b4efe684 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.26.2.12 1996/10/15 18:36:14 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.26.2.13 1997/02/15 14:18:11 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h index 49aa5ccff7734..2968ea7597a34 100644 --- a/usr.sbin/pkg_install/create/create.h +++ b/usr.sbin/pkg_install/create/create.h @@ -1,4 +1,4 @@ -/* $Id: create.h,v 1.9 1995/10/25 15:37:58 jkh Exp $ */ +/* $Id: create.h,v 1.8.4.2 1996/10/15 18:37:14 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index a965c7eebccc6..57b89b45cc56f 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: main.c,v 1.12 1995/10/25 15:37:59 jkh Exp $"; +static const char *rcsid = "$Id: main.c,v 1.11.4.2 1996/10/15 18:37:19 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c index 1843fcbdf22e1..afab26c02e965 100644 --- a/usr.sbin/pkg_install/create/perform.c +++ b/usr.sbin/pkg_install/create/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.32 1996/07/30 10:48:12 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.27.4.4 1996/10/15 18:37:26 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index 1a104c0834e91..b32fc9ce8eed0 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -15,7 +15,7 @@ .\" .\" .\" @(#)pkg_create.1 -.\" $Id: pkg_create.1,v 1.16 1996/04/08 04:17:54 mpp Exp $ +.\" $Id: pkg_create.1,v 1.14.4.2 1996/10/15 18:37:33 jkh Exp $ .\" .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords, .\" added dependency tracking, etc. diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c index 3667648067ac7..436e13af2e9d3 100644 --- a/usr.sbin/pkg_install/create/pl.c +++ b/usr.sbin/pkg_install/create/pl.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: pl.c,v 1.8 1996/07/30 10:48:13 jkh Exp $"; +static const char *rcsid = "$Id: pl.c,v 1.7.4.2 1996/10/15 18:37:37 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h index e618d182611ce..44ae0201159e2 100644 --- a/usr.sbin/pkg_install/delete/delete.h +++ b/usr.sbin/pkg_install/delete/delete.h @@ -1,4 +1,4 @@ -/* $Id: delete.h,v 1.1.1.1 1993/08/26 01:19:54 jkh Exp $ */ +/* $Id: delete.h,v 1.2 1994/12/06 00:51:39 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index 9bc646cc4d32a..95d9f7d6f986c 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -1,5 +1,5 @@ #ifndef lint -static char *rcsid = "$Id: main.c,v 1.6 1996/07/30 10:48:15 jkh Exp $"; +static char *rcsid = "$Id: main.c,v 1.4.4.2 1996/10/15 18:37:46 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 41953d029df3f..a582ea37193c4 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.10 1996/07/30 10:48:16 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.7.4.3 1996/10/15 18:37:51 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h index 07d9f438a4020..1bec23bc7b196 100644 --- a/usr.sbin/pkg_install/info/info.h +++ b/usr.sbin/pkg_install/info/info.h @@ -1,4 +1,4 @@ -/* $Id: info.h,v 1.8 1995/10/25 15:38:27 jkh Exp $ */ +/* $Id: info.h,v 1.7.4.2 1996/10/15 18:38:04 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index 11e75d9a822b9..be6b61dcf9a8f 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -1,5 +1,5 @@ #ifndef lint -static char *rcsid = "$Id: main.c,v 1.10 1995/10/25 15:38:29 jkh Exp $"; +static char *rcsid = "$Id: main.c,v 1.9.4.2 1996/10/15 18:38:13 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c index f13cbab055f79..ca8d67d0824a2 100644 --- a/usr.sbin/pkg_install/info/perform.c +++ b/usr.sbin/pkg_install/info/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.19 1996/06/16 16:33:34 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.16.4.5 1996/10/15 18:38:19 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c index dce6c8fc0bc27..602e48225f77e 100644 --- a/usr.sbin/pkg_install/info/show.c +++ b/usr.sbin/pkg_install/info/show.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: show.c,v 1.8 1996/06/20 18:33:47 jkh Exp $"; +static const char *rcsid = "$Id: show.c,v 1.6.4.3 1996/10/15 18:38:27 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c index dd6b184fffd89..1b6a7191eda39 100644 --- a/usr.sbin/pkg_install/lib/exec.c +++ b/usr.sbin/pkg_install/lib/exec.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: exec.c,v 1.2 1993/09/03 23:01:12 jkh Exp $"; +static const char *rcsid = "$Id: exec.c,v 1.3 1994/12/06 00:51:47 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index d349fbf70a525..c513761ea7b18 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: file.c,v 1.10.4.11 1996/10/15 18:38:44 jkh Exp $"; +static const char *rcsid = "$Id: file.c,v 1.10.4.12 1997/02/07 07:52:44 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/ftp.c b/usr.sbin/pkg_install/lib/ftp.c index 7b78ee4c97543..cce5fb2d333ea 100644 --- a/usr.sbin/pkg_install/lib/ftp.c +++ b/usr.sbin/pkg_install/lib/ftp.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ftp.c,v 1.2 1995/07/31 02:27:58 jkh Exp $ + * $Id: ftp.c,v 1.3 1995/08/01 07:16:51 jkh Exp $ * * Return values have been sanitized: * -1 error, but you (still) have a session. diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c index 1e7120232afe7..1795dd042b68d 100644 --- a/usr.sbin/pkg_install/lib/global.c +++ b/usr.sbin/pkg_install/lib/global.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: global.c,v 1.3 1996/07/30 10:48:19 jkh Exp $"; +static const char *rcsid = "$Id: global.c,v 1.2.6.2 1996/10/15 18:38:51 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index 53828a323ae2b..e0b66564408bc 100644 --- a/usr.sbin/pkg_install/lib/lib.h +++ b/usr.sbin/pkg_install/lib/lib.h @@ -1,4 +1,4 @@ -/* $Id: lib.h,v 1.22 1996/07/30 10:48:19 jkh Exp $ */ +/* $Id: lib.h,v 1.16.4.6 1996/10/15 18:38:57 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c index edbce5f86ab98..2036307d00b46 100644 --- a/usr.sbin/pkg_install/lib/msg.c +++ b/usr.sbin/pkg_install/lib/msg.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: msg.c,v 1.6 1995/08/26 10:15:15 jkh Exp $"; +static const char *rcsid = "$Id: msg.c,v 1.5.4.2 1996/10/15 18:39:01 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c index 46c48488521c1..7d2cfc70505c4 100644 --- a/usr.sbin/pkg_install/lib/pen.c +++ b/usr.sbin/pkg_install/lib/pen.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: pen.c,v 1.22 1996/06/20 18:33:54 jkh Exp $"; +static const char *rcsid = "$Id: pen.c,v 1.13.4.10 1996/10/15 18:39:06 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index 37da818214d9e..ba52ad0ee5782 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: plist.c,v 1.17 1996/07/30 10:48:20 jkh Exp $"; +static const char *rcsid = "$Id: plist.c,v 1.13.4.4 1996/10/15 18:39:12 jkh Exp $"; #endif /* diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg index 5a3e500ae776d..815291dbeb4af 100755 --- a/usr.sbin/pkg_install/tkpkg +++ b/usr.sbin/pkg_install/tkpkg @@ -1,7 +1,11 @@ #!/usr/local/bin/wish -f -#$Id: tkpkg,v 1.1 1994/01/06 08:16:20 jkh Exp $ +#$Id: tkpkg,v 1.2 1994/12/06 00:51:21 jkh Exp $ # #$Log: tkpkg,v $ +#Revision 1.2 1994/12/06 00:51:21 jkh +#Many of John T. Kohl's patches from NetBSD. Thanks, John! +#Submitted by: jkohl +# # Revision 1.1 1994/01/06 08:16:20 jkh # Cleaning house. # diff --git a/usr.sbin/pkg_manage/Makefile b/usr.sbin/pkg_manage/Makefile index 6367244de924f..bf0bd495d9076 100644 --- a/usr.sbin/pkg_manage/Makefile +++ b/usr.sbin/pkg_manage/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1995/05/27 20:05:35 jkh Exp $ +# $Id: Makefile,v 1.6 1995/05/30 03:50:08 rgrimes Exp $ PROG= pkg_manage SRCS= pkg_main.c pkg_manage.c pkg_ui.c version.c diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 213c3cfdab742..694001c16c3cd 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2.4.1 1995/10/06 11:24:29 davidg Exp $ +# $Id: Makefile,v 1.2.4.2 1996/02/05 17:02:37 dfr Exp $ PROG= ppp SRCS= async.c auth.c ccp.c chap.c chat.c command.c filter.c fsm.c hdlc.c \ diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index 17011aa1aef22..1dbd925352217 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: arp.c,v 1.2.4.1 1996/02/05 17:02:39 dfr Exp $ + * $Id: arp.c,v 1.2.4.2 1997/02/07 06:10:27 imp Exp $ * */ diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h index 95c10ba2e4da7..528c6abfa5628 100644 --- a/usr.sbin/ppp/arp.h +++ b/usr.sbin/ppp/arp.h @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.12 1996/01/10 21:27:53 phk Exp $ + * $Id: arp.h,v 1.1 1996/01/11 17:48:35 phk Exp $ * */ diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c index ea091fff68f37..fd932f7a177b8 100644 --- a/usr.sbin/ppp/async.c +++ b/usr.sbin/ppp/async.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: async.c,v 1.4 1995/05/30 03:50:24 rgrimes Exp $ + * $Id: async.c,v 1.4.4.1 1996/02/05 17:02:42 dfr Exp $ * */ #include "fsm.h" diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c index bfc268989a869..bfb82c0e79785 100644 --- a/usr.sbin/ppp/auth.c +++ b/usr.sbin/ppp/auth.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: auth.c,v 1.4.4.2 1996/02/05 17:02:44 dfr Exp $ + * $Id: auth.c,v 1.4.4.3 1997/02/07 06:10:31 imp Exp $ * * TODO: * o Implement check against with registered IP addresses. diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h index f3b9052606dab..c06ee7c817943 100644 --- a/usr.sbin/ppp/auth.h +++ b/usr.sbin/ppp/auth.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: auth.h,v 1.2 1995/05/30 03:50:26 rgrimes Exp $ + * $Id: auth.h,v 1.2.4.1 1996/02/05 17:02:45 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c index bd1146fff6164..bb9dce67a68c9 100644 --- a/usr.sbin/ppp/ccp.c +++ b/usr.sbin/ppp/ccp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ccp.c,v 1.3.4.1 1996/02/05 17:02:47 dfr Exp $ + * $Id: ccp.c,v 1.3.4.2 1997/02/07 06:10:38 imp Exp $ * * TODO: * o Support other compression protocols diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h index d19f39a3c6c2f..d51ba85ad9f71 100644 --- a/usr.sbin/ppp/ccp.h +++ b/usr.sbin/ppp/ccp.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ccp.h,v 1.2 1995/02/26 12:17:15 amurai Exp $ + * $Id: ccp.h,v 1.2.4.1 1996/02/05 17:02:48 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/cdefs.h b/usr.sbin/ppp/cdefs.h index 85ba8a5b3cfcf..41205a43b9ffb 100644 --- a/usr.sbin/ppp/cdefs.h +++ b/usr.sbin/ppp/cdefs.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id:$ + * $Id: cdefs.h,v 1.1 1995/02/27 03:17:54 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c index c50010bfd2bb2..2c2b19c3f691a 100644 --- a/usr.sbin/ppp/chap.c +++ b/usr.sbin/ppp/chap.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chap.c,v 1.3 1995/05/30 03:50:28 rgrimes Exp $ + * $Id: chap.c,v 1.3.4.1 1996/02/05 17:02:49 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h index 642b2baa745b9..2b0b024c558e8 100644 --- a/usr.sbin/ppp/chap.h +++ b/usr.sbin/ppp/chap.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chap.h,v 1.2 1995/02/26 12:17:19 amurai Exp $ + * $Id: chap.h,v 1.2.4.1 1996/02/05 17:02:50 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c index 545c47591dcef..130c719d7ae17 100644 --- a/usr.sbin/ppp/chat.c +++ b/usr.sbin/ppp/chat.c @@ -18,7 +18,7 @@ * Columbus, OH 43221 * (614)451-1883 * - * $Id: chat.c,v 1.4.4.3 1996/12/15 20:47:21 pst Exp $ + * $Id: chat.c,v 1.4.4.4 1997/02/07 06:10:43 imp Exp $ * * TODO: * o Support more UUCP compatible control sequences. diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h index 5976129e123c4..4293097a77fd1 100644 --- a/usr.sbin/ppp/chat.h +++ b/usr.sbin/ppp/chat.h @@ -18,7 +18,7 @@ * Columbus, OH 43221 * (614)451-1883 * - * $Id: chat.h,v 1.1 1996/01/11 17:48:39 phk Exp $ + * $Id: chat.h,v 1.1.2.1 1997/02/07 06:10:46 imp Exp $ * */ #ifndef _CHAT_H_ diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c index cfa68e60e5ee5..3383644613c91 100644 --- a/usr.sbin/ppp/command.c +++ b/usr.sbin/ppp/command.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: command.c,v 1.5.4.4 1996/06/10 09:41:49 ache Exp $ + * $Id: command.c,v 1.5.4.5 1997/02/07 06:10:50 imp Exp $ * */ #include <sys/types.h> diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h index e8beaed2e6b2f..eaaef4d60190b 100644 --- a/usr.sbin/ppp/command.h +++ b/usr.sbin/ppp/command.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id:$ + * $Id: command.h,v 1.2 1995/02/26 12:17:24 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h index ee6436bd62f4f..eaa9fbc7a9645 100644 --- a/usr.sbin/ppp/defs.h +++ b/usr.sbin/ppp/defs.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: defs.h,v 1.2.4.1 1995/10/06 11:24:33 davidg Exp $ + * $Id: defs.h,v 1.2.4.2 1996/02/05 17:02:54 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c index d73d79ba7f2d3..05654a5b0e3b7 100644 --- a/usr.sbin/ppp/filter.c +++ b/usr.sbin/ppp/filter.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: filter.c,v 1.4.4.1 1995/10/06 11:24:34 davidg Exp $ + * $Id: filter.c,v 1.4.4.2 1996/02/05 17:02:56 dfr Exp $ * * TODO: Shoud send ICMP error message when we discard packets. */ diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h index ca87e7ee48178..1f30cea373853 100644 --- a/usr.sbin/ppp/filter.h +++ b/usr.sbin/ppp/filter.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: filter.h,v 1.3 1995/03/11 15:18:41 amurai Exp $ + * $Id: filter.h,v 1.3.4.1 1996/02/05 17:02:57 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c index 6229d6f143633..21101ab7bac21 100644 --- a/usr.sbin/ppp/fsm.c +++ b/usr.sbin/ppp/fsm.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: fsm.c,v 1.3.4.1 1995/10/06 11:24:35 davidg Exp $ + * $Id: fsm.c,v 1.3.4.2 1996/02/05 17:02:58 dfr Exp $ * * TODO: * o Refer loglevel for log output diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h index 1ba710a698639..201db391ed2ed 100644 --- a/usr.sbin/ppp/fsm.h +++ b/usr.sbin/ppp/fsm.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: fsm.h,v 1.4 1995/02/27 03:17:58 amurai Exp $ + * $Id: fsm.h,v 1.4.4.1 1996/02/05 17:02:59 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/global.h b/usr.sbin/ppp/global.h index 6630a29149a9b..91560cf7847ca 100644 --- a/usr.sbin/ppp/global.h +++ b/usr.sbin/ppp/global.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id:$ + * $Id: global.h,v 1.2 1995/02/26 12:17:29 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c index 44b2fd86d4b52..d319f8f81fbda 100644 --- a/usr.sbin/ppp/hdlc.c +++ b/usr.sbin/ppp/hdlc.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: hdlc.c,v 1.3.4.2 1995/08/26 12:11:39 davidg Exp $ + * $Id: hdlc.c,v 1.3.4.3 1996/02/05 17:03:00 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h index fe7438d630c24..e2901dd1f9f0e 100644 --- a/usr.sbin/ppp/hdlc.h +++ b/usr.sbin/ppp/hdlc.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: hdlc.h,v 1.2 1995/02/26 12:17:31 amurai Exp $ + * $Id: hdlc.h,v 1.2.4.1 1996/02/05 17:03:01 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c index 752b74883b2e1..49e7b0dbe07cf 100644 --- a/usr.sbin/ppp/ip.c +++ b/usr.sbin/ppp/ip.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ip.c,v 1.4.4.1 1995/10/06 11:24:37 davidg Exp $ + * $Id: ip.c,v 1.4.4.2 1996/02/05 17:03:02 dfr Exp $ * * TODO: * o Return ICMP message for filterd packet diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h index fcc461d469d25..f2c3103f27bde 100644 --- a/usr.sbin/ppp/ip.h +++ b/usr.sbin/ppp/ip.h @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.12 1996/01/10 21:27:53 phk Exp $ + * $Id: ip.h,v 1.1 1996/01/11 17:48:49 phk Exp $ * */ diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c index 6f01a3580d939..fb35bb9e6093f 100644 --- a/usr.sbin/ppp/ipcp.c +++ b/usr.sbin/ppp/ipcp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.c,v 1.4.4.2 1996/02/05 17:03:04 dfr Exp $ + * $Id: ipcp.c,v 1.4.4.3 1997/02/07 06:10:52 imp Exp $ * * TODO: * o More RFC1772 backwoard compatibility diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h index 220381fa2e8d6..6addf2e4d7624 100644 --- a/usr.sbin/ppp/ipcp.h +++ b/usr.sbin/ppp/ipcp.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.h,v 1.2 1995/02/26 12:17:34 amurai Exp $ + * $Id: ipcp.h,v 1.2.4.1 1995/08/26 12:11:43 davidg Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c index fcacf1e04e6b0..98e20b5e1a2ab 100644 --- a/usr.sbin/ppp/lcp.c +++ b/usr.sbin/ppp/lcp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lcp.c,v 1.4.4.2 1995/10/06 11:24:40 davidg Exp $ + * $Id: lcp.c,v 1.4.4.3 1996/02/05 17:03:05 dfr Exp $ * * TODO: * o Validate magic number received from peer. diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h index 33f0df10bd0bb..d61c444ab3ffe 100644 --- a/usr.sbin/ppp/lcp.h +++ b/usr.sbin/ppp/lcp.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lcp.h,v 1.2 1995/02/26 12:17:36 amurai Exp $ + * $Id: lcp.h,v 1.4 1995/02/27 03:18:03 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/lcpproto.h b/usr.sbin/ppp/lcpproto.h index 306aee6d2b932..982d64330dfda 100644 --- a/usr.sbin/ppp/lcpproto.h +++ b/usr.sbin/ppp/lcpproto.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lcpproto.h,v 1.2 1995/02/26 12:17:37 amurai Exp $ + * $Id: lcpproto.h,v 1.4 1995/02/27 03:18:11 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c index aa08de2633a60..c3d4f02653767 100644 --- a/usr.sbin/ppp/log.c +++ b/usr.sbin/ppp/log.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: log.c,v 1.3 1995/05/30 03:50:43 rgrimes Exp $ + * $Id: log.c,v 1.3.4.1 1997/02/07 06:10:55 imp Exp $ * */ #include "defs.h" diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h index e958efcf82649..1598afc25fbc2 100644 --- a/usr.sbin/ppp/log.h +++ b/usr.sbin/ppp/log.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: log.h,v 1.4 1995/02/27 03:18:16 amurai Exp $ + * $Id: log.h,v 1.4.4.1 1996/02/05 17:03:06 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c index 833c60a8836c8..11f654ed5df99 100644 --- a/usr.sbin/ppp/lqr.c +++ b/usr.sbin/ppp/lqr.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lqr.c,v 1.4 1995/05/30 03:50:44 rgrimes Exp $ + * $Id: lqr.c,v 1.4.4.1 1996/02/05 17:03:07 dfr Exp $ * * o LQR based on RFC1333 * diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h index 30fe971c6c620..a8e424402b268 100644 --- a/usr.sbin/ppp/lqr.h +++ b/usr.sbin/ppp/lqr.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lqr.h,v 1.2 1995/02/26 12:17:40 amurai Exp $ + * $Id: lqr.h,v 1.2.4.1 1996/02/05 17:03:08 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c index 37a1f0666c9bb..e3d1bf2d0f8b1 100644 --- a/usr.sbin/ppp/main.c +++ b/usr.sbin/ppp/main.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.5.4.3 1996/02/05 17:03:09 dfr Exp $ + * $Id: main.c,v 1.5.4.4 1997/02/07 06:10:58 imp Exp $ * * TODO: * o Add commands for traffic summary, version display, etc. diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h index 1f578821ea968..3bf6dfe39eac9 100644 --- a/usr.sbin/ppp/main.h +++ b/usr.sbin/ppp/main.h @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.12 1996/01/10 21:27:53 phk Exp $ + * $Id: main.h,v 1.1 1996/01/11 17:48:53 phk Exp $ * */ diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c index c371a6478dcf0..24aed0ee9dcd9 100644 --- a/usr.sbin/ppp/mbuf.c +++ b/usr.sbin/ppp/mbuf.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: mbuf.c,v 1.2 1995/02/26 12:17:42 amurai Exp $ + * $Id: mbuf.c,v 1.3 1995/05/30 03:50:48 rgrimes Exp $ * */ #include "defs.h" diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h index c4121f0fc6dca..cf8f313e3f537 100644 --- a/usr.sbin/ppp/mbuf.h +++ b/usr.sbin/ppp/mbuf.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id:$ + * $Id: mbuf.h,v 1.2 1995/02/26 12:17:43 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c index f335bf6ca4ad3..ba4c15dc18848 100644 --- a/usr.sbin/ppp/modem.c +++ b/usr.sbin/ppp/modem.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: modem.c,v 1.6.4.3 1996/02/05 17:03:12 dfr Exp $ + * $Id: modem.c,v 1.6.4.4 1997/02/07 06:11:01 imp Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/modem.h b/usr.sbin/ppp/modem.h index 9cb6506f330e9..2e4d54de43db4 100644 --- a/usr.sbin/ppp/modem.h +++ b/usr.sbin/ppp/modem.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: modem.h,v 1.4 1995/02/27 03:18:22 amurai Exp $ + * $Id: modem.h,v 1.4.4.1 1996/02/05 17:03:13 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c index cf3865e719e38..9ff471f263d09 100644 --- a/usr.sbin/ppp/os.c +++ b/usr.sbin/ppp/os.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: os.c,v 1.3.4.3 1996/11/04 14:47:09 scrappy Exp $ + * $Id: os.c,v 1.3.4.4 1997/02/07 06:11:03 imp Exp $ * */ #include "fsm.h" diff --git a/usr.sbin/ppp/os.h b/usr.sbin/ppp/os.h index c518c5e4a7703..6db826d13540f 100644 --- a/usr.sbin/ppp/os.h +++ b/usr.sbin/ppp/os.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: os.h,v 1.2 1995/02/26 12:17:49 amurai Exp $ + * $Id: os.h,v 1.2.4.1 1996/02/05 17:03:15 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c index a76fc3193a7be..11974a9172281 100644 --- a/usr.sbin/ppp/pap.c +++ b/usr.sbin/ppp/pap.c @@ -18,7 +18,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: pap.c,v 1.3 1995/05/30 03:50:53 rgrimes Exp $ + * $Id: pap.c,v 1.3.4.1 1996/02/05 17:03:16 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h index 14ca50c29cadc..9290e29db1c90 100644 --- a/usr.sbin/ppp/pap.h +++ b/usr.sbin/ppp/pap.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id:$ + * $Id: pap.h,v 1.1.1.1 1995/01/31 06:29:56 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/pathnames.h b/usr.sbin/ppp/pathnames.h index fbabf37743bf7..f8f80904e69a4 100644 --- a/usr.sbin/ppp/pathnames.h +++ b/usr.sbin/ppp/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * - * $Id: pathnames.h,v 1.3 1995/02/26 12:17:52 amurai Exp $ + * $Id: pathnames.h,v 1.4 1995/05/30 03:50:54 rgrimes Exp $ * * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */ diff --git a/usr.sbin/ppp/phase.h b/usr.sbin/ppp/phase.h index 688ae333e93c6..2f012c61242a5 100644 --- a/usr.sbin/ppp/phase.h +++ b/usr.sbin/ppp/phase.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: phase.h,v 1.1.1.1 1995/01/31 06:29:55 amurai Exp $ + * $Id: phase.h,v 1.2 1995/02/26 12:17:53 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index ba89c56cd476d..5820824b18cb7 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -1,5 +1,5 @@ .\" manual page [] for ppp 0.94 beta2 + alpha -.\" $Id: ppp.8,v 1.8.4.3 1996/02/05 17:03:17 dfr Exp $ +.\" $Id: ppp.8,v 1.8.4.4 1997/02/15 10:13:25 joerg Exp $ .Dd 20 September 1995 .Os FreeBSD .Dt PPP 8 diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c index e86985cd86366..821a035ba376d 100644 --- a/usr.sbin/ppp/pred.c +++ b/usr.sbin/ppp/pred.c @@ -5,7 +5,7 @@ /* * - * $Id: pred.c,v 1.3 1995/05/30 03:50:55 rgrimes Exp $ + * $Id: pred.c,v 1.3.4.1 1996/02/05 17:03:18 dfr Exp $ * * pred.c -- Test program for Dave Rand's rendition of the * predictor algorithm diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h index e44a489b20552..cb3502739e13f 100644 --- a/usr.sbin/ppp/pred.h +++ b/usr.sbin/ppp/pred.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ccp.h,v 1.2 1995/02/26 12:17:15 amurai Exp $ + * $Id: pred.h,v 1.1 1996/01/11 17:48:56 phk Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c index 46c8646750cd7..60788751f933e 100644 --- a/usr.sbin/ppp/route.c +++ b/usr.sbin/ppp/route.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: route.c,v 1.3.4.1 1995/08/26 12:11:49 davidg Exp $ + * $Id: route.c,v 1.3.4.2 1996/02/05 17:03:19 dfr Exp $ * */ #include <sys/types.h> diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h index 4aba1af33d19e..bbc06119e4829 100644 --- a/usr.sbin/ppp/route.h +++ b/usr.sbin/ppp/route.h @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.12 1996/01/10 21:27:53 phk Exp $ + * $Id: route.h,v 1.1 1996/01/11 17:48:57 phk Exp $ * */ diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c index 9f07237c55e1f..76be1ad8cab6f 100644 --- a/usr.sbin/ppp/slcompress.c +++ b/usr.sbin/ppp/slcompress.c @@ -17,13 +17,13 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: slcompress.c,v 1.3.4.2 1996/04/11 08:18:05 davidg Exp $ + * $Id: slcompress.c,v 1.3.4.3 1996/04/11 08:22:31 davidg Exp $ * * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. */ #ifndef lint -static char const rcsid[] = "$Id: slcompress.c,v 1.3.4.2 1996/04/11 08:18:05 davidg Exp $"; +static char const rcsid[] = "$Id: slcompress.c,v 1.3.4.3 1996/04/11 08:22:31 davidg Exp $"; #endif #include "defs.h" diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h index ea9b20b18fdcc..c7cf34e79241c 100644 --- a/usr.sbin/ppp/slcompress.h +++ b/usr.sbin/ppp/slcompress.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/ppp/slcompress.h,v 1.3 1995/05/30 03:50:58 rgrimes Exp $ + * $Header: /home/ncvs/src/usr.sbin/ppp/slcompress.h,v 1.3.4.1 1996/06/05 02:57:51 jkh Exp $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. @@ -18,7 +18,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: slcompress.h,v 1.3 1995/05/30 03:50:58 rgrimes Exp $ + * $Id: slcompress.h,v 1.3.4.1 1996/06/05 02:57:51 jkh Exp $ * * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989: * - Initial distribution. diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c index 4a3c59038d1c9..263f746bcf7bd 100644 --- a/usr.sbin/ppp/systems.c +++ b/usr.sbin/ppp/systems.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: systems.c,v 1.5 1995/05/30 03:50:58 rgrimes Exp $ + * $Id: systems.c,v 1.5.4.1 1996/12/15 20:47:23 pst Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h index b1953a4969eb4..737efda5b7a7e 100644 --- a/usr.sbin/ppp/systems.h +++ b/usr.sbin/ppp/systems.h @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.12 1996/01/10 21:27:53 phk Exp $ + * $Id: systems.h,v 1.1 1996/01/11 17:48:58 phk Exp $ * */ diff --git a/usr.sbin/ppp/timeout.h b/usr.sbin/ppp/timeout.h index cc7285d0b6712..ec6d9e6dd7249 100644 --- a/usr.sbin/ppp/timeout.h +++ b/usr.sbin/ppp/timeout.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: timeout.h,v 1.4 1995/02/27 03:18:28 amurai Exp $ + * $Id: timeout.h,v 1.5 1995/03/11 15:18:50 amurai Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c index 10e1d2c6b1002..07f129de46760 100644 --- a/usr.sbin/ppp/timer.c +++ b/usr.sbin/ppp/timer.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: timer.c,v 1.4 1995/05/30 03:50:59 rgrimes Exp $ + * $Id: timer.c,v 1.4.4.1 1996/02/05 17:03:21 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/uucplock.c b/usr.sbin/ppp/uucplock.c index 78509bccd3006..a717bbd51741b 100644 --- a/usr.sbin/ppp/uucplock.c +++ b/usr.sbin/ppp/uucplock.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: uucplock.c,v 1.5 1995/05/30 03:51:00 rgrimes Exp $ + * $Id: uucplock.c,v 1.5.4.1 1996/02/05 17:03:22 dfr Exp $ * */ diff --git a/usr.sbin/ppp/vars.c b/usr.sbin/ppp/vars.c index b1a2ffacec884..c2c4a8cdec5d8 100644 --- a/usr.sbin/ppp/vars.c +++ b/usr.sbin/ppp/vars.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: vars.c,v 1.3.4.2 1995/10/06 11:24:47 davidg Exp $ + * $Id: vars.c,v 1.3.4.3 1996/02/05 17:03:24 dfr Exp $ * */ #include "fsm.h" @@ -29,7 +29,7 @@ #include "defs.h" char VarVersion[] = "Version 0.94"; -char VarLocalVersion[] = "$Date: 1995/10/06 11:24:47 $"; +char VarLocalVersion[] = "$Date: 1996/02/05 17:03:24 $"; /* * Order of conf option is important. See vars.h. diff --git a/usr.sbin/ppp/vars.h b/usr.sbin/ppp/vars.h index c497267a4f5b9..27f574fceff0b 100644 --- a/usr.sbin/ppp/vars.h +++ b/usr.sbin/ppp/vars.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: vars.h,v 1.3 1995/03/11 15:18:55 amurai Exp $ + * $Id: vars.h,v 1.3.4.1 1996/02/05 17:03:25 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c index c0718fea66e30..2180400db4e57 100644 --- a/usr.sbin/ppp/vjcomp.c +++ b/usr.sbin/ppp/vjcomp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: vjcomp.c,v 1.3 1995/05/30 03:51:02 rgrimes Exp $ + * $Id: vjcomp.c,v 1.3.4.1 1996/02/05 17:03:26 dfr Exp $ * * TODO: */ diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 4fe87850f1f34..20a3df13dfe77 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -1,5 +1,5 @@ # From: Id: Makefile.bsd,v 1.4 1994/04/20 00:07:50 paulus Exp -# $Id: Makefile,v 1.1 1994/09/25 02:31:49 wollman Exp $ +# $Id: Makefile,v 1.1.6.1 1996/03/01 19:34:43 phk Exp $ PROG= pppd SRCS= main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c \ diff --git a/usr.sbin/pppd/args.h b/usr.sbin/pppd/args.h index e76721266cb50..e3e6aa6392658 100644 --- a/usr.sbin/pppd/args.h +++ b/usr.sbin/pppd/args.h @@ -1,6 +1,6 @@ /* * neat macro from ka9q to "do the right thing" with ansi prototypes - * $Id: args.h,v 1.2 1994/09/25 02:31:51 wollman Exp $ + * $Id: args.h,v 1.2.6.1 1996/03/01 19:34:44 phk Exp $ */ #ifndef __P diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c index 872647dc9c636..b355099ccdbf3 100644 --- a/usr.sbin/pppd/auth.c +++ b/usr.sbin/pppd/auth.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: auth.c,v 1.3.4.1 1995/09/02 14:40:06 davidg Exp $"; +static char rcsid[] = "$Id: auth.c,v 1.3.4.2 1996/03/01 19:34:45 phk Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/pppd/callout.h b/usr.sbin/pppd/callout.h index 115d01c66653a..f9261d9e7076d 100644 --- a/usr.sbin/pppd/callout.h +++ b/usr.sbin/pppd/callout.h @@ -3,7 +3,7 @@ /* to a pointer to a function of type void (generic pointer) as per */ /* ANSI C */ -/* $Id: callout.h,v 1.1 1993/11/11 03:54:25 paulus Exp $ */ +/* $Id: callout.h,v 1.2 1994/09/25 02:31:53 wollman Exp $ */ #ifndef _ppp_callout_h #define _ppp_callout_h diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c index 9292b084159cc..8091071d0928c 100644 --- a/usr.sbin/pppd/chap.c +++ b/usr.sbin/pppd/chap.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: chap.c,v 1.3.4.1 1996/03/01 19:34:45 phk Exp $"; +static char rcsid[] = "$Id: chap.c,v 1.3.4.2 1996/03/12 13:43:08 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h index 8a0ae05acd9ae..69f66d4d67bf5 100644 --- a/usr.sbin/pppd/chap.h +++ b/usr.sbin/pppd/chap.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chap.h,v 1.2 1994/09/25 02:31:55 wollman Exp $ + * $Id: chap.h,v 1.2.6.1 1996/03/01 19:34:46 phk Exp $ */ #ifndef __CHAP_INCLUDE__ diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c index be41ac73971b0..b7f33ebdaf0f6 100644 --- a/usr.sbin/pppd/fsm.c +++ b/usr.sbin/pppd/fsm.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: fsm.c,v 1.3 1995/05/30 03:51:07 rgrimes Exp $"; +static char rcsid[] = "$Id: fsm.c,v 1.3.4.1 1996/03/01 19:34:47 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h index 62ae7332c52a7..4241d56e275fb 100644 --- a/usr.sbin/pppd/fsm.h +++ b/usr.sbin/pppd/fsm.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: fsm.h,v 1.2 1994/09/25 02:31:58 wollman Exp $ + * $Id: fsm.h,v 1.2.6.1 1996/03/01 19:34:48 phk Exp $ */ /* diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c index bd8da27b676a2..c5ce7073e9d0a 100644 --- a/usr.sbin/pppd/ipcp.c +++ b/usr.sbin/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.3 1995/05/30 03:51:08 rgrimes Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.3.4.1 1996/03/01 19:34:48 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h index 553ae73c69bb1..59eb509554811 100644 --- a/usr.sbin/pppd/ipcp.h +++ b/usr.sbin/pppd/ipcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.h,v 1.3 1995/05/30 03:51:11 rgrimes Exp $ + * $Id: ipcp.h,v 1.3.4.1 1996/03/01 19:34:49 phk Exp $ */ /* diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c index 7cfa0596afe42..a6da7e282d985 100644 --- a/usr.sbin/pppd/lcp.c +++ b/usr.sbin/pppd/lcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: lcp.c,v 1.3 1995/05/30 03:51:12 rgrimes Exp $"; +static char rcsid[] = "$Id: lcp.c,v 1.3.4.1 1996/03/01 19:34:50 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h index 1d1cd4374185c..e448c1497f054 100644 --- a/usr.sbin/pppd/lcp.h +++ b/usr.sbin/pppd/lcp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lcp.h,v 1.2 1994/09/25 02:32:03 wollman Exp $ + * $Id: lcp.h,v 1.2.6.1 1996/03/01 19:34:51 phk Exp $ */ /* diff --git a/usr.sbin/pppd/lock.c b/usr.sbin/pppd/lock.c index 8cb7da7328453..5af8eb5d50d30 100644 --- a/usr.sbin/pppd/lock.c +++ b/usr.sbin/pppd/lock.c @@ -4,7 +4,7 @@ * This code is derived from chat.c. */ -static char rcsid[] = "$Id: lock.c,v 1.2 1994/09/25 02:32:04 wollman Exp $"; +static char rcsid[] = "$Id: lock.c,v 1.3 1994/10/22 14:40:48 dfr Exp $"; #include <stdio.h> #include <string.h> diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c index f505743c5b757..9670dc6e9aa02 100644 --- a/usr.sbin/pppd/magic.c +++ b/usr.sbin/pppd/magic.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: magic.c,v 1.2 1994/09/25 02:32:05 wollman Exp $"; +static char rcsid[] = "$Id: magic.c,v 1.2.6.1 1996/03/01 19:34:52 phk Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h index 81a9937e60edc..0c6344be83ea2 100644 --- a/usr.sbin/pppd/magic.h +++ b/usr.sbin/pppd/magic.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: magic.h,v 1.2 1994/09/25 02:32:06 wollman Exp $ + * $Id: magic.h,v 1.2.6.1 1996/03/01 19:34:52 phk Exp $ */ #include "args.h" diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index c7b5177f9b284..ff22fa78c1632 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.4.4.1 1996/03/01 19:34:53 phk Exp $"; +static char rcsid[] = "$Id: main.c,v 1.4.4.2 1996/03/12 13:43:08 phk Exp $"; #endif #define SETSID diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index a8ceec763ba36..c2ad372ec7468 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: options.c,v 1.4.4.1 1995/10/06 11:28:58 davidg Exp $"; +static char rcsid[] = "$Id: options.c,v 1.4.4.2 1996/03/01 19:34:55 phk Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/pppd/patchlevel.h b/usr.sbin/pppd/patchlevel.h index ad290b08f5fe0..b839cd282aa14 100644 --- a/usr.sbin/pppd/patchlevel.h +++ b/usr.sbin/pppd/patchlevel.h @@ -1,4 +1,4 @@ -/* $Id: patchlevel.h,v 1.10 1994/06/09 01:51:10 paulus Exp $ */ +/* $Id: patchlevel.h,v 1.2 1994/09/25 02:32:09 wollman Exp $ */ #define PATCHLEVEL 2 #define VERSION "2.1" diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h index d8e91dcad6765..eda0b86eafc92 100644 --- a/usr.sbin/pppd/pathnames.h +++ b/usr.sbin/pppd/pathnames.h @@ -1,7 +1,7 @@ /* * define path names * - * $Id: pathnames.h,v 1.4 1994/05/18 06:34:46 paulus Exp $ + * $Id: pathnames.h,v 1.2 1994/09/25 02:32:10 wollman Exp $ */ #if defined(STREAMS) || defined(ultrix) diff --git a/usr.sbin/pppd/ppp.h b/usr.sbin/pppd/ppp.h index c8f96333769e4..631b867c03d9c 100644 --- a/usr.sbin/pppd/ppp.h +++ b/usr.sbin/pppd/ppp.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ppp.h,v 1.2 1994/09/25 02:32:11 wollman Exp $ + * $Id: ppp.h,v 1.2.6.1 1996/03/01 19:34:56 phk Exp $ */ #ifndef __PPP_H__ diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8 index e4a00d92536ae..e91e01c253026 100644 --- a/usr.sbin/pppd/pppd.8 +++ b/usr.sbin/pppd/pppd.8 @@ -1,5 +1,5 @@ .\" manual page [] for pppd 2.0 -.\" $Id: pppd.8,v 1.2 1994/09/25 02:32:12 wollman Exp $ +.\" $Id: pppd.8,v 1.2.6.1 1996/03/01 19:34:57 phk Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index e63a2e56be03c..9418af6c59d5a 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: pppd.h,v 1.3.4.1 1996/03/01 19:34:58 phk Exp $ + * $Id: pppd.h,v 1.3.4.2 1996/03/12 13:43:09 phk Exp $ */ /* diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index c63efb8d35a28..67309dc8c65b3 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-bsd.c,v 1.3.4.1 1995/10/06 11:28:59 davidg Exp $"; +static char rcsid[] = "$Id: sys-bsd.c,v 1.3.4.2 1996/03/01 19:34:59 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c index 346879564ee2e..c1c942dab6d69 100644 --- a/usr.sbin/pppd/upap.c +++ b/usr.sbin/pppd/upap.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: upap.c,v 1.3.4.1 1996/03/01 19:35:00 phk Exp $"; +static char rcsid[] = "$Id: upap.c,v 1.3.4.2 1996/03/12 13:43:10 phk Exp $"; #endif /* diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h index 03a4c0eae306c..faea4794b9940 100644 --- a/usr.sbin/pppd/upap.h +++ b/usr.sbin/pppd/upap.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: upap.h,v 1.2 1994/09/25 02:32:18 wollman Exp $ + * $Id: upap.h,v 1.2.6.1 1996/03/01 19:35:00 phk Exp $ */ /* diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile index f766f340ab065..e8109e5cba30e 100644 --- a/usr.sbin/pppstats/Makefile +++ b/usr.sbin/pppstats/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/11/12 06:07:15 lars Exp $ +# $Id: Makefile,v 1.2 1994/11/14 08:02:40 bde Exp $ PROG= pppstats MAN8= pppstats.8 diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c index cfde7b8ecd885..e1e12a0898ff5 100644 --- a/usr.sbin/pppstats/pppstats.c +++ b/usr.sbin/pppstats/pppstats.c @@ -26,7 +26,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: pppstats.c,v 1.4 1995/05/30 03:51:18 rgrimes Exp $"; +static char rcsid[] = "$Id: pppstats.c,v 1.4.4.1 1995/08/26 12:14:12 davidg Exp $"; #endif #include <ctype.h> diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index 899dcef29ba48..e75c0e797fdbe 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)pstat.8 8.4 (Berkeley) 4/19/94 -.\" $Id: pstat.8,v 1.3.4.2 1995/10/09 08:51:32 davidg Exp $ +.\" $Id: pstat.8,v 1.3.4.3 1996/04/17 20:52:49 joerg Exp $ .\" .Dd October 7, 1995 .Dt PSTAT 8 diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index 273a4b1302cce..64dd4ce469416 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1995/11/03 15:06:01 peter Exp $ +# $Id: Makefile,v 1.2 1995/11/03 15:20:59 peter Exp $ PROG= quot MAN8= quot.8 diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 9ad482243db30..3d1a89c310552 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: quot.8,v 1.2 1995/11/03 15:21:02 peter Exp $ +.\" $Id: quot.8,v 1.3 1996/01/30 13:50:19 mpp Exp $ .\" .Dd February 8, 1994 .Dt QUOT 8 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index db2ece7232496..4f172d84fe622 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -30,7 +30,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: quot.c,v 1.2 1995/11/03 15:21:04 peter Exp $"; +static char rcsid[] = "$Id: quot.c,v 1.3 1995/11/03 17:04:02 peter Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile index c8fd9ceca801e..01f10ff2fca23 100644 --- a/usr.sbin/rarpd/Makefile +++ b/usr.sbin/rarpd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.2 1995/03/03 22:20:12 wpaul Exp $ +# $Id: Makefile,v 1.3 1995/04/02 01:35:53 wpaul Exp $ PROG= rarpd MAN8= rarpd.8 diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8 index 44ca6043ab9cc..fedb1ab4e6b49 100644 --- a/usr.sbin/rarpd/rarpd.8 +++ b/usr.sbin/rarpd/rarpd.8 @@ -1,4 +1,4 @@ -.\" @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/rarpd/rarpd.8,v 1.2.4.1 1996/01/30 14:01:05 mpp Exp $ (LBL) +.\" @(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.8,v 1.2.4.2 1996/06/05 02:57:53 jkh Exp $ (LBL) .\" .\" Copyright (c) 1988-1990 The Regents of the University of California. .\" All rights reserved. diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index ccff2c9068465..8d448141e672d 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -26,7 +26,7 @@ char copyright[] = #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/rarpd/rarpd.c,v 1.4.4.1 1995/08/05 08:04:30 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.4.4.2 1996/06/05 02:57:54 jkh Exp $ (LBL)"; #endif diff --git a/usr.sbin/rndcontrol/random.4 b/usr.sbin/rndcontrol/random.4 index 1f823fa8a00f9..7079d9d83a7bf 100644 --- a/usr.sbin/rndcontrol/random.4 +++ b/usr.sbin/rndcontrol/random.4 @@ -36,7 +36,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id$ +.\" $Id: random.4,v 1.1.1.1 1995/10/28 17:04:25 markm Exp $ .\" .Dd October 21, 1995 .Dt RANDOM 4 i386 diff --git a/usr.sbin/rndcontrol/rndcontrol.8 b/usr.sbin/rndcontrol/rndcontrol.8 index fb02a6c85b07a..df73f0ed7cb21 100644 --- a/usr.sbin/rndcontrol/rndcontrol.8 +++ b/usr.sbin/rndcontrol/rndcontrol.8 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rndcontrol.8,v 1.2 1995/12/27 11:40:45 markm Exp $ +.\" $Id: rndcontrol.8,v 1.2.2.1 1996/06/26 17:08:02 markm Exp $ .\" .Dd October 20, 1995 .Dt RNDCONTROL 8 diff --git a/usr.sbin/rndcontrol/rndcontrol.c b/usr.sbin/rndcontrol/rndcontrol.c index f6312b055fcbc..08f720ea7cb47 100644 --- a/usr.sbin/rndcontrol/rndcontrol.c +++ b/usr.sbin/rndcontrol/rndcontrol.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rndcontrol.c,v 1.3 1995/12/27 11:40:47 markm Exp $ + * $Id: rndcontrol.c,v 1.4 1996/06/25 18:56:19 markm Exp $ * */ diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile index a79db7cc47d97..9b780d9b9c202 100644 --- a/usr.sbin/rtprio/Makefile +++ b/usr.sbin/rtprio/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.5 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.3 1995/08/06 00:58:52 bde Exp $ +# $Id: Makefile,v 1.2.6.1 1995/09/18 03:21:17 davidg Exp $ BINDIR=/usr/sbin PROG= rtprio diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1 index 6085fde08486c..37ac097a5c3b4 100644 --- a/usr.sbin/rtprio/rtprio.1 +++ b/usr.sbin/rtprio/rtprio.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rtprio.1,v 1.3.6.1 1996/01/30 14:01:15 mpp Exp $ +.\" $Id: rtprio.1,v 1.3.6.2 1996/06/27 05:33:24 gpalmer Exp $ .\" .Dd July 23, 1994 .Dt RTPRIO 1 diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c index ab4d08513fb83..28e86259cb8df 100644 --- a/usr.sbin/rtprio/rtprio.c +++ b/usr.sbin/rtprio/rtprio.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: rtprio.c,v 1.2 1994/10/02 04:48:21 davidg Exp $ */ #include <sys/param.h> diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile index 76670e5ad93af..cb9a16395b920 100644 --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1994/09/26 21:22:55 davidg Exp $ +# $Id: Makefile,v 1.2 1994/09/26 21:41:05 davidg Exp $ PROG= sa MAN8= sa.8 diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h index 6d5291458d9df..d27c6ab64b9f0 100644 --- a/usr.sbin/sa/extern.h +++ b/usr.sbin/sa/extern.h @@ -27,7 +27,7 @@ * (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: extern.h,v 1.1 1994/03/24 18:41:50 cgd Exp $ + * $Id: extern.h,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $ */ #include <sys/types.h> diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index 2f1e95a207656..70883a125f25e 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -33,7 +33,7 @@ static char copright[] = "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\ All rights reserved.\n"; -static char rcsid[] = "$Id: main.c,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $"; +static char rcsid[] = "$Id: main.c,v 1.2 1995/05/30 03:51:39 rgrimes Exp $"; #endif /* diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h index 31721c25fcd2d..9124399ce56e4 100644 --- a/usr.sbin/sa/pathnames.h +++ b/usr.sbin/sa/pathnames.h @@ -27,7 +27,7 @@ * (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: pathnames.h,v 1.1 1994/03/24 18:41:53 cgd Exp $ + * $Id: pathnames.h,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $ */ #define _PATH_ACCT "/var/account/acct" diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c index 1ccbe90ef43a1..466a1fd0e78a0 100644 --- a/usr.sbin/sa/pdb.c +++ b/usr.sbin/sa/pdb.c @@ -29,7 +29,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: pdb.c,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $"; +static char rcsid[] = "$Id: pdb.c,v 1.2 1995/05/30 03:51:41 rgrimes Exp $"; #endif #include <sys/types.h> diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8 index 09a15fd97df72..7883955e4e730 100644 --- a/usr.sbin/sa/sa.8 +++ b/usr.sbin/sa/sa.8 @@ -27,7 +27,7 @@ .\" (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: sa.8,v 1.1.1.1 1994/09/26 21:22:56 davidg Exp $ +.\" $Id: sa.8,v 1.2 1994/09/26 21:41:06 davidg Exp $ .\" .Dd February 25, 1994 .Dt SA 8 diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c index 4d383b76e1930..978ae1ebfdbf6 100644 --- a/usr.sbin/sa/usrdb.c +++ b/usr.sbin/sa/usrdb.c @@ -29,7 +29,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: usrdb.c,v 1.1.1.1 1994/09/26 21:22:57 davidg Exp $"; +static char rcsid[] = "$Id: usrdb.c,v 1.2 1995/05/30 03:51:42 rgrimes Exp $"; #endif #include <sys/types.h> diff --git a/usr.sbin/sendmail/cf/README b/usr.sbin/sendmail/cf/README index 66c5917f83732..deeeab50f3cbf 100644 --- a/usr.sbin/sendmail/cf/README +++ b/usr.sbin/sendmail/cf/README @@ -1278,7 +1278,7 @@ Sam Leffler's FlexFAX software is still in beta test -- but he expects a public version out "later this week" [as of 3/1/93]. The following blurb is direct from Sam: - $Header: /home/ncvs/src/usr.sbin/sendmail/cf/README,v 1.1.1.6 1997/01/27 07:36:30 peter Exp $ + $Header: /home/ncvs/src/usr.sbin/sendmail/cf/README,v 1.1.1.1.6.4 1997/02/05 07:49:13 peter Exp $ How To Obtain This Software (in case all you get is this file) -------------------------------------------------------------- diff --git a/usr.sbin/sendmail/cf/cf/freebsd.mc b/usr.sbin/sendmail/cf/cf/freebsd.mc index b608878a8f0ee..09dd806110f9a 100644 --- a/usr.sbin/sendmail/cf/cf/freebsd.mc +++ b/usr.sbin/sendmail/cf/cf/freebsd.mc @@ -42,7 +42,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)freebsd.mc $Revision: 1.3 $') +VERSIONID(`@(#)freebsd.mc $Revision: 1.1.2.1 $') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/usr.sbin/sendmail/cf/cf/freefall.mc b/usr.sbin/sendmail/cf/cf/freefall.mc index 7234bfdde8151..abc204dfebc1d 100644 --- a/usr.sbin/sendmail/cf/cf/freefall.mc +++ b/usr.sbin/sendmail/cf/cf/freefall.mc @@ -34,7 +34,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)freefall.mc $Revision: 1.1.6.3 $') +VERSIONID(`@(#)freefall.mc $Revision: 1.1.6.4 $') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/usr.sbin/sendmail/contrib/expn.pl b/usr.sbin/sendmail/contrib/expn.pl index 243729853866a..bc7859cf38617 100755 --- a/usr.sbin/sendmail/contrib/expn.pl +++ b/usr.sbin/sendmail/contrib/expn.pl @@ -13,7 +13,7 @@ $sockaddr = 'S n a4 x8'; # system requirements: # must have 'nslookup' and 'hostname' programs. -# $Header: /home/ncvs/src/usr.sbin/sendmail/contrib/expn.pl,v 1.1.1.2 1995/12/02 17:30:09 peter Exp $ +# $Header: /home/ncvs/src/usr.sbin/sendmail/contrib/expn.pl,v 1.1.1.1.6.4 1997/02/05 07:49:37 peter Exp $ # TODO: # less magic should apply to command-line addresses diff --git a/usr.sbin/sgsc/Makefile b/usr.sbin/sgsc/Makefile index a25675dfb88a2..5152824d42296 100644 --- a/usr.sbin/sgsc/Makefile +++ b/usr.sbin/sgsc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1995/01/07 14:17:22 jkh Exp $ PROG= sgsc diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8 index bf03d10c27a7e..8b6902455287f 100644 --- a/usr.sbin/sicontrol/sicontrol.8 +++ b/usr.sbin/sicontrol/sicontrol.8 @@ -1,4 +1,4 @@ -.\" $Id: sicontrol.8,v 1.2 1995/09/26 18:18:49 peter Exp $ +.\" $Id: sicontrol.8,v 1.2.2.1 1996/01/30 14:03:02 mpp Exp $ .\" The following requests are required for all man pages. .Dd September 26,1995 .Dt SICONTROL 8 diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c index 1db88459d7560..bcb979abf3f1e 100644 --- a/usr.sbin/sicontrol/sicontrol.c +++ b/usr.sbin/sicontrol/sicontrol.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: sicontrol.c,v 1.4 1995/10/01 03:13:33 peter Exp $ + * $Id: sicontrol.c,v 1.3.2.1 1995/10/06 11:37:45 davidg Exp $ */ #include <stdio.h> diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile index 406d370617e75..0e693a8d6f7e9 100644 --- a/usr.sbin/slstat/Makefile +++ b/usr.sbin/slstat/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.6 (Berkeley) 4/23/91 -# $Id: Makefile,v 1.1.1.1 1994/06/17 06:42:36 rich Exp $ +# $Id: Makefile,v 1.2 1994/10/17 06:05:31 davidg Exp $ PROG= slstat MAN8= slstat.8 diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c index 409c123eec52f..33414fdd73e03 100644 --- a/usr.sbin/slstat/slstat.c +++ b/usr.sbin/slstat/slstat.c @@ -22,7 +22,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: slstat.c,v 1.4 1995/05/30 03:52:30 rgrimes Exp $"; +static char rcsid[] = "$Id: slstat.c,v 1.4.4.2 1996/06/05 02:58:05 jkh Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/stallion/Makefile b/usr.sbin/stallion/Makefile index 44c3b639d6762..b77c7eac9b729 100644 --- a/usr.sbin/stallion/Makefile +++ b/usr.sbin/stallion/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/05/04 08:02:00 peter Exp $ SUBDIR= bootcode stlload stlstats diff --git a/usr.sbin/stallion/Makefile.inc b/usr.sbin/stallion/Makefile.inc index 53b9b3e6a00bb..645a9772db419 100644 --- a/usr.sbin/stallion/Makefile.inc +++ b/usr.sbin/stallion/Makefile.inc @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1996/05/04 08:02:01 peter Exp $ BOOTDIR= /usr/libdata/stallion diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile index 35f3c8fdc1a7e..2ffe8005c5c19 100644 --- a/usr.sbin/stallion/bootcode/Makefile +++ b/usr.sbin/stallion/bootcode/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1996/05/04 08:02:10 peter Exp $ +# $Id: Makefile,v 1.2 1996/05/05 07:40:46 peter Exp $ FILES = 2681.sys cdk.sys diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile index 99142f234a49b..42e15a15d1bcb 100644 --- a/usr.sbin/stallion/stlload/Makefile +++ b/usr.sbin/stallion/stlload/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/05/04 08:02:21 peter Exp $ PROG= stlload NOMAN= #oops diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c index 7f62779612967..c2876d81cec72 100644 --- a/usr.sbin/stallion/stlload/stlload.c +++ b/usr.sbin/stallion/stlload/stlload.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: stlload.c,v 1.2 1996/05/04 08:02:23 peter Exp $ */ /*****************************************************************************/ diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile index 347b4e99f3116..3c200e52325e2 100644 --- a/usr.sbin/stallion/stlstats/Makefile +++ b/usr.sbin/stallion/stlstats/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/05/04 08:02:28 peter Exp $ PROG= stlstats NOMAN= #oops diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c index e6e304f97f26f..0a767bf61bb57 100644 --- a/usr.sbin/stallion/stlstats/stlstats.c +++ b/usr.sbin/stallion/stlstats/stlstats.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: stlstats.c,v 1.2 1996/05/04 08:02:31 peter Exp $ */ /*****************************************************************************/ diff --git a/usr.sbin/sup/Makefile b/usr.sbin/sup/Makefile index e8c32f5339872..a353cf69ac59f 100644 --- a/usr.sbin/sup/Makefile +++ b/usr.sbin/sup/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.3 1995/12/26 05:15:12 peter Exp $ SUBDIR= lib sup supscan supfilesrv diff --git a/usr.sbin/sup/Makefile.inc b/usr.sbin/sup/Makefile.inc index 2ecf884239342..aaf8a1ffb6a72 100644 --- a/usr.sbin/sup/Makefile.inc +++ b/usr.sbin/sup/Makefile.inc @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1995/12/26 05:15:12 peter Exp $ .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile index f6b7326f64843..90eeb474568f7 100644 --- a/usr.sbin/sup/lib/Makefile +++ b/usr.sbin/sup/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/26 22:32:21 peter Exp $ +# $Id: Makefile,v 1.3 1996/01/04 16:10:36 peter Exp $ LIB= sup SRCS= scm.c scmio.c stree.c log.c supmsg.c netcrypt.c atoo.c errmsg.c \ diff --git a/usr.sbin/sup/lib/libc.h b/usr.sbin/sup/lib/libc.h index 0e59542a4e680..03ec69d28d6cb 100644 --- a/usr.sbin/sup/lib/libc.h +++ b/usr.sbin/sup/lib/libc.h @@ -26,6 +26,9 @@ ********************************************************************** * HISTORY * $Log: libc.h,v $ + * Revision 1.3 1995/12/26 22:32:22 peter + * get rid of non-applicable files... + * * Revision 1.2 1995/12/26 05:02:45 peter * Apply ports/net/sup/patches/patch-aa... * diff --git a/usr.sbin/sup/lib/log.c b/usr.sbin/sup/lib/log.c index 2974b4aab1311..280ad91bb12b8 100644 --- a/usr.sbin/sup/lib/log.c +++ b/usr.sbin/sup/lib/log.c @@ -27,6 +27,9 @@ ********************************************************************** * HISTORY * $Log: log.c,v $ + * Revision 1.2 1995/12/26 05:02:46 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/netcryptvoid.c b/usr.sbin/sup/lib/netcryptvoid.c index 9dd3c78724866..c56ac721e10cc 100644 --- a/usr.sbin/sup/lib/netcryptvoid.c +++ b/usr.sbin/sup/lib/netcryptvoid.c @@ -25,6 +25,11 @@ /********************************************************************** * HISTORY * $Log: netcryptvoid.c,v $ + * Revision 1.1.1.1 1995/12/26 04:54:47 peter + * Import the unmodified version of the sup that we are using. + * The heritage of this version is not clear. It appears to be NetBSD + * derived from some time ago. + * * Revision 1.1.1.1 1993/08/21 00:46:33 jkh * Current sup with compression support. * diff --git a/usr.sbin/sup/lib/quit.c b/usr.sbin/sup/lib/quit.c index 23b4cb7a5e760..d403a636a6ea8 100644 --- a/usr.sbin/sup/lib/quit.c +++ b/usr.sbin/sup/lib/quit.c @@ -36,6 +36,11 @@ ********************************************************************** * HISTORY * $Log: quit.c,v $ + * Revision 1.1.1.1 1995/12/26 04:54:47 peter + * Import the unmodified version of the sup that we are using. + * The heritage of this version is not clear. It appears to be NetBSD + * derived from some time ago. + * * Revision 1.1.1.1 1993/08/21 00:46:33 jkh * Current sup with compression support. * diff --git a/usr.sbin/sup/lib/run.c b/usr.sbin/sup/lib/run.c index 0e9a581beeb57..2e53c94243875 100644 --- a/usr.sbin/sup/lib/run.c +++ b/usr.sbin/sup/lib/run.c @@ -47,6 +47,9 @@ ********************************************************************** * HISTORY * $Log: run.c,v $ + * Revision 1.2 1995/12/26 05:02:47 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/scan.c b/usr.sbin/sup/lib/scan.c index edb42ea6c465a..d4740539cebb4 100644 --- a/usr.sbin/sup/lib/scan.c +++ b/usr.sbin/sup/lib/scan.c @@ -28,6 +28,9 @@ ********************************************************************** * HISTORY * $Log: scan.c,v $ + * Revision 1.3 1995/12/26 05:10:59 peter + * Apply ports/net/sup/patches/patch-ab + * * Revision 1.2 1995/12/26 05:02:48 peter * Apply ports/net/sup/patches/patch-aa... * diff --git a/usr.sbin/sup/lib/scm.c b/usr.sbin/sup/lib/scm.c index 9b793e2912e52..5918cc558e654 100644 --- a/usr.sbin/sup/lib/scm.c +++ b/usr.sbin/sup/lib/scm.c @@ -69,6 +69,9 @@ * since Tahoe version of <netinet/in.h> does not define them. * * $Log: scm.c,v $ + * Revision 1.2 1995/12/26 05:02:49 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/scmio.c b/usr.sbin/sup/lib/scmio.c index 713ceefabcb25..85f6efa834ce9 100644 --- a/usr.sbin/sup/lib/scmio.c +++ b/usr.sbin/sup/lib/scmio.c @@ -109,6 +109,9 @@ ********************************************************************** * HISTORY * $Log: scmio.c,v $ + * Revision 1.2 1995/12/26 05:02:50 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/stree.c b/usr.sbin/sup/lib/stree.c index 5b094308ae5be..c64ea14a87881 100644 --- a/usr.sbin/sup/lib/stree.c +++ b/usr.sbin/sup/lib/stree.c @@ -28,6 +28,9 @@ ********************************************************************** * HISTORY * $Log: stree.c,v $ + * Revision 1.2 1995/12/26 05:02:51 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/sup.h b/usr.sbin/sup/lib/sup.h index 12f03c3da9013..972d3226b28fe 100644 --- a/usr.sbin/sup/lib/sup.h +++ b/usr.sbin/sup/lib/sup.h @@ -39,6 +39,9 @@ * across the network to save BandWidth * * $Log: sup.h,v $ + * Revision 1.2 1995/12/26 05:02:52 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/supmsg.c b/usr.sbin/sup/lib/supmsg.c index b12c945462f57..1877689ea79d6 100644 --- a/usr.sbin/sup/lib/supmsg.c +++ b/usr.sbin/sup/lib/supmsg.c @@ -31,6 +31,9 @@ * across the network to save BandWidth * * $Log: supmsg.c,v $ + * Revision 1.2 1995/12/26 05:02:53 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/lib/supmsg.h b/usr.sbin/sup/lib/supmsg.h index e6185c486ba01..986c9755c2b73 100644 --- a/usr.sbin/sup/lib/supmsg.h +++ b/usr.sbin/sup/lib/supmsg.h @@ -33,6 +33,9 @@ * across the network to save BandWidth * * $Log: supmsg.h,v $ + * Revision 1.2 1995/12/26 05:02:54 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/sup/Makefile b/usr.sbin/sup/sup/Makefile index 5b53b91b41fce..d62caf86360e6 100644 --- a/usr.sbin/sup/sup/Makefile +++ b/usr.sbin/sup/sup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/26 22:33:03 peter Exp $ +# $Id: Makefile,v 1.3 1995/12/26 22:39:27 peter Exp $ PROG= sup SRCS= supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c diff --git a/usr.sbin/sup/sup/sup.1 b/usr.sbin/sup/sup/sup.1 index b464a7cd24871..c3ab6a7ec058e 100644 --- a/usr.sbin/sup/sup/sup.1 +++ b/usr.sbin/sup/sup/sup.1 @@ -23,6 +23,15 @@ .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .\" HISTORY .\" $Log: sup.1,v $ +.\" Revision 1.4 1996/01/04 16:10:42 peter +.\" Restore the changes I made after my last brain hiccup... +.\" +.\" Document /var/log/sup.rename instead of the old name +.\" Couple of lib build cleanups (like, not installing the library, and clean +.\" all files) +.\" +.\" It should be safe now.. :-) +.\" .\" Revision 1.3 1995/12/26 05:11:04 peter .\" Apply ports/net/sup/patches/patch-ab .\" diff --git a/usr.sbin/sup/sup/supcdefs.h b/usr.sbin/sup/sup/supcdefs.h index dface51f6d138..a9a3cacdc4691 100644 --- a/usr.sbin/sup/sup/supcdefs.h +++ b/usr.sbin/sup/sup/supcdefs.h @@ -33,6 +33,9 @@ * across the network to save BandWidth * * $Log: supcdefs.h,v $ + * Revision 1.2 1995/12/26 05:03:03 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:46 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/sup/supcmain.c b/usr.sbin/sup/sup/supcmain.c index 47fb9b5478a63..f75682c0fabb4 100644 --- a/usr.sbin/sup/sup/supcmain.c +++ b/usr.sbin/sup/sup/supcmain.c @@ -174,6 +174,9 @@ * across the network to save BandWidth * * $Log: supcmain.c,v $ + * Revision 1.2 1995/12/26 05:03:04 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:46 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/sup/supcmeat.c b/usr.sbin/sup/sup/supcmeat.c index 2b2db06ebe7d1..05bc03a98f009 100644 --- a/usr.sbin/sup/sup/supcmeat.c +++ b/usr.sbin/sup/sup/supcmeat.c @@ -32,6 +32,9 @@ * across the network to save BandWidth * * $Log: supcmeat.c,v $ + * Revision 1.2 1995/12/26 05:03:05 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:46 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/sup/supcmisc.c b/usr.sbin/sup/sup/supcmisc.c index 48943495a8240..43190d1f9a78f 100644 --- a/usr.sbin/sup/sup/supcmisc.c +++ b/usr.sbin/sup/sup/supcmisc.c @@ -27,6 +27,11 @@ ********************************************************************** * HISTORY * $Log: supcmisc.c,v $ + * Revision 1.1.1.1 1995/12/26 04:54:46 peter + * Import the unmodified version of the sup that we are using. + * The heritage of this version is not clear. It appears to be NetBSD + * derived from some time ago. + * * Revision 1.2 1994/06/20 06:04:11 rgrimes * Humm.. they did a lot of #if __STDC__ but failed to properly prototype * the code. Also fixed one bad argument to a wait3 call. diff --git a/usr.sbin/sup/sup/supcname.c b/usr.sbin/sup/sup/supcname.c index 6e645bad17f46..aebcd88844d8a 100644 --- a/usr.sbin/sup/sup/supcname.c +++ b/usr.sbin/sup/sup/supcname.c @@ -27,6 +27,11 @@ ********************************************************************** * HISTORY * $Log: supcname.c,v $ + * Revision 1.1.1.1 1995/12/26 04:54:46 peter + * Import the unmodified version of the sup that we are using. + * The heritage of this version is not clear. It appears to be NetBSD + * derived from some time ago. + * * Revision 1.1.1.1 1993/08/21 00:46:34 jkh * Current sup with compression support. * diff --git a/usr.sbin/sup/sup/supcparse.c b/usr.sbin/sup/sup/supcparse.c index 82aefd9038a88..5308fba853b78 100644 --- a/usr.sbin/sup/sup/supcparse.c +++ b/usr.sbin/sup/sup/supcparse.c @@ -32,6 +32,9 @@ * across the network to save BandWidth * * $Log: supcparse.c,v $ + * Revision 1.2 1995/12/26 05:03:06 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:46 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/sup/supcvers.c b/usr.sbin/sup/sup/supcvers.c index 5e47f4a092ee4..7415e02ea4fd9 100644 --- a/usr.sbin/sup/sup/supcvers.c +++ b/usr.sbin/sup/sup/supcvers.c @@ -26,6 +26,11 @@ ********************************************************************** * HISTORY * $Log: supcvers.c,v $ + * Revision 1.1.1.1 1995/12/26 04:54:46 peter + * Import the unmodified version of the sup that we are using. + * The heritage of this version is not clear. It appears to be NetBSD + * derived from some time ago. + * * Revision 1.1.1.1 1993/08/21 00:46:34 jkh * Current sup with compression support. * diff --git a/usr.sbin/sup/supfilesrv/Makefile b/usr.sbin/sup/supfilesrv/Makefile index 9a4a65feb2e0f..e40bc07d40a3f 100644 --- a/usr.sbin/sup/supfilesrv/Makefile +++ b/usr.sbin/sup/supfilesrv/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/12/26 05:15:19 peter Exp $ PROG= supfilesrv SRCS= supfilesrv.c diff --git a/usr.sbin/sup/supfilesrv/supfilesrv.c b/usr.sbin/sup/supfilesrv/supfilesrv.c index dab33eb1a3c0a..73f6a0ac6974c 100644 --- a/usr.sbin/sup/supfilesrv/supfilesrv.c +++ b/usr.sbin/sup/supfilesrv/supfilesrv.c @@ -42,6 +42,13 @@ * across the network to save BandWidth * * $Log: supfilesrv.c,v $ + * Revision 1.3.2.2 1996/07/09 23:07:53 peter + * Back out the temp disable of setproctitle, it's been in -stable for a while. + * Shorten the line passed to setproctitle, as in rev 1.4 + * + * OK'ed by: jkh + * Reviewed by: freefall :-) + * * Revision 1.3.2.1 1996/02/11 07:17:00 jkh * Disable use of setproctitle() in 2.1 until it arrives. * Thanks to Rod Grimes for helping me get my cvs mess straightened out! diff --git a/usr.sbin/sup/supfilesrv/supservers.8 b/usr.sbin/sup/supfilesrv/supservers.8 index c0f848854a94f..5a4f0b6314b8e 100644 --- a/usr.sbin/sup/supfilesrv/supservers.8 +++ b/usr.sbin/sup/supfilesrv/supservers.8 @@ -23,6 +23,9 @@ .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .\" HISTORY .\" $Log: supservers.8,v $ +.\" Revision 1.2 1995/12/26 05:11:05 peter +.\" Apply ports/net/sup/patches/patch-ab +.\" .\" Revision 1.1.1.1 1995/12/26 04:54:48 peter .\" Import the unmodified version of the sup that we are using. .\" The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile index 7268d71988afb..587622c6d6e2b 100644 --- a/usr.sbin/sup/supscan/Makefile +++ b/usr.sbin/sup/supscan/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/12/26 05:15:20 peter Exp $ PROG= supscan SRCS= supscan.c diff --git a/usr.sbin/sup/supscan/supscan.c b/usr.sbin/sup/supscan/supscan.c index fb7a0b969d3ba..2a3121720e9f2 100644 --- a/usr.sbin/sup/supscan/supscan.c +++ b/usr.sbin/sup/supscan/supscan.c @@ -41,6 +41,9 @@ ********************************************************************** * HISTORY * $Log: supscan.c,v $ + * Revision 1.2 1995/12/26 05:11:06 peter + * Apply ports/net/sup/patches/patch-ab + * * Revision 1.1.1.1 1995/12/26 04:54:48 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD diff --git a/usr.sbin/sysctl/sysctl.8 b/usr.sbin/sysctl/sysctl.8 index 69c17d41ae26e..844e5b6d4b485 100644 --- a/usr.sbin/sysctl/sysctl.8 +++ b/usr.sbin/sysctl/sysctl.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $Id: sysctl.8,v 1.6 1995/02/20 19:42:42 guido Exp $ +.\" $Id: sysctl.8,v 1.6.4.1 1996/01/30 14:03:31 mpp Exp $ .\" .Dd September 23, 1994 .Dt SYSCTL 8 diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c index 25f404aafc127..a21641ff6e390 100644 --- a/usr.sbin/sysctl/sysctl.c +++ b/usr.sbin/sysctl/sysctl.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)sysctl.c 8.1 (Berkeley) 6/6/93"; */ static const char rcsid[] = - "$Id: sysctl.c,v 1.6.2.1 1995/06/02 10:50:54 davidg Exp $"; + "$Id: sysctl.c,v 1.7 1995/06/11 19:32:58 rgrimes Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 0072f89943903..fe0f6124c86b5 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 1995/08/29 19:48:10 wollman Exp $ +# $Id: Makefile,v 1.9.4.1 1995/10/06 11:53:41 davidg Exp $ PROG= tcpdump CFLAGS+=-DCSLIP -DPPP -DFDDI diff --git a/usr.sbin/tcpdump/tcpdump/addrtoname.c b/usr.sbin/tcpdump/tcpdump/addrtoname.c index bdfd0b0677538..52c27c239b2f2 100644 --- a/usr.sbin/tcpdump/tcpdump/addrtoname.c +++ b/usr.sbin/tcpdump/tcpdump/addrtoname.c @@ -23,7 +23,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/addrtoname.c,v 1.2 1995/03/08 12:52:07 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/addrtoname.c,v 1.2.4.1 1996/06/05 02:58:08 jkh Exp $ (LBL)"; #endif #include <sys/types.h> diff --git a/usr.sbin/tcpdump/tcpdump/addrtoname.h b/usr.sbin/tcpdump/tcpdump/addrtoname.h index e2fca54a6ccc6..33a3f175bc881 100644 --- a/usr.sbin/tcpdump/tcpdump/addrtoname.h +++ b/usr.sbin/tcpdump/tcpdump/addrtoname.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/addrtoname.h,v 1.2 1995/03/08 12:52:08 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/addrtoname.h,v 1.2.4.1 1996/06/05 02:58:08 jkh Exp $ (LBL) */ /* Name to address translation routines. */ diff --git a/usr.sbin/tcpdump/tcpdump/appletalk.h b/usr.sbin/tcpdump/tcpdump/appletalk.h index 291049543d3d1..a3434b20837e7 100644 --- a/usr.sbin/tcpdump/tcpdump/appletalk.h +++ b/usr.sbin/tcpdump/tcpdump/appletalk.h @@ -20,7 +20,7 @@ * * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX). * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/appletalk.h,v 1.2 1995/03/08 12:52:09 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/appletalk.h,v 1.2.4.1 1996/06/05 02:58:09 jkh Exp $ (LBL) */ struct LAP { diff --git a/usr.sbin/tcpdump/tcpdump/bootp.h b/usr.sbin/tcpdump/tcpdump/bootp.h index 7e33c4f6ef68a..4947c680f2c01 100644 --- a/usr.sbin/tcpdump/tcpdump/bootp.h +++ b/usr.sbin/tcpdump/tcpdump/bootp.h @@ -1,4 +1,4 @@ -/* @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/bootp.h,v 1.2 1995/03/08 12:52:09 olah Exp $ (LBL) */ +/* @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/bootp.h,v 1.2.4.1 1996/06/05 02:58:10 jkh Exp $ (LBL) */ /* * Bootstrap Protocol (BOOTP). RFC951 and RFC1048. * diff --git a/usr.sbin/tcpdump/tcpdump/bpf_dump.c b/usr.sbin/tcpdump/tcpdump/bpf_dump.c index b281a54d0ce1d..69c0210973a8a 100644 --- a/usr.sbin/tcpdump/tcpdump/bpf_dump.c +++ b/usr.sbin/tcpdump/tcpdump/bpf_dump.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/bpf_dump.c,v 1.2 1995/03/08 12:52:10 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/bpf_dump.c,v 1.2.4.1 1996/06/05 02:58:11 jkh Exp $ (LBL)"; #endif #include <sys/types.h> diff --git a/usr.sbin/tcpdump/tcpdump/decnet.h b/usr.sbin/tcpdump/tcpdump/decnet.h index 8c952c778adf5..931e33852317d 100644 --- a/usr.sbin/tcpdump/tcpdump/decnet.h +++ b/usr.sbin/tcpdump/tcpdump/decnet.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/decnet.h,v 1.1 1995/03/08 12:52:11 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/decnet.h,v 1.1.4.1 1996/06/05 02:58:11 jkh Exp $ (LBL) */ typedef unsigned char byte[1]; /* single byte field */ diff --git a/usr.sbin/tcpdump/tcpdump/ethertype.h b/usr.sbin/tcpdump/tcpdump/ethertype.h index daeac60b52292..eb9e04a7c2b1f 100644 --- a/usr.sbin/tcpdump/tcpdump/ethertype.h +++ b/usr.sbin/tcpdump/tcpdump/ethertype.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/ethertype.h,v 1.1 1995/03/08 12:52:12 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/ethertype.h,v 1.1.4.1 1996/06/05 02:58:13 jkh Exp $ (LBL) */ /* Map between Ethernet protocol types and names */ diff --git a/usr.sbin/tcpdump/tcpdump/extract.h b/usr.sbin/tcpdump/tcpdump/extract.h index 01353879993a0..64e750c3b844d 100644 --- a/usr.sbin/tcpdump/tcpdump/extract.h +++ b/usr.sbin/tcpdump/tcpdump/extract.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/extract.h,v 1.2 1995/03/08 12:52:13 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/extract.h,v 1.2.4.1 1996/06/05 02:58:13 jkh Exp $ (LBL) */ #ifdef TCPDUMP_ALIGN diff --git a/usr.sbin/tcpdump/tcpdump/fddi.h b/usr.sbin/tcpdump/tcpdump/fddi.h index 81fcda1feee23..b88577d74da93 100644 --- a/usr.sbin/tcpdump/tcpdump/fddi.h +++ b/usr.sbin/tcpdump/tcpdump/fddi.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/fddi.h,v 1.1 1995/03/08 12:52:14 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/fddi.h,v 1.1.4.1 1996/06/05 02:58:14 jkh Exp $ (LBL) */ /* diff --git a/usr.sbin/tcpdump/tcpdump/interface.h b/usr.sbin/tcpdump/tcpdump/interface.h index bf65f82a6dca0..f14d75042179d 100644 --- a/usr.sbin/tcpdump/tcpdump/interface.h +++ b/usr.sbin/tcpdump/tcpdump/interface.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/interface.h,v 1.3 1995/03/08 12:52:14 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/interface.h,v 1.3.4.1 1996/06/05 02:58:15 jkh Exp $ (LBL) */ #ifdef __GNUC__ diff --git a/usr.sbin/tcpdump/tcpdump/ipx.h b/usr.sbin/tcpdump/tcpdump/ipx.h index 16b3a730362fc..6080667df7bbd 100644 --- a/usr.sbin/tcpdump/tcpdump/ipx.h +++ b/usr.sbin/tcpdump/tcpdump/ipx.h @@ -1,7 +1,7 @@ /* * IPX protocol formats * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/ipx.h,v 1.2 1995/05/30 03:52:37 rgrimes Exp $ + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/ipx.h,v 1.2.4.1 1996/06/05 02:58:16 jkh Exp $ */ /* well-known sockets */ diff --git a/usr.sbin/tcpdump/tcpdump/llc.h b/usr.sbin/tcpdump/tcpdump/llc.h index 39ec63526556b..3fc9854294136 100644 --- a/usr.sbin/tcpdump/tcpdump/llc.h +++ b/usr.sbin/tcpdump/tcpdump/llc.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/llc.h,v 1.1 1995/03/08 12:52:16 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/llc.h,v 1.1.4.1 1996/06/05 02:58:16 jkh Exp $ (LBL) */ /* diff --git a/usr.sbin/tcpdump/tcpdump/md.h b/usr.sbin/tcpdump/tcpdump/md.h index efad733474a48..4088b96d867df 100644 --- a/usr.sbin/tcpdump/tcpdump/md.h +++ b/usr.sbin/tcpdump/tcpdump/md.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/md.h,v 1.2 1995/03/08 12:52:17 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/md.h,v 1.2.4.1 1996/06/05 02:58:17 jkh Exp $ (LBL) */ #define TCPDUMP_ALIGN diff --git a/usr.sbin/tcpdump/tcpdump/nfsfh.h b/usr.sbin/tcpdump/tcpdump/nfsfh.h index 281da091c6cda..8db7d2d9058f3 100644 --- a/usr.sbin/tcpdump/tcpdump/nfsfh.h +++ b/usr.sbin/tcpdump/tcpdump/nfsfh.h @@ -1,5 +1,5 @@ /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/nfsfh.h,v 1.1 1995/03/08 12:52:19 olah Exp $ + * $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/nfsfh.h,v 1.1.4.1 1996/06/05 02:58:18 jkh Exp $ * * nfsfh.h - NFS file handle definitions (for portable use) * diff --git a/usr.sbin/tcpdump/tcpdump/ntp.h b/usr.sbin/tcpdump/tcpdump/ntp.h index 277b4927ca3d7..fab49046364a3 100644 --- a/usr.sbin/tcpdump/tcpdump/ntp.h +++ b/usr.sbin/tcpdump/tcpdump/ntp.h @@ -1,4 +1,4 @@ -/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/ntp.h,v 1.2 1995/03/08 12:52:20 olah Exp $ */ +/* $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/ntp.h,v 1.2.4.1 1996/06/05 02:58:18 jkh Exp $ */ /* * Based on ntp.h from the U of MD implementation diff --git a/usr.sbin/tcpdump/tcpdump/os.h b/usr.sbin/tcpdump/tcpdump/os.h index d59e48318a25d..fcaf1d67a9c78 100644 --- a/usr.sbin/tcpdump/tcpdump/os.h +++ b/usr.sbin/tcpdump/tcpdump/os.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/os.h,v 1.2 1995/03/08 12:52:21 olah Exp $ (LBL) + * @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/os.h,v 1.2.4.1 1996/06/05 02:58:19 jkh Exp $ (LBL) */ #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/parsenfsfh.c b/usr.sbin/tcpdump/tcpdump/parsenfsfh.c index 4cb3dd46ce051..28000f9527d19 100644 --- a/usr.sbin/tcpdump/tcpdump/parsenfsfh.c +++ b/usr.sbin/tcpdump/tcpdump/parsenfsfh.c @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/parsenfsfh.c,v 1.1 1995/03/08 12:52:23 olah Exp $"; +static char *RCSid = "$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/parsenfsfh.c,v 1.1.4.1 1996/06/05 02:58:20 jkh Exp $"; #endif /* diff --git a/usr.sbin/tcpdump/tcpdump/print-arp.c b/usr.sbin/tcpdump/tcpdump/print-arp.c index dff475412c170..14ca20bb262e6 100644 --- a/usr.sbin/tcpdump/tcpdump/print-arp.c +++ b/usr.sbin/tcpdump/tcpdump/print-arp.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-arp.c,v 1.2 1995/03/08 12:52:23 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-arp.c,v 1.2.4.1 1996/06/05 02:58:21 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-atalk.c b/usr.sbin/tcpdump/tcpdump/print-atalk.c index 437e27ed23ae4..353fefb8c2677 100644 --- a/usr.sbin/tcpdump/tcpdump/print-atalk.c +++ b/usr.sbin/tcpdump/tcpdump/print-atalk.c @@ -22,7 +22,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-atalk.c,v 1.2.4.1 1995/10/06 11:53:42 davidg Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-atalk.c,v 1.2.4.2 1996/06/05 02:58:21 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-bootp.c b/usr.sbin/tcpdump/tcpdump/print-bootp.c index 9550248606521..85d52508f4e49 100644 --- a/usr.sbin/tcpdump/tcpdump/print-bootp.c +++ b/usr.sbin/tcpdump/tcpdump/print-bootp.c @@ -22,7 +22,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-bootp.c,v 1.2 1995/03/08 12:52:27 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-bootp.c,v 1.2.4.1 1996/06/05 02:58:22 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-decnet.c b/usr.sbin/tcpdump/tcpdump/print-decnet.c index f37081d4ca958..7a3e275eb7964 100644 --- a/usr.sbin/tcpdump/tcpdump/print-decnet.c +++ b/usr.sbin/tcpdump/tcpdump/print-decnet.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-decnet.c,v 1.1 1995/03/08 12:52:28 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-decnet.c,v 1.1.4.1 1996/06/05 02:58:23 jkh Exp $ (LBL)"; #endif #include <sys/types.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-domain.c b/usr.sbin/tcpdump/tcpdump/print-domain.c index 45a93894a7efc..36e7baa6a0eba 100644 --- a/usr.sbin/tcpdump/tcpdump/print-domain.c +++ b/usr.sbin/tcpdump/tcpdump/print-domain.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-domain.c,v 1.2 1995/03/08 12:52:29 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-domain.c,v 1.2.4.1 1996/06/05 02:58:24 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-egp.c b/usr.sbin/tcpdump/tcpdump/print-egp.c index 89dc1fcb3643e..cd28096fe5598 100644 --- a/usr.sbin/tcpdump/tcpdump/print-egp.c +++ b/usr.sbin/tcpdump/tcpdump/print-egp.c @@ -20,7 +20,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-egp.c,v 1.2 1995/03/08 12:52:30 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-egp.c,v 1.2.4.1 1996/06/05 02:58:25 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ether.c b/usr.sbin/tcpdump/tcpdump/print-ether.c index 0de0fc46e91cd..6f3aebc8bbb8c 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ether.c +++ b/usr.sbin/tcpdump/tcpdump/print-ether.c @@ -20,7 +20,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-ether.c,v 1.3 1995/03/08 12:52:30 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-ether.c,v 1.3.4.1 1996/06/05 02:58:25 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-fddi.c b/usr.sbin/tcpdump/tcpdump/print-fddi.c index afe40df5e7647..9c2a566f16696 100644 --- a/usr.sbin/tcpdump/tcpdump/print-fddi.c +++ b/usr.sbin/tcpdump/tcpdump/print-fddi.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-fddi.c,v 1.2 1995/03/08 12:52:32 olah Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-fddi.c,v 1.2.4.1 1996/06/05 02:58:26 jkh Exp $ (LBL)"; #endif #ifdef FDDI diff --git a/usr.sbin/tcpdump/tcpdump/print-icmp.c b/usr.sbin/tcpdump/tcpdump/print-icmp.c index 4c130c3210388..a2e78e86ddbd1 100644 --- a/usr.sbin/tcpdump/tcpdump/print-icmp.c +++ b/usr.sbin/tcpdump/tcpdump/print-icmp.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 1.2 1995/03/08 12:52:32 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-icmp.c,v 1.2.4.1 1996/06/05 02:58:27 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ip.c b/usr.sbin/tcpdump/tcpdump/print-ip.c index f4d318e5aff79..1be28abeab980 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ip.c +++ b/usr.sbin/tcpdump/tcpdump/print-ip.c @@ -22,7 +22,7 @@ #ifndef lint /* From: Header: print-ip.c,v 1.28 92/05/25 14:29:02 mccanne Exp $ (LBL) */ static char rcsid[] = - "$Id: print-ip.c,v 1.5 1995/06/13 17:39:23 wollman Exp $"; + "$Id: print-ip.c,v 1.4.4.1 1995/10/06 11:53:44 davidg Exp $"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ipx.c b/usr.sbin/tcpdump/tcpdump/print-ipx.c index b253c1e58bbff..a52f041ddc753 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ipx.c +++ b/usr.sbin/tcpdump/tcpdump/print-ipx.c @@ -25,7 +25,7 @@ */ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-ipx.c,v 1.1 1995/03/08 12:52:34 olah Exp $"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-ipx.c,v 1.1.4.1 1996/06/05 02:58:28 jkh Exp $"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-isoclns.c b/usr.sbin/tcpdump/tcpdump/print-isoclns.c index a8afd2271148f..acaa663f9bad7 100644 --- a/usr.sbin/tcpdump/tcpdump/print-isoclns.c +++ b/usr.sbin/tcpdump/tcpdump/print-isoclns.c @@ -25,7 +25,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-isoclns.c,v 1.1 1995/03/08 12:52:35 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-isoclns.c,v 1.1.4.1 1996/06/05 02:58:29 jkh Exp $ (LBL)"; #endif #include <sys/types.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-krb.c b/usr.sbin/tcpdump/tcpdump/print-krb.c index e5470726f84ab..35e61db7c46a5 100644 --- a/usr.sbin/tcpdump/tcpdump/print-krb.c +++ b/usr.sbin/tcpdump/tcpdump/print-krb.c @@ -23,7 +23,7 @@ #ifndef lint static char rcsid[] = - "$Id$"; + "$Id: print-krb.c,v 1.1 1995/08/29 19:50:18 wollman Exp $"; /* "@(#) Header: /afs/sipb/project/tcpdump/src/tcpdump-3.0.2/RCS/print-krb.c,v 1.3 1995/08/16 05:33:27 jhawk Exp "; */ diff --git a/usr.sbin/tcpdump/tcpdump/print-llc.c b/usr.sbin/tcpdump/tcpdump/print-llc.c index 98d6f89d1cc6d..396c1a0b20bfe 100644 --- a/usr.sbin/tcpdump/tcpdump/print-llc.c +++ b/usr.sbin/tcpdump/tcpdump/print-llc.c @@ -26,7 +26,7 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-llc.c,v 1.1 1995/03/08 12:52:36 olah Exp $"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-llc.c,v 1.1.4.1 1996/06/05 02:58:29 jkh Exp $"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-nfs.c b/usr.sbin/tcpdump/tcpdump/print-nfs.c index e2c4e44b5d4a4..e1c18297bc95f 100644 --- a/usr.sbin/tcpdump/tcpdump/print-nfs.c +++ b/usr.sbin/tcpdump/tcpdump/print-nfs.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-nfs.c,v 1.3.4.1 1995/10/06 11:53:46 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-nfs.c,v 1.3.4.2 1996/06/05 02:58:31 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ntp.c b/usr.sbin/tcpdump/tcpdump/print-ntp.c index 98f7a2e345d25..b9f4bb0e3efc3 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ntp.c +++ b/usr.sbin/tcpdump/tcpdump/print-ntp.c @@ -25,7 +25,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-ntp.c,v 1.2 1995/03/08 12:52:37 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-ntp.c,v 1.2.4.1 1996/06/05 02:58:31 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-null.c b/usr.sbin/tcpdump/tcpdump/print-null.c index af84f9767679f..7f3ebaad91603 100644 --- a/usr.sbin/tcpdump/tcpdump/print-null.c +++ b/usr.sbin/tcpdump/tcpdump/print-null.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-null.c,v 1.2 1995/03/08 12:52:38 olah Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-null.c,v 1.2.4.1 1996/06/05 02:58:32 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ospf.c b/usr.sbin/tcpdump/tcpdump/print-ospf.c index f7aa73b0a2984..39d0f31ceb866 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ospf.c +++ b/usr.sbin/tcpdump/tcpdump/print-ospf.c @@ -23,7 +23,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-ospf.c,v 1.2 1995/03/08 12:52:39 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-ospf.c,v 1.2.4.1 1996/06/05 02:58:34 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-ppp.c b/usr.sbin/tcpdump/tcpdump/print-ppp.c index b3681c76fd970..1c7acc707c867 100644 --- a/usr.sbin/tcpdump/tcpdump/print-ppp.c +++ b/usr.sbin/tcpdump/tcpdump/print-ppp.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-ppp.c,v 1.2 1995/03/08 12:52:40 olah Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-ppp.c,v 1.2.4.1 1996/06/05 02:58:35 jkh Exp $ (LBL)"; #endif #ifdef PPP diff --git a/usr.sbin/tcpdump/tcpdump/print-rip.c b/usr.sbin/tcpdump/tcpdump/print-rip.c index c75c25932214c..08171e88e9bae 100644 --- a/usr.sbin/tcpdump/tcpdump/print-rip.c +++ b/usr.sbin/tcpdump/tcpdump/print-rip.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-rip.c,v 1.4.4.1 1995/10/06 11:53:48 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-rip.c,v 1.4.4.2 1996/06/05 02:58:36 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-sl.c b/usr.sbin/tcpdump/tcpdump/print-sl.c index 1fb6944e08dd9..f91229bac172d 100644 --- a/usr.sbin/tcpdump/tcpdump/print-sl.c +++ b/usr.sbin/tcpdump/tcpdump/print-sl.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-sl.c,v 1.2 1995/03/08 12:52:41 olah Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-sl.c,v 1.2.4.1 1996/06/05 02:58:36 jkh Exp $ (LBL)"; #endif #ifdef CSLIP diff --git a/usr.sbin/tcpdump/tcpdump/print-snmp.c b/usr.sbin/tcpdump/tcpdump/print-snmp.c index 0a6cb58b801df..330b15e9a59a7 100644 --- a/usr.sbin/tcpdump/tcpdump/print-snmp.c +++ b/usr.sbin/tcpdump/tcpdump/print-snmp.c @@ -41,7 +41,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Id: print-snmp.c,v 3.10 91/01/17 01:18:13 loverso Exp Locker: loverso $ (jlv)"; + "@(#) $Id: print-snmp.c,v 1.2 1995/03/08 12:52:42 olah Exp $ (jlv)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/tcpdump/print-sunrpc.c index f33459484c826..59ecfc25d8f2a 100644 --- a/usr.sbin/tcpdump/tcpdump/print-sunrpc.c +++ b/usr.sbin/tcpdump/tcpdump/print-sunrpc.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-sunrpc.c,v 1.3 1995/03/08 12:52:43 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-sunrpc.c,v 1.3.4.1 1996/06/05 02:58:37 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-tcp.c b/usr.sbin/tcpdump/tcpdump/print-tcp.c index a3d47aaa64cba..3382f76da0677 100644 --- a/usr.sbin/tcpdump/tcpdump/print-tcp.c +++ b/usr.sbin/tcpdump/tcpdump/print-tcp.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-tcp.c,v 1.4 1995/05/30 03:52:38 rgrimes Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-tcp.c,v 1.4.4.1 1996/06/05 02:58:38 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-tftp.c b/usr.sbin/tcpdump/tcpdump/print-tftp.c index 09967d6583b7f..059b9b44b2e9d 100644 --- a/usr.sbin/tcpdump/tcpdump/print-tftp.c +++ b/usr.sbin/tcpdump/tcpdump/print-tftp.c @@ -23,7 +23,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-tftp.c,v 1.2 1995/03/08 12:52:45 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-tftp.c,v 1.2.4.1 1996/06/05 02:58:39 jkh Exp $ (LBL)"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-udp.c b/usr.sbin/tcpdump/tcpdump/print-udp.c index 2dc442c80f95c..bec0ca1deef93 100644 --- a/usr.sbin/tcpdump/tcpdump/print-udp.c +++ b/usr.sbin/tcpdump/tcpdump/print-udp.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "$Id: print-udp.c,v 1.4 1995/08/29 19:48:11 wollman Exp $"; + "$Id: print-udp.c,v 1.3.4.1 1995/10/06 11:53:49 davidg Exp $"; #endif #include <sys/param.h> diff --git a/usr.sbin/tcpdump/tcpdump/print-wb.c b/usr.sbin/tcpdump/tcpdump/print-wb.c index 1f6f1a7ae660d..ddf90a433ebe3 100644 --- a/usr.sbin/tcpdump/tcpdump/print-wb.c +++ b/usr.sbin/tcpdump/tcpdump/print-wb.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/print-wb.c,v 1.1 1995/03/08 12:52:46 olah Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/print-wb.c,v 1.1.4.1 1996/06/05 02:58:39 jkh Exp $ (LBL)"; #endif #include <sys/types.h> diff --git a/usr.sbin/tcpdump/tcpdump/tcpdump.1 b/usr.sbin/tcpdump/tcpdump/tcpdump.1 index 56af4fd95fe6f..4bda7b437c21b 100644 --- a/usr.sbin/tcpdump/tcpdump/tcpdump.1 +++ b/usr.sbin/tcpdump/tcpdump/tcpdump.1 @@ -1,4 +1,4 @@ -.\" @(#) $Id: tcpdump.1,v 1.4 1995/09/22 17:24:51 wollman Exp $ (LBL) +.\" @(#) $Id: tcpdump.1,v 1.3.4.1 1995/10/06 11:53:50 davidg Exp $ (LBL) .\" .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994 .\" The Regents of the University of California. All rights reserved. diff --git a/usr.sbin/tcpdump/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump/tcpdump.c index 9e25c79570844..fb4fb7c7f37c8 100644 --- a/usr.sbin/tcpdump/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump/tcpdump.c @@ -22,7 +22,7 @@ char copyright[] = "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994\nThe Regents of the University of California. All rights reserved.\n"; static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/tcpdump.c,v 1.3 1995/05/30 03:52:39 rgrimes Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/tcpdump.c,v 1.3.4.1 1996/06/05 02:58:40 jkh Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpdump/util.c b/usr.sbin/tcpdump/tcpdump/util.c index 0d5565a1f3cbf..6e9199c8d3a69 100644 --- a/usr.sbin/tcpdump/tcpdump/util.c +++ b/usr.sbin/tcpdump/tcpdump/util.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpdump/util.c,v 1.2.4.1 1995/10/06 11:53:51 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Attic/util.c,v 1.2.4.2 1996/06/05 02:58:41 jkh Exp $ (LBL)"; #endif #include <stdlib.h> diff --git a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c index 3638741f58818..ae9784ddd0fca 100644 --- a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c +++ b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c @@ -20,7 +20,7 @@ */ #if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.2.4.1 1995/10/06 11:54:13 davidg Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.2.4.2 1996/06/05 02:58:49 jkh Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/search.c b/usr.sbin/tcpdump/tcpslice/search.c index 1bc4d0044b780..cf51a009b9c7f 100644 --- a/usr.sbin/tcpdump/tcpslice/search.c +++ b/usr.sbin/tcpdump/tcpslice/search.c @@ -20,7 +20,7 @@ */ #if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpslice/search.c,v 1.2.4.1 1995/10/06 11:54:17 davidg Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/search.c,v 1.2.4.2 1996/06/05 02:58:50 jkh Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1 index f5bae2647c490..a6c5553c3c4e7 100644 --- a/usr.sbin/tcpdump/tcpslice/tcpslice.1 +++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1 @@ -1,4 +1,4 @@ -.\" @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.4 1995/05/14 15:21:36 gpalmer Exp $ (LBL) +.\" @(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.4.4.1 1996/06/05 02:58:52 jkh Exp $ (LBL) .\" .\" Copyright (c) 1988-1990 The Regents of the University of California. .\" All rights reserved. diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.c b/usr.sbin/tcpdump/tcpslice/tcpslice.c index 2e7d0f02a5fed..d70d48448950c 100644 --- a/usr.sbin/tcpdump/tcpslice/tcpslice.c +++ b/usr.sbin/tcpdump/tcpslice/tcpslice.c @@ -22,7 +22,7 @@ char copyright[] = "@(#) Copyright (c) 1987-1990 The Regents of the University of California.\nAll rights reserved.\n"; static char rcsid[] = - "@(#)$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.2.4.1 1995/10/06 11:54:20 davidg Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.2.4.2 1996/06/05 02:58:52 jkh Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/util.c b/usr.sbin/tcpdump/tcpslice/util.c index 023e90d53822a..36895f4a7ac58 100644 --- a/usr.sbin/tcpdump/tcpslice/util.c +++ b/usr.sbin/tcpdump/tcpslice/util.c @@ -21,7 +21,7 @@ #if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/tcpdump/tcpslice/util.c,v 1.1.4.1 1995/10/06 11:54:22 davidg Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/util.c,v 1.1.4.2 1996/06/05 02:58:53 jkh Exp $ (LBL)"; #endif #include "tcpslice.h" diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c index c84f52de46d07..fda2ed78ce11d 100644 --- a/usr.sbin/timed/timed/acksend.c +++ b/usr.sbin/timed/timed/acksend.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)acksend.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c index deb4d0eb035c6..68cec290405a1 100644 --- a/usr.sbin/timed/timed/byteorder.c +++ b/usr.sbin/timed/timed/byteorder.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)byteorder.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.1.1.1 $" +#ident "$Revision: 1.2 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c index 38700bc45d870..c4ccd0ffa347b 100644 --- a/usr.sbin/timed/timed/candidate.c +++ b/usr.sbin/timed/timed/candidate.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)candidate.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.1.1.1 $" +#ident "$Revision: 1.2 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c index 3d15af3cf1a01..6abd45dee1147 100644 --- a/usr.sbin/timed/timed/cksum.c +++ b/usr.sbin/timed/timed/cksum.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cksum.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.3 $" +#ident "$Revision: 1.1.1.1 $" #endif #include <sys/types.h> diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c index 569d2e1ddac37..a280ed3c5aa4d 100644 --- a/usr.sbin/timed/timed/correct.c +++ b/usr.sbin/timed/timed/correct.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)correct.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.16 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h index 92aed3ee7c781..4c6df62554757 100644 --- a/usr.sbin/timed/timed/globals.h +++ b/usr.sbin/timed/timed/globals.h @@ -34,7 +34,7 @@ */ #ifdef sgi -#ident "$Revision: 1.15 $" +#ident "$Revision: 1.1.1.1 $" #endif #include <sys/param.h> diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c index 3397173eadaba..afd2cd819980d 100644 --- a/usr.sbin/timed/timed/master.c +++ b/usr.sbin/timed/timed/master.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)master.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.21 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c index 2b49eaa4ed8d3..3fe2bfec736f2 100644 --- a/usr.sbin/timed/timed/measure.c +++ b/usr.sbin/timed/timed/measure.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)measure.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.2 $" +#ident "$Revision: 1.3 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c index d64640ae02e29..fc18d4a39497d 100644 --- a/usr.sbin/timed/timed/networkdelta.c +++ b/usr.sbin/timed/timed/networkdelta.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)networkdelta.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.4 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c index 3e8f4d255a61a..e0a1315c2b8b3 100644 --- a/usr.sbin/timed/timed/readmsg.c +++ b/usr.sbin/timed/timed/readmsg.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)readmsg.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.17 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c index 3bb6d85aff725..0cd31dff7df31 100644 --- a/usr.sbin/timed/timed/slave.c +++ b/usr.sbin/timed/timed/slave.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)slave.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.20 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "globals.h" diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c index e134a27b472e9..ce66b5db77afd 100644 --- a/usr.sbin/timed/timed/timed.c +++ b/usr.sbin/timed/timed/timed.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)timed.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.1.1.1 $" +#ident "$Revision: 1.2 $" #endif /* sgi */ #define TSPTYPES diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c index 9e0aa21288e11..acaf8d24428e9 100644 --- a/usr.sbin/timed/timedc/cmds.c +++ b/usr.sbin/timed/timedc/cmds.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.10 $" +#ident "$Revision: 1.2 $" #endif #include "timedc.h" diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c index 02d086a8ad8b1..14c5a5024fed5 100644 --- a/usr.sbin/timed/timedc/timedc.c +++ b/usr.sbin/timed/timedc/timedc.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)timedc.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #ifdef sgi -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.1.1.1 $" #endif #include "timedc.h" diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index 525dcd919e666..ac9966e0dba18 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1996/01/24 00:11:57 wosch Exp $ +# $Id: Makefile,v 1.2.4.1 1996/03/31 09:59:40 joerg Exp $ PROG= tzsetup MAN8= tzsetup.8 diff --git a/usr.sbin/tzsetup/main.c b/usr.sbin/tzsetup/main.c index e7457992dd230..1adc3d84a4a09 100644 --- a/usr.sbin/tzsetup/main.c +++ b/usr.sbin/tzsetup/main.c @@ -28,7 +28,7 @@ */ static const char rcsid[] = - "$Id: main.c,v 1.8 1996/07/03 01:17:34 jkh Exp $"; + "$Id: main.c,v 1.3.2.5 1996/07/03 01:19:11 jkh Exp $"; #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.sbin/tzsetup/tzmenu.c b/usr.sbin/tzsetup/tzmenu.c index dd55dab444782..ca675c4fd89cc 100644 --- a/usr.sbin/tzsetup/tzmenu.c +++ b/usr.sbin/tzsetup/tzmenu.c @@ -28,7 +28,7 @@ */ static const char rcsid[] = - "$Id: tzmenu.c,v 1.2.4.1 1996/03/22 22:24:16 joerg Exp $"; + "$Id: tzmenu.c,v 1.2.4.2 1996/03/31 09:59:43 joerg Exp $"; #include <stdio.h> #include <ncurses.h> diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8 index bcea26124013f..3660a505510f6 100644 --- a/usr.sbin/tzsetup/tzsetup.8 +++ b/usr.sbin/tzsetup/tzsetup.8 @@ -1,7 +1,7 @@ .\" .\" (c) Wolfram Schneider, Berlin, Germany. Public domain. .\" -.\" $Id: tzsetup.8,v 1.1 1996/01/24 00:11:58 wosch Exp $ +.\" $Id: tzsetup.8,v 1.2 1996/02/27 00:27:21 wosch Exp $ .Dd Jan 1996 .Dt TZSETUP 8 diff --git a/usr.sbin/tzsetup/tzsetup.h b/usr.sbin/tzsetup/tzsetup.h index bceff7ebe0053..726d0efd0ed3b 100644 --- a/usr.sbin/tzsetup/tzsetup.h +++ b/usr.sbin/tzsetup/tzsetup.h @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tzsetup.h,v 1.1 1995/04/24 21:04:35 wollman Exp $ + * $Id: tzsetup.h,v 1.2 1995/05/30 03:52:51 rgrimes Exp $ */ struct country { diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c index d1046c5956c9c..c6f0c34a2484f 100644 --- a/usr.sbin/vidcontrol/decode.c +++ b/usr.sbin/vidcontrol/decode.c @@ -25,7 +25,7 @@ * (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: decode.c,v 1.2 1995/01/28 22:18:02 sos Exp $ + * $Id: decode.c,v 1.3 1995/05/30 03:52:52 rgrimes Exp $ */ #include <stdio.h> diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index 7419351186757..5266933a538cd 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -25,7 +25,7 @@ * (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: vidcontrol.c,v 1.11 1995/05/30 03:52:53 rgrimes Exp $ + * $Id: vidcontrol.c,v 1.11.4.1 1996/07/03 22:07:39 gpalmer Exp $ */ #include <ctype.h> diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile index ba8a89327e9bd..857a93f4cf90d 100644 --- a/usr.sbin/vnconfig/Makefile +++ b/usr.sbin/vnconfig/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1993/12/23 07:04:31 cgd Exp $ +# $Id: Makefile,v 1.1 1994/12/04 20:12:24 phk Exp $ PROG= vnconfig MAN8= vnconfig.8 diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8 index b2740532cae3e..703345e6e81c3 100644 --- a/usr.sbin/wormcontrol/wormcontrol.8 +++ b/usr.sbin/wormcontrol/wormcontrol.8 @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $Id: wormcontrol.8,v 1.2 1996/02/01 14:14:22 joerg Exp $ +.\" $Id: wormcontrol.8,v 1.3 1996/02/02 23:01:17 joerg Exp $ .\" .\" arrgh, hilit19 needs this" :-( .Dd Jan 27, 1996 diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c index be04c47ec6e33..c703f45e7658c 100644 --- a/usr.sbin/wormcontrol/wormcontrol.c +++ b/usr.sbin/wormcontrol/wormcontrol.c @@ -32,7 +32,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $Id$ + * $Id: wormcontrol.c,v 1.1.1.1 1996/01/27 17:52:20 joerg Exp $ * */ diff --git a/usr.sbin/xntpd/Makefile b/usr.sbin/xntpd/Makefile index 962e64a41bf0e..33c2234d6e06b 100644 --- a/usr.sbin/xntpd/Makefile +++ b/usr.sbin/xntpd/Makefile @@ -1,6 +1,6 @@ # # Makefile for xntpd. -# $Id: Makefile,v 1.3 1994/02/03 22:30:30 wollman Exp $ +# $Id: Makefile,v 1.4 1994/09/29 23:43:54 wollman Exp $ # SUBDIR= lib parse xntpd xntpdc ntpq ntpdate ntptrace authstuff util diff --git a/usr.sbin/xntpd/README.FreeBSD b/usr.sbin/xntpd/README.FreeBSD index 798a685f77404..773a1f334d602 100644 --- a/usr.sbin/xntpd/README.FreeBSD +++ b/usr.sbin/xntpd/README.FreeBSD @@ -1,4 +1,4 @@ - $Id: README.FreeBSD,v 1.7 1994/04/21 21:10:20 wollman Exp $ + $Id: README.FreeBSD,v 1.8 1994/09/29 23:43:55 wollman Exp $ This version of NTP was converted to the BSD-style Makefile system by Garrett Wollman (wollman@FreeBSD.org); it is based on version diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile index 79b2d9d675e3d..d2e79971f872f 100644 --- a/usr.sbin/xntpd/authstuff/Makefile +++ b/usr.sbin/xntpd/authstuff/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1993/12/21 21:06:20 wollman Exp $ +# $Id: Makefile,v 1.2 1993/12/22 11:32:10 rgrimes Exp $ # # Most of the programs in this directory are completely useless for the # NTP configuration that we provide by default. diff --git a/usr.sbin/xntpd/clockstuff/Makefile b/usr.sbin/xntpd/clockstuff/Makefile index 425d79d1ddaae..91084f1ade429 100644 --- a/usr.sbin/xntpd/clockstuff/Makefile +++ b/usr.sbin/xntpd/clockstuff/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1993/12/21 21:06:24 wollman Exp $ +# $Id: Makefile,v 1.2 1994/09/15 20:55:44 bde Exp $ # PROG= propdelay diff --git a/usr.sbin/xntpd/kernel/chuinit.c b/usr.sbin/xntpd/kernel/chuinit.c index 0daab9634899c..4dddc667ae7d8 100644 --- a/usr.sbin/xntpd/kernel/chuinit.c +++ b/usr.sbin/xntpd/kernel/chuinit.c @@ -1,7 +1,7 @@ /* ** dynamically loadable chu driver ** -** $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/xntpd/kernel/chuinit.c,v 1.2 1995/05/30 03:53:30 rgrimes Exp $ +** $Header: /home/ncvs/src/usr.sbin/xntpd/kernel/chuinit.c,v 1.2.4.1 1996/06/05 02:58:56 jkh Exp $ ** ** william robertson <rob@agate.berkeley.edu> */ diff --git a/usr.sbin/xntpd/kernel/clkinit.c b/usr.sbin/xntpd/kernel/clkinit.c index 7c7605cb85112..adecf2ec5d126 100644 --- a/usr.sbin/xntpd/kernel/clkinit.c +++ b/usr.sbin/xntpd/kernel/clkinit.c @@ -1,7 +1,7 @@ /* ** dynamically loadable clk driver ** -** $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/xntpd/kernel/clkinit.c,v 1.2 1995/05/30 03:53:31 rgrimes Exp $ +** $Header: /home/ncvs/src/usr.sbin/xntpd/kernel/clkinit.c,v 1.2.4.1 1996/06/05 02:58:57 jkh Exp $ ** ** william robertson <rob@agate.berkeley.edu> */ diff --git a/usr.sbin/xntpd/lib/Makefile b/usr.sbin/xntpd/lib/Makefile index 32c6a4a964cc0..0d90c6b2d762b 100644 --- a/usr.sbin/xntpd/lib/Makefile +++ b/usr.sbin/xntpd/lib/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.5 1994/04/03 20:37:05 wollman Exp $ +# $Id: Makefile,v 1.6 1995/03/23 19:13:04 wollman Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/lib/machines.c b/usr.sbin/xntpd/lib/machines.c index 1d1cbc92faa43..4996081020b5f 100644 --- a/usr.sbin/xntpd/lib/machines.c +++ b/usr.sbin/xntpd/lib/machines.c @@ -2,7 +2,7 @@ * * Real bummers unite ! * - * $Id:$ + * $Id: machines.c,v 1.1.1.3 1994/09/29 23:03:36 wollman Exp $ */ #include "ntp_stdlib.h" diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile index f0af84001c3d6..060a186dde187 100644 --- a/usr.sbin/xntpd/ntpdate/Makefile +++ b/usr.sbin/xntpd/ntpdate/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.3 1993/12/22 11:32:56 rgrimes Exp $ +# $Id: Makefile,v 1.4 1994/10/03 23:51:17 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile index 875592a889c6c..827114effddcd 100644 --- a/usr.sbin/xntpd/ntpq/Makefile +++ b/usr.sbin/xntpd/ntpq/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.3 1993/12/22 11:33:07 rgrimes Exp $ +# $Id: Makefile,v 1.4 1994/10/03 23:51:22 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile index 5d5f32766de01..e723d0a05c007 100644 --- a/usr.sbin/xntpd/ntptrace/Makefile +++ b/usr.sbin/xntpd/ntptrace/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:33:14 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:26 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/parse/Makefile b/usr.sbin/xntpd/parse/Makefile index 1a46fbe2bdb4e..69983c7cfff00 100644 --- a/usr.sbin/xntpd/parse/Makefile +++ b/usr.sbin/xntpd/parse/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.1 1993/12/21 19:42:18 wollman Exp $ +# $Id: Makefile,v 1.1 1993/12/21 20:04:14 wollman Exp $ # PARSEFLAGS= -DCLOCK_SCHMID -DCLOCK_DCF7000 -DCLOCK_MEINBERG \ diff --git a/usr.sbin/xntpd/parse/clk_trimtaip.c b/usr.sbin/xntpd/parse/clk_trimtaip.c index e0f6c67b00278..fb420e3dd15e8 100644 --- a/usr.sbin/xntpd/parse/clk_trimtaip.c +++ b/usr.sbin/xntpd/parse/clk_trimtaip.c @@ -1,6 +1,6 @@ #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTAIP) /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/xntpd/parse/clk_trimtaip.c,v 1.1.1.1 1994/09/29 23:01:31 wollman Exp $ + * $Header: /home/ncvs/src/usr.sbin/xntpd/parse/clk_trimtaip.c,v 1.1.1.1.6.1 1996/06/05 02:58:59 jkh Exp $ * * Trimble SV6 clock support */ @@ -109,6 +109,10 @@ cvt_trimtaip(buffer, size, format, clock) * History: * * $Log: clk_trimtaip.c,v $ + * Revision 1.1.1.1.6.1 1996/06/05 02:58:59 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.1.1.1 1994/09/29 23:01:31 wollman * xntp 3.4e from Dave Mills @ UDel * diff --git a/usr.sbin/xntpd/parse/clk_trimtsip.c b/usr.sbin/xntpd/parse/clk_trimtsip.c index e7a04c14c3afa..7b0631faa8629 100644 --- a/usr.sbin/xntpd/parse/clk_trimtsip.c +++ b/usr.sbin/xntpd/parse/clk_trimtsip.c @@ -1,6 +1,6 @@ #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTSIP) /* - * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.sbin/xntpd/parse/clk_trimtsip.c,v 1.2 1995/05/30 03:54:13 rgrimes Exp $ + * $Header: /home/ncvs/src/usr.sbin/xntpd/parse/clk_trimtsip.c,v 1.2.4.1 1996/06/05 02:59:00 jkh Exp $ * * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION */ @@ -468,6 +468,10 @@ getint(bp) * History: * * $Log: clk_trimtsip.c,v $ + * Revision 1.2.4.1 1996/06/05 02:59:00 jkh + * This 3rd mega-commit should hopefully bring us back to where we were. + * I can get it to `make world' succesfully, anyway! + * * Revision 1.2 1995/05/30 03:54:13 rgrimes * Remove trailing whitespace. * diff --git a/usr.sbin/xntpd/parse/util/Makefile b/usr.sbin/xntpd/parse/util/Makefile index ad9c0eb454701..3c9f0dd2d438c 100644 --- a/usr.sbin/xntpd/parse/util/Makefile +++ b/usr.sbin/xntpd/parse/util/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.2 1995/04/04 17:48:02 rgrimes Exp $ # CFLAGS+= -I${.CURDIR}/../../include diff --git a/usr.sbin/xntpd/parse/util/parsetest.c b/usr.sbin/xntpd/parse/util/parsetest.c index 33f3d9ce1a6b6..66dc3daab5dc0 100644 --- a/usr.sbin/xntpd/parse/util/parsetest.c +++ b/usr.sbin/xntpd/parse/util/parsetest.c @@ -11,6 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * $Log: parsetest.c,v $ + * Revision 1.2 1995/05/30 03:54:22 rgrimes + * Remove trailing whitespace. + * * Revision 1.1.1.4 1994/09/29 23:01:34 wollman * xntp 3.4e from Dave Mills @ UDel * diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile index 02cb294eaee1a..b528c7f727597 100644 --- a/usr.sbin/xntpd/util/Makefile +++ b/usr.sbin/xntpd/util/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:33:28 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:29 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile index 6ab7cd0774bab..83aef28e1d7e8 100644 --- a/usr.sbin/xntpd/xntpd/Makefile +++ b/usr.sbin/xntpd/xntpd/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.6 1994/09/30 00:34:17 wollman Exp $ +# $Id: Makefile,v 1.7 1994/10/03 23:51:32 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile index a06cf1a0f83e8..8492c7711c532 100644 --- a/usr.sbin/xntpd/xntpdc/Makefile +++ b/usr.sbin/xntpd/xntpdc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1993/12/22 11:34:00 rgrimes Exp $ +# $Id: Makefile,v 1.3 1994/10/03 23:51:34 phk Exp $ # CFLAGS+= -I${.CURDIR}/../include diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile index 2c9c1725d1c9e..1eca9432aea3f 100644 --- a/usr.sbin/ypbind/Makefile +++ b/usr.sbin/ypbind/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.1 1994/08/08 01:03:57 wollman Exp $ +# $Id: Makefile,v 1.2 1995/04/09 21:58:59 wpaul Exp $ PROG= ypbind MAN8= ypbind.8 diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8 index b271a4a6799b9..c61e80d66ad2f 100644 --- a/usr.sbin/ypbind/ypbind.8 +++ b/usr.sbin/ypbind/ypbind.8 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: ypbind.8,v 1.2.4.1 1995/08/26 12:56:06 davidg Exp $ +.\" $Id: ypbind.8,v 1.2.4.2 1996/06/27 05:33:29 gpalmer Exp $ .\" .Dd April 9, 1995 .Dt YPBIND 8 diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c index 04aa892ef5e1b..a2d261737b3ed 100644 --- a/usr.sbin/ypbind/ypbind.c +++ b/usr.sbin/ypbind/ypbind.c @@ -28,7 +28,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: ypbind.c,v 1.15 1995/05/30 03:55:13 rgrimes Exp $"; +static char rcsid[] = "$Id: ypbind.c,v 1.15.4.1 1995/08/26 12:56:07 davidg Exp $"; #endif #include <sys/param.h> diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile index 3108b83dde0a9..e119d9fe4f85b 100644 --- a/usr.sbin/yppoll/Makefile +++ b/usr.sbin/yppoll/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.2 1994/02/17 07:06:17 rgrimes Exp $ +# $Id: Makefile,v 1.1 1994/08/08 01:10:25 wollman Exp $ PROG= yppoll NOMAN= diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile index 58bafea894951..ba77edef1c7e7 100644 --- a/usr.sbin/ypset/Makefile +++ b/usr.sbin/ypset/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# $Id: Makefile,v 1.2 1994/02/17 07:06:19 rgrimes Exp $ +# $Id: Makefile,v 1.1 1994/08/08 01:10:27 wollman Exp $ PROG= ypset NOMAN= diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile index 963a0ee8b43e6..116e9bc4dde4d 100644 --- a/usr.sbin/zic/Makefile +++ b/usr.sbin/zic/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/13 03:36:08 wollman Exp $ SUBDIR= zic zdump .include <bsd.subdir.mk> diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc index c961f85683079..cde63901435a9 100644 --- a/usr.sbin/zic/Makefile.inc +++ b/usr.sbin/zic/Makefile.inc @@ -1,3 +1,3 @@ -# $Id$ +# $Id: Makefile.inc,v 1.1 1994/09/13 03:36:09 wollman Exp $ .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile index 46af3cacca211..8f83ca9f5fb50 100644 --- a/usr.sbin/zic/zdump/Makefile +++ b/usr.sbin/zic/zdump/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/13 03:36:15 wollman Exp $ .PATH: ${.CURDIR}/.. diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile index 5331112243e3a..691b7b0374b62 100644 --- a/usr.sbin/zic/zic/Makefile +++ b/usr.sbin/zic/zic/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1994/09/13 03:36:16 wollman Exp $ .PATH: ${.CURDIR}/.. -- cgit v1.2.3