- markus@cvs.openbsd.org 2006/06/06 10:20:20

     [readpass.c sshconnect.c sshconnect.h sshconnect2.c uidswap.c]
     replace remaining setuid() calls with permanently_set_uid() and
     check seteuid() return values; report Marcus Meissner; ok dtucker djm

1 files changed, 3 insertions, 1 deletions

diff --git a/uidswap.c b/uidswap.c
index 6dc1680db..ba2d20942 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uidswap.c,v 1.27 2006/04/22 04:06:51 djm Exp $ */
+/* $OpenBSD: uidswap.c,v 1.28 2006/06/06 10:20:20 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -169,6 +169,8 @@ permanently_set_uid(struct passwd *pw)
         uid_t old_uid = getuid();
         gid_t old_gid = getgid();
 
+        if (pw == NULL)
+                fatal("permanently_set_uid: no user given");
         if (temporarily_use_uid_effective)
                 fatal("permanently_set_uid: temporarily_use_uid effective");
         debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid,