summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-06 20:42:04 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-06 20:42:04 +0000
commitca8943e6deefa16a3fc5c4d3b93d13b23d9dfc59 (patch)
tree9abb4939dbe74c8b29e35bc5ef25836a23140c17
parentabff1dd050ef0a275a67718b80bfae235f0264eb (diff)
- (bal) Corrected debug() in uidswap.c to match upstream.
-rw-r--r--ChangeLog4
-rw-r--r--uidswap.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73747b712..f7fa8c284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
45 [uidswap.c] 45 [uidswap.c]
46 format spec change/casts and some KNF; ok markus@ 46 format spec change/casts and some KNF; ok markus@
47 47
48 - (bal) Corrected debug() in uidswap.c to match upstream.
49
4820020604 5020020604
49 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 51 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
50 setsockopt from debug to error for now). 52 setsockopt from debug to error for now).
@@ -728,4 +730,4 @@
728 - (stevesk) entropy.c: typo in debug message 730 - (stevesk) entropy.c: typo in debug message
729 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 731 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
730 732
731$Id: ChangeLog,v 1.2156 2002/06/06 20:38:49 mouring Exp $ 733$Id: ChangeLog,v 1.2157 2002/06/06 20:42:04 mouring Exp $
diff --git a/uidswap.c b/uidswap.c
index af7e86e84..b35cb5b84 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -145,7 +145,7 @@ void
145permanently_set_uid(struct passwd *pw) 145permanently_set_uid(struct passwd *pw)
146{ 146{
147 if (temporarily_use_uid_effective) 147 if (temporarily_use_uid_effective)
148 fatal("restore_uid: temporarily_use_uid effective"); 148 fatal("permanently_set_uid: temporarily_use_uid effective");
149 if (setgid(pw->pw_gid) < 0) 149 if (setgid(pw->pw_gid) < 0)
150 fatal("setgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno)); 150 fatal("setgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
151 if (setuid(pw->pw_uid) < 0) 151 if (setuid(pw->pw_uid) < 0)