summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2010-04-28 16:56:01 +0000
committerjsing <jsing@openbsd.org>2010-04-28 16:56:01 +0000
commit0d8933669d45e37fbf589bd01bdf9c85c3763bcf (patch)
treeb137d7edccd65a5b7355abfd1eaad710d9fb57f2
parentDo not modify hardware interrupt mask when establishing a soft interrupt (diff)
downloadwireguard-openbsd-0d8933669d45e37fbf589bd01bdf9c85c3763bcf.tar.xz
wireguard-openbsd-0d8933669d45e37fbf589bd01bdf9c85c3763bcf.zip
When restoring a disklabel do not restore the uid. Let the kernel allocate
a new uid instead. ok krw@ marco@
-rw-r--r--sbin/disklabel/disklabel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 1f36757be4e..feb74595a56 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.162 2010/04/28 12:55:55 jsing Exp $ */
+/* $OpenBSD: disklabel.c,v 1.163 2010/04/28 16:56:01 jsing Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -270,6 +270,7 @@ main(int argc, char *argv[])
if (!(t = fopen(argv[1], "r")))
err(4, "%s", argv[1]);
error = getasciilabel(t, lp);
+ bzero(lp->d_uid, sizeof(lp->d_uid));
if (error == 0)
error = writelabel(f, bootarea, lp);
fclose(t);