summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kerberosV/src/appl/rsh/ChangeLog34
-rw-r--r--lib/libc/compat-43/__setregid.c4
-rw-r--r--lib/libc/compat-43/__setreuid.c4
-rw-r--r--lib/libc_r/man/pthread_cond_timedwait.34
-rw-r--r--lib/libc_r/uthread/uthread_cond.c6
-rw-r--r--lib/libpthread/man/pthread_cond_timedwait.34
-rw-r--r--lib/libpthread/uthread/uthread_cond.c6
-rw-r--r--libexec/atrun/atrun.c6
-rw-r--r--sbin/mountd/mountd.c4
-rw-r--r--sys/arch/alpha/alpha/machdep.c4
-rw-r--r--sys/arch/hp300/hp300/hpux_machdep.c4
-rw-r--r--sys/arch/m68k/m68k/sig_machdep.c4
-rw-r--r--sys/arch/m68k/m68k/sunos_machdep.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/hpux_machdep.c4
-rw-r--r--sys/arch/mvme88k/include/board.h4
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c4
-rw-r--r--sys/arch/powerpc/powerpc/pmap.c4
-rw-r--r--sys/arch/powerpc/powerpc/trap.c4
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/ncr.c6
-rw-r--r--sys/dev/pcmcia/if_ray.c4
-rw-r--r--sys/scsi/st.c4
-rw-r--r--usr.bin/chpass/pw_yp.c6
-rw-r--r--usr.bin/passwd/yp_passwd.c6
-rw-r--r--usr.bin/tip/tip.h6
-rw-r--r--usr.sbin/edquota/edquota.c4
26 files changed, 91 insertions, 59 deletions
diff --git a/kerberosV/src/appl/rsh/ChangeLog b/kerberosV/src/appl/rsh/ChangeLog
index 4a40ac75cf4..2016b8bff5f 100644
--- a/kerberosV/src/appl/rsh/ChangeLog
+++ b/kerberosV/src/appl/rsh/ChangeLog
@@ -1,3 +1,35 @@
+2001-08-15 Johan Danielsson <joda@pdc.kth.se>
+
+ * rsh.c: only complain about encryption flag when old
+ authentication is requested
+
+2001-08-07 Johan Danielsson <joda@pdc.kth.se>
+
+ * rsh.c: don't try broken auth if rresvport failed; try to give
+ some more informative error messages
+
+2001-07-31 Johan Danielsson <joda@pdc.kth.se>
+
+ * rshd.8: add an EXAMPLE
+ * rshd.8: manual page
+ * rshd.c: add some compat flags
+ * rsh.1: manual page
+ * rsh.c: iff -d, set the SO_DEBUG flags of the stdout and stderr
+ socket; implement parsing user@host
+
+2001-07-19 Assar Westerlund <assar@sics.se>
+
+ * rshd.c (fatal): use vsnprintf correctly
+
+2001-02-07 Assar Westerlund <assar@sics.se>
+
+ * Makefile.am: add login_access
+ * rshd.c (login_access): add prototype
+ (syslog_and_die, fatal): add printf attributes
+ (*): AIX -> _AIX
+ (doit): use login_access
+ based on patches from Ake Sandgren <ake@cs.umu.se>
+
2001-01-09 Assar Westerlund <assar@sics.se>
* rshd.c (save_krb5_creds): use krb5_rd_cred2 instead of
@@ -82,7 +114,7 @@
1999-11-20 Assar Westerlund <assar@sics.se>
- * rsh.c (main): remember to close the priviledged sockets before
+ * rsh.c (main): remember to close the privileged sockets before
calling rlogin
1999-11-02 Assar Westerlund <assar@sics.se>
diff --git a/lib/libc/compat-43/__setregid.c b/lib/libc/compat-43/__setregid.c
index e1133b2178a..39f4ece8ce1 100644
--- a/lib/libc/compat-43/__setregid.c
+++ b/lib/libc/compat-43/__setregid.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __setregid.c,v 1.4 1998/11/15 19:52:11 deraadt Exp $";
+static char *rcsid = "$OpenBSD: __setregid.c,v 1.5 2002/06/04 00:09:08 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -54,7 +54,7 @@ __setregid(rgid, egid)
/*
* we assume that the intent of setting rgid is to be able to get
- * back rgid priviledge. So we make sure that we will be able to
+ * back rgid privilege. So we make sure that we will be able to
* do so, but do not actually set the rgid.
*/
if (rgid != (gid_t) -1 && rgid != getgid() && rgid != svgid &&
diff --git a/lib/libc/compat-43/__setreuid.c b/lib/libc/compat-43/__setreuid.c
index 0fdc97aa814..583ee1d72cc 100644
--- a/lib/libc/compat-43/__setreuid.c
+++ b/lib/libc/compat-43/__setreuid.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: __setreuid.c,v 1.4 1998/11/15 19:52:11 deraadt Exp $";
+static char *rcsid = "$OpenBSD: __setreuid.c,v 1.5 2002/06/04 00:09:08 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -52,7 +52,7 @@ __setreuid(ruid, euid)
sruid = getuid();
/*
* we assume that the intent of setting ruid is to be able to get
- * back ruid priviledge. So we make sure that we will be able to
+ * back ruid privilege. So we make sure that we will be able to
* do so, but do not actually set the ruid.
*/
if (ruid != (uid_t) -1 && ruid != sruid && ruid != svuid &&
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index dc0db2b463b..83f380643b3 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_cond_timedwait.3,v 1.8 2002/05/01 08:03:30 mpech Exp $
+.\" $OpenBSD: pthread_cond_timedwait.3,v 1.9 2002/06/04 00:09:07 deraadt Exp $
.\"
.\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
.\" All rights reserved.
@@ -54,7 +54,7 @@ or
with the same condition variable, or if the system time reaches the
time specified in
.Fa abstime ,
-and the current thread reaquires the lock on
+and the current thread reacquires the lock on
.Fa mutex .
.Sh RETURN VALUES
If successful, the
diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c
index d1c5576d42c..dc46e26127d 100644
--- a/lib/libc_r/uthread/uthread_cond.c
+++ b/lib/libc_r/uthread/uthread_cond.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthread_cond.c,v 1.12 2001/12/20 07:33:14 fgsch Exp $ */
+/* $OpenBSD: uthread_cond.c,v 1.13 2002/06/04 00:09:07 deraadt Exp $ */
/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
@@ -273,7 +273,7 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex)
* errors. Note that even
* though this thread may have
* been canceled, POSIX requires
- * that the mutex be reaquired
+ * that the mutex be reacquired
* prior to cancellation.
*/
(void)_mutex_cv_lock(mutex);
@@ -439,7 +439,7 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
* errors. Note that even
* though this thread may have
* been canceled, POSIX requires
- * that the mutex be reaquired
+ * that the mutex be reacquired
* prior to cancellation.
*/
(void)_mutex_cv_lock(mutex);
diff --git a/lib/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index dc0db2b463b..83f380643b3 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_cond_timedwait.3,v 1.8 2002/05/01 08:03:30 mpech Exp $
+.\" $OpenBSD: pthread_cond_timedwait.3,v 1.9 2002/06/04 00:09:07 deraadt Exp $
.\"
.\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
.\" All rights reserved.
@@ -54,7 +54,7 @@ or
with the same condition variable, or if the system time reaches the
time specified in
.Fa abstime ,
-and the current thread reaquires the lock on
+and the current thread reacquires the lock on
.Fa mutex .
.Sh RETURN VALUES
If successful, the
diff --git a/lib/libpthread/uthread/uthread_cond.c b/lib/libpthread/uthread/uthread_cond.c
index d1c5576d42c..dc46e26127d 100644
--- a/lib/libpthread/uthread/uthread_cond.c
+++ b/lib/libpthread/uthread/uthread_cond.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthread_cond.c,v 1.12 2001/12/20 07:33:14 fgsch Exp $ */
+/* $OpenBSD: uthread_cond.c,v 1.13 2002/06/04 00:09:07 deraadt Exp $ */
/*
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
@@ -273,7 +273,7 @@ pthread_cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex)
* errors. Note that even
* though this thread may have
* been canceled, POSIX requires
- * that the mutex be reaquired
+ * that the mutex be reacquired
* prior to cancellation.
*/
(void)_mutex_cv_lock(mutex);
@@ -439,7 +439,7 @@ pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
* errors. Note that even
* though this thread may have
* been canceled, POSIX requires
- * that the mutex be reaquired
+ * that the mutex be reacquired
* prior to cancellation.
*/
(void)_mutex_cv_lock(mutex);
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index e99b03a8bc6..08d86ecce3f 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atrun.c,v 1.21 2002/05/14 18:05:39 millert Exp $ */
+/* $OpenBSD: atrun.c,v 1.22 2002/06/04 00:09:07 deraadt Exp $ */
/*
* atrun.c - run jobs queued by at; run with root privileges.
@@ -64,7 +64,7 @@
#define LOGNAMESIZE (MAXLOGNAME-1)
#endif
-static const char rcsid[] = "$OpenBSD: atrun.c,v 1.21 2002/05/14 18:05:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: atrun.c,v 1.22 2002/06/04 00:09:07 deraadt Exp $";
static int debug = 0;
static void
@@ -381,7 +381,7 @@ main(int argc, char **argv)
/*
* We don't need root privileges all the time; running under uid
- * and gid nobody is fine except for priviledged operations.
+ * and gid nobody is fine except for privileged operations.
*/
RELINQUISH_PRIVS_ROOT(NOBODY_UID, NOBODY_GID);
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index e4a420f5c72..21e2a87f911 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mountd.c,v 1.46 2002/05/26 09:24:35 deraadt Exp $ */
+/* $OpenBSD: mountd.c,v 1.47 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */
/*
@@ -1845,7 +1845,7 @@ parsecred(namelist, cr)
int ngroups, groups[NGROUPS + 1];
/*
- * Set up the unpriviledged user.
+ * Set up the unprivileged user.
*/
cr->cr_ref = 1;
cr->cr_uid = -2;
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index fa2fc2e6570..13dcbc7c8bd 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.72 2002/05/03 00:06:16 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.73 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -1668,7 +1668,7 @@ sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
/* ARGSUSED */
diff --git a/sys/arch/hp300/hp300/hpux_machdep.c b/sys/arch/hp300/hp300/hpux_machdep.c
index 6614bb8f05f..1f8794c721d 100644
--- a/sys/arch/hp300/hp300/hpux_machdep.c
+++ b/sys/arch/hp300/hp300/hpux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */
+/* $OpenBSD: hpux_machdep.c,v 1.12 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.19 1998/02/16 20:58:30 thorpej Exp $ */
/*
@@ -547,7 +547,7 @@ hpux_sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
/* ARGSUSED */
diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c
index 95b8f8e8790..e0555f3a5ef 100644
--- a/sys/arch/m68k/m68k/sig_machdep.c
+++ b/sys/arch/m68k/m68k/sig_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sig_machdep.c,v 1.8 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: sig_machdep.c,v 1.9 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */
/*
@@ -292,7 +292,7 @@ sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
int
diff --git a/sys/arch/m68k/m68k/sunos_machdep.c b/sys/arch/m68k/m68k/sunos_machdep.c
index e76aaf4e987..5113db75894 100644
--- a/sys/arch/m68k/m68k/sunos_machdep.c
+++ b/sys/arch/m68k/m68k/sunos_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunos_machdep.c,v 1.13 2001/06/27 04:39:06 art Exp $ */
+/* $OpenBSD: sunos_machdep.c,v 1.14 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: sunos_machdep.c,v 1.12 1996/10/13 03:19:22 christos Exp $ */
/*
@@ -219,7 +219,7 @@ sunos_sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
int
diff --git a/sys/arch/mvme68k/mvme68k/hpux_machdep.c b/sys/arch/mvme68k/mvme68k/hpux_machdep.c
index 5968f39457e..2d775d753d4 100644
--- a/sys/arch/mvme68k/mvme68k/hpux_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/hpux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_machdep.c,v 1.6 2002/04/27 23:21:06 miod Exp $ */
+/* $OpenBSD: hpux_machdep.c,v 1.7 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.9 1997/03/16 10:00:45 thorpej Exp $ */
/*
@@ -587,7 +587,7 @@ hpux_sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
/* ARGSUSED */
diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index 1267d6d0049..6f7b94113bb 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: board.h,v 1.14 2001/12/19 05:06:26 smurph Exp $ */
+/* $OpenBSD: board.h,v 1.15 2002/06/04 00:09:08 deraadt Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* All rights reserved.
@@ -100,7 +100,7 @@
#define DACC_BIT 0x4 /* data access exception */
#define MACC_BIT 0x8 /* misaligned access exception */
#define UOPC_BIT 0x10 /* unimplemented opcode exception*/
-#define PRIV_BIT 0x20 /* priviledge violation exception*/
+#define PRIV_BIT 0x20 /* privilege violation exception*/
#define BND_BIT 0x40 /* bounds check violation */
#define IDE_BIT 0x80 /* illegal integer divide */
#define IOV_BIT 0x100 /* integer overflow exception */
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 4b653a3ff25..f0de9357b07 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.93 2002/03/23 13:28:34 espie Exp $ */
+/* $OpenBSD: machdep.c,v 1.94 2002/06/04 00:09:08 deraadt Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -1018,7 +1018,7 @@ sendsig(catcher, sig, mask, code, type, val)
* Return to previous pc and psl as specified by
* context left by sendsig. Check carefully to
* make sure that the user has not modified the
- * psl to gain improper priviledges or to cause
+ * psl to gain improper privileges or to cause
* a machine fault.
*/
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 4325391994e..b59d7c6ad21 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.66 2002/05/18 20:11:06 drahn Exp $ */
+/* $OpenBSD: pmap.c,v 1.67 2002/06/04 00:09:08 deraadt Exp $ */
/*
* Copyright (c) 2001, 2002 Dale Rahn. All rights reserved.
@@ -462,7 +462,7 @@ pmap_enter(pm, va, pa, prot, flags)
int need_sync;
int cache;
- /* MP - Aquire lock for this pmap */
+ /* MP - Acquire lock for this pmap */
s = splimp();
pted = pmap_vp_lookup(pm, va);
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index 4206115bf10..52a99878feb 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.49 2002/05/18 09:49:17 art Exp $ */
+/* $OpenBSD: trap.c,v 1.50 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */
/*
@@ -552,7 +552,7 @@ mpc_print_pci_stat();
}
if (frame->srr1 & (1<<(31-13))) {
/* privileged instruction exception */
- errstr[errnum] = "priviledged instr";
+ errstr[errnum] = "privileged instr";
errnum++;
}
if (frame->srr1 & (1<<(31-14))) {
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 311bf9ad41b..ffcdbe6a570 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.23 2002/03/14 01:26:59 millert Exp $ */
+/* $OpenBSD: if_sk.c,v 1.24 2002/06/04 00:09:08 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -42,9 +42,9 @@
* http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
* The SysKonnect GEnesis manual, http://www.syskonnect.com
*
- * Note: XaQti has been aquired by Vitesse, and Vitesse does not have the
+ * Note: XaQti has been acquired by Vitesse, and Vitesse does not have the
* XMAC II datasheet online. I have put my copy at people.freebsd.org as a
- * convience to others until Vitesse corrects this problem:
+ * convenience to others until Vitesse corrects this problem:
*
* http://people.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
*
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 8cd4bbd8d42..59d5a6bbd38 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $ */
+/* $OpenBSD: ncr.c,v 1.64 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */
/**************************************************************************
@@ -1466,7 +1466,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
- "\n$OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $\n";
+ "\n$OpenBSD: ncr.c,v 1.64 2002/06/04 00:09:08 deraadt Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
@@ -7133,7 +7133,7 @@ out:
/*==========================================================
**
**
-** Aquire a control block
+** Acquire a control block
**
**
**==========================================================
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index bd50b35bdfd..47d072b99b5 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ray.c,v 1.19 2002/03/24 20:53:56 mickey Exp $ */
+/* $OpenBSD: if_ray.c,v 1.20 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */
/*
@@ -205,7 +205,7 @@ struct ray_softc {
u_int8_t sc_mode; /* current operating mode SC_MODE_xx */
u_int8_t sc_countrycode; /* current country code */
u_int8_t sc_dcountrycode; /* desired country code */
- int sc_havenet; /* true if we have aquired a network */
+ int sc_havenet; /* true if we have acquired a network */
bus_size_t sc_txpad; /* tib size plus "phy" size */
u_int8_t sc_deftxrate; /* default transfer rate */
u_int8_t sc_encrypt;
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 2f0ad1f7e95..e1e8e7069c8 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.30 2002/03/14 01:27:13 millert Exp $ */
+/* $OpenBSD: st.c,v 1.31 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -425,7 +425,7 @@ stattach(parent, self, aux)
/*
* Reset the media loaded flag, sometimes the data
- * aquired at boot time is not quite accurate. This
+ * acquired at boot time is not quite accurate. This
* will be checked again at the first open.
*/
sc_link->flags &= ~SDEV_MEDIA_LOADED;
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index cbf75b23baa..4c084f1c416 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pw_yp.c,v 1.14 2002/05/29 09:23:25 deraadt Exp $ */
+/* $OpenBSD: pw_yp.c,v 1.15 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $ */
/*
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
#else
-static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.14 2002/05/29 09:23:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.15 2002/06/04 00:09:08 deraadt Exp $";
#endif
#endif /* not lint */
@@ -109,7 +109,7 @@ pw_yp(pw, uid)
}
/*
- * Be sure the port is priviledged
+ * Be sure the port is privileged
*/
if (rpcport >= IPPORT_RESERVED) {
(void)fprintf(stderr,
diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index 7d32f28aa37..aad7ac8e8c9 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp_passwd.c,v 1.21 2002/05/16 11:54:25 fgsch Exp $ */
+/* $OpenBSD: yp_passwd.c,v 1.22 2002/06/04 00:09:08 deraadt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -34,7 +34,7 @@
*/
#ifndef lint
/*static const char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/
-static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.21 2002/05/16 11:54:25 fgsch Exp $";
+static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.22 2002/06/04 00:09:08 deraadt Exp $";
#endif /* not lint */
#ifdef YP
@@ -130,7 +130,7 @@ yp_passwd(username)
}
/*
- * Be sure the port is priviledged
+ * Be sure the port is privileged
*/
if (rpcport >= IPPORT_RESERVED) {
warnx("yppasswd daemon is on an invalid port.");
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index fdfed66fcde..a5b5451c000 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.h,v 1.13 2002/05/29 22:58:56 millert Exp $ */
+/* $OpenBSD: tip.h,v 1.14 2002/06/04 00:09:08 deraadt Exp $ */
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/*
@@ -170,7 +170,7 @@ typedef
typedef
struct {
char e_char; /* char to match on */
- char e_flags; /* experimental, priviledged */
+ char e_flags; /* experimental, privileged */
char *e_help; /* help string */
int (*e_func)(); /* command */
}
@@ -178,7 +178,7 @@ typedef
#define NORM 00 /* normal protection, execute anyone */
#define EXP 01 /* experimental, mark it with a `*' on help */
-#define PRIV 02 /* priviledged, root execute only */
+#define PRIV 02 /* privileged, root execute only */
extern int vflag; /* verbose during reading of .tiprc file */
extern int noesc; /* no escape `~' char */
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 56e7a38a54b..9880fa003b9 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.32 2002/05/29 09:47:20 deraadt Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.33 2002/06/04 00:09:08 deraadt Exp $";
#endif /* not lint */
/*
@@ -355,7 +355,7 @@ putprivs(id, quotatype, quplist)
}
/*
- * Take a list of priviledges and get it edited.
+ * Take a list of privileges and get it edited.
*/
int
editit(tmpfile)