[BACK]Return to uidswap.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/uidswap.c between version 1.24.10.1 and 1.25

version 1.24.10.1, 2006/10/06 03:19:33 version 1.25, 2006/03/19 18:51:19
Line 1 
Line 1 
 /* $OpenBSD$ */  
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
Line 12 
Line 11 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  */   */
   
 #include <sys/param.h>  #include "includes.h"
 #include <errno.h>  
 #include <pwd.h>  
 #include <string.h>  
 #include <unistd.h>  
 #include <stdarg.h>  
   
 #include "log.h"  #include "log.h"
 #include "uidswap.h"  #include "uidswap.h"
Line 120 
Line 114 
                 fatal("permanently_set_uid: temporarily_use_uid effective");                  fatal("permanently_set_uid: temporarily_use_uid effective");
         debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid,          debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid,
             (u_int)pw->pw_gid);              (u_int)pw->pw_gid);
         if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0)          if (setegid(pw->pw_gid) < 0)
                 fatal("setresgid %u: %s", (u_int)pw->pw_gid, strerror(errno));                  fatal("setegid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
         if (setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) != 0)          if (setgid(pw->pw_gid) < 0)
                 fatal("setresuid %u: %s", (u_int)pw->pw_uid, strerror(errno));                  fatal("setgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
 }          if (seteuid(pw->pw_uid) < 0)
                   fatal("seteuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno));
 void          if (setuid(pw->pw_uid) < 0)
 permanently_drop_suid(uid_t uid)                  fatal("setuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno));
 {  
         debug("permanently_drop_suid: %u", (u_int)uid);  
         if (setresuid(uid, uid, uid) != 0)  
                 fatal("setresuid %u: %s", (u_int)uid, strerror(errno));  
 }  }

Legend:
Removed from v.1.24.10.1  
changed lines
  Added in v.1.25