summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-23 03:03:38 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-23 03:03:38 +0000
commit66b10192a6c1f61e3bd3d3645bf3178ae7844f41 (patch)
tree55cb79cd05b8a1b8dda59c7df210821b2fb9f2e2
parent513871f2b2518f6347c3717a1758670a6bcfab87 (diff)
uid_t is unsigned
-rw-r--r--lib/libc/gen/authenticate.c4
-rw-r--r--lib/libc/gen/login_cap.c4
-rw-r--r--sys/arch/alpha/alpha/trap.c6
-rw-r--r--sys/arch/hp300/hp300/trap.c4
-rw-r--r--sys/arch/mac68k/mac68k/trap.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/trap.c4
-rw-r--r--sys/arch/sparc64/sparc64/trap.c4
-rw-r--r--sys/arch/vax/vax/trap.c4
8 files changed, 17 insertions, 17 deletions
diff --git a/lib/libc/gen/authenticate.c b/lib/libc/gen/authenticate.c
index a7903d3c0d0..55d84620929 100644
--- a/lib/libc/gen/authenticate.c
+++ b/lib/libc/gen/authenticate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authenticate.c,v 1.10 2002/05/24 21:22:37 deraadt Exp $ */
+/* $OpenBSD: authenticate.c,v 1.11 2002/06/23 03:03:37 deraadt Exp $ */
/*-
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -189,7 +189,7 @@ auth_approval(auth_session_t *as, login_cap_t *lc, char *name, char *type)
pwd = getpwnam(name);
else {
if ((pwd = getpwuid(getuid())) == NULL) {
- syslog(LOG_ERR, "no such user id %d", getuid());
+ syslog(LOG_ERR, "no such user id %u", getuid());
_warnx("cannot approve who we don't recognize");
return (0);
}
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index 4ac866e3102..a06558a9d77 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_cap.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */
+/* $OpenBSD: login_cap.c,v 1.11 2002/06/23 03:03:37 deraadt Exp $ */
/*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -667,7 +667,7 @@ setusercontext(lc, pwd, uid, flags)
if (flags & LOGIN_SETUSER) {
(void) seteuid(uid); /* just in case */
if (setuid(uid) < 0) {
- syslog(LOG_ERR, "setuid(%d): %m", uid);
+ syslog(LOG_ERR, "setuid(%u): %m", uid);
login_close(flc);
return (-1);
}
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index 383576c598f..d6df7600951 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.35 2002/05/16 21:11:10 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.36 2002/06/23 03:03:15 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
/*-
@@ -551,7 +551,7 @@ trap(a0, a1, a2, entry, framep)
v = (caddr_t)a0;
typ = SEGV_MAPERR;
if (rv == ENOMEM) {
- printf("UVM: pid %d (%s), uid %d killed: "
+ printf("UVM: pid %u (%s), uid %u killed: "
"out of swap\n", p->p_pid, p->p_comm,
p->p_cred && p->p_ucred ?
p->p_ucred->cr_uid : -1);
@@ -1107,7 +1107,7 @@ unaligned_fixup(va, opcode, reg, p)
*/
if (doprint) {
uprintf(
- "pid %d (%s): unaligned access: va=0x%lx pc=0x%lx ra=0x%lx op=",
+ "pid %u (%s): unaligned access: va=0x%lx pc=0x%lx ra=0x%lx op=",
p->p_pid, p->p_comm, va,
p->p_md.md_tf->tf_regs[FRAME_PC] - 4,
p->p_md.md_tf->tf_regs[FRAME_RA]);
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index 6e1a631927c..d7c47cd016f 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.37 2002/05/16 21:11:13 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.38 2002/06/23 03:03:15 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */
/*
@@ -793,7 +793,7 @@ writeback(fp, docachepush)
(vaddr_t)&vmmap[NBPG]);
pmap_update(pmap_kernel());
} else
- printf("WARNING: pid %d(%s) uid %d: CPUSH not done\n",
+ printf("WARNING: pid %d(%s) uid %u: CPUSH not done\n",
p->p_pid, p->p_comm, p->p_ucred->cr_uid);
} else if ((f->f_ssw & (SSW4_RW|SSW4_TTMASK)) == SSW4_TTM16) {
/*
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 65b04845af1..383f981d1d8 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.37 2002/05/16 21:11:15 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.38 2002/06/23 03:03:15 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */
/*
@@ -731,7 +731,7 @@ writeback(fp, docachepush)
(vaddr_t)&vmmap[NBPG]);
pmap_update(pmap_kernel());
} else
- printf("WARNING: pid %d(%s) uid %d: CPUSH not done\n",
+ printf("WARNING: pid %d(%s) uid %u: CPUSH not done\n",
p->p_pid, p->p_comm, p->p_ucred->cr_uid);
} else if ((f->f_ssw & (SSW4_RW|SSW4_TTMASK)) == SSW4_TTM16) {
/*
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 750dbf02141..1878a24d631 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.45 2002/05/16 21:11:16 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.46 2002/06/23 03:03:15 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -734,7 +734,7 @@ writeback(fp, docachepush)
(vm_offset_t)&vmmap[NBPG]);
pmap_update(pmap_kernel());
} else
- printf("WARNING: pid %d(%s) uid %d: CPUSH not done\n",
+ printf("WARNING: pid %d(%s) uid %u: CPUSH not done\n",
p->p_pid, p->p_comm, p->p_ucred->cr_uid);
} else if ((f->f_ssw & (SSW4_RW|SSW4_TTMASK)) == SSW4_TTM16) {
/*
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index d3599549dfd..d38d59b694f 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.20 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: trap.c,v 1.21 2002/06/23 03:03:15 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
/*
@@ -890,7 +890,7 @@ kfault:
return;
}
if (rv == ENOMEM) {
- printf("UVM: pid %d (%s), uid %d killed: out of swap\n",
+ printf("UVM: pid %d (%s), uid %u killed: out of swap\n",
p->p_pid, p->p_comm,
p->p_cred && p->p_ucred ?
p->p_ucred->cr_uid : -1);
diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index 19d5f75218b..f94c29b3e0c 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.24 2002/05/16 21:11:19 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.25 2002/06/23 03:03:15 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -241,7 +241,7 @@ if(faultdebug)printf("trap accflt type %lx, code %lx, pc %lx, psl %lx\n",
(u_int)frame->pc, (u_int)frame->code);
}
if (rv == ENOMEM) {
- printf("UVM: pid %d (%s), uid %d killed: "
+ printf("UVM: pid %d (%s), uid %u killed: "
"out of swap\n",
p->p_pid, p->p_comm,
p->p_cred && p->p_ucred ?