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

Diff for /src/usr.bin/sudo/Attic/getspwuid.c between version 1.7 and 1.8

version 1.7, 2003/04/19 21:57:17 version 1.8, 2004/09/28 15:10:51
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 1996, 1998-2002 Todd C. Miller <Todd.Miller@courtesan.com>   * Copyright (c) 1996, 1998-2002 Todd C. Miller <Todd.Miller@courtesan.com>
  * All rights reserved.  
  *   *
  * Redistribution and use in source and binary forms, with or without   * Permission to use, copy, modify, and distribute this software for any
  * modification, are permitted provided that the following conditions   * purpose with or without fee is hereby granted, provided that the above
  * are met:   * copyright notice and this permission notice appear in all copies.
  *   *
  * 1. Redistributions of source code must retain the above copyright   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *    notice, this list of conditions and the following disclaimer.   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
    * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
    * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
    * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
    * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
    * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *   *
  * 2. Redistributions in binary form must reproduce the above copyright  
  *    notice, this list of conditions and the following disclaimer in the  
  *    documentation and/or other materials provided with the distribution.  
  *  
  * 3. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *  
  * 4. Products derived from this software may not be called "Sudo" nor  
  *    may "Sudo" appear in their names without specific prior written  
  *    permission from the author.  
  *  
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,  
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY  
  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL  
  * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR  
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF  
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
  *  
  * Sponsored in part by the Defense Advanced Research Projects   * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force   * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.   * Materiel Command, USAF, under agreement number F39502-99-1-0512.
Line 88 
Line 70 
 #include "sudo.h"  #include "sudo.h"
   
 #ifndef lint  #ifndef lint
 static const char rcsid[] = "$Sudo: getspwuid.c,v 1.63 2003/04/16 00:42:10 millert Exp $";  static const char rcsid[] = "$Sudo: getspwuid.c,v 1.65 2004/02/13 21:36:43 millert Exp $";
 #endif /* lint */  #endif /* lint */
   
 /*  /*
Line 100 
Line 82 
   
   
 /*  /*
  * Local functions not visible outside getspwuid.c  
  */  
 static struct passwd *sudo_pwdup        __P((struct passwd *));  
   
   
 /*  
  * Return a copy of the encrypted password for the user described by pw.   * Return a copy of the encrypted password for the user described by pw.
  * If shadow passwords are in use, look in the shadow file.   * If shadow passwords are in use, look in the shadow file.
  */   */
 char *  char *
 sudo_getepw(pw)  sudo_getepw(pw)
     struct passwd *pw;      const struct passwd *pw;
 {  {
     char *epw;      char *epw;
   
Line 199 
Line 175 
  * Dynamically allocate space for a struct password and the constituent parts   * Dynamically allocate space for a struct password and the constituent parts
  * that we care about.  Fills in pw_passwd from shadow file if necessary.   * that we care about.  Fills in pw_passwd from shadow file if necessary.
  */   */
 static struct passwd *  struct passwd *
 sudo_pwdup(pw)  sudo_pwdup(pw)
     struct passwd *pw;      const struct passwd *pw;
 {  {
     struct passwd *local_pw;      char *cp;
       const char *pw_passwd, *pw_shell;
       size_t nsize, psize, csize, gsize, dsize, ssize, total;
       struct passwd *newpw;
   
     /* Allocate space for a local copy of pw. */      /* Get shadow password if available. */
     local_pw = (struct passwd *) emalloc(sizeof(struct passwd));      pw_passwd = sudo_getepw(pw);
   
       /* If shell field is empty, expand to _PATH_BSHELL. */
       pw_shell = (pw->pw_shell == NULL || pw->pw_shell[0] == '\0')
           ? _PATH_BSHELL : pw->pw_shell;
   
       /* Allocate in one big chunk for easy freeing. */
       nsize = psize = csize = gsize = dsize = ssize = 0;
       total = sizeof(struct passwd);
       if (pw->pw_name) {
               nsize = strlen(pw->pw_name) + 1;
               total += nsize;
       }
       if (pw_passwd) {
               psize = strlen(pw_passwd) + 1;
               total += psize;
       }
   #ifdef HAVE_LOGIN_CAP_H
       if (pw->pw_class) {
               csize = strlen(pw->pw_class) + 1;
               total += csize;
       }
   #endif
       if (pw->pw_gecos) {
               gsize = strlen(pw->pw_gecos) + 1;
               total += gsize;
       }
       if (pw->pw_dir) {
               dsize = strlen(pw->pw_dir) + 1;
               total += dsize;
       }
       if (pw_shell) {
               ssize = strlen(pw_shell) + 1;
               total += ssize;
       }
       if ((cp = malloc(total)) == NULL)
               return (NULL);
       newpw = (struct passwd *)cp;
   
     /*      /*
      * Copy the struct passwd and the interesting strings...       * Copy in passwd contents and make strings relative to space
        * at the end of the buffer.
      */       */
     (void) memcpy(local_pw, pw, sizeof(struct passwd));      (void)memcpy(newpw, pw, sizeof(struct passwd));
     local_pw->pw_name = estrdup(pw->pw_name);      cp += sizeof(struct passwd);
     local_pw->pw_dir = estrdup(pw->pw_dir);      if (nsize) {
     local_pw->pw_gecos = estrdup(pw->pw_gecos);              (void)memcpy(cp, pw->pw_name, nsize);
               newpw->pw_name = cp;
               cp += nsize;
       }
       if (psize) {
               (void)memcpy(cp, pw_passwd, psize);
               newpw->pw_passwd = cp;
               cp += psize;
       }
 #ifdef HAVE_LOGIN_CAP_H  #ifdef HAVE_LOGIN_CAP_H
     local_pw->pw_class = estrdup(pw->pw_class);      if (csize) {
               (void)memcpy(cp, pw->pw_class, csize);
               newpw->pw_class = cp;
               cp += csize;
       }
 #endif  #endif
       if (gsize) {
               (void)memcpy(cp, pw->pw_gecos, gsize);
               newpw->pw_gecos = cp;
               cp += gsize;
       }
       if (dsize) {
               (void)memcpy(cp, pw->pw_dir, dsize);
               newpw->pw_dir = cp;
               cp += dsize;
       }
       if (ssize) {
               (void)memcpy(cp, pw_shell, ssize);
               newpw->pw_shell = cp;
               cp += ssize;
       }
   
     /* If shell field is empty, expand to _PATH_BSHELL. */      return (newpw);
     if (local_pw->pw_shell[0] == '\0')  
         local_pw->pw_shell = _PATH_BSHELL;  
     else  
         local_pw->pw_shell = estrdup(pw->pw_shell);  
   
     /* pw_passwd gets a shadow password if applicable */  
     local_pw->pw_passwd = sudo_getepw(pw);  
   
     return(local_pw);  
 }  }
   
 /*  /*
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8