clean up group handling for sender & envelope addresses

[unix-history] / usr / src / usr.sbin / sendmail / src / recipient.c

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index f48b1c9..376f99a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,11 +7,10 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        8.75 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        8.76 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"

-# include <pwd.h>

 
 /*
 **  SENDTOLIST -- Designate a send list.
 
 /*
 **  SENDTOLIST -- Designate a send list.


@@ -630,8 +629,6 @@ finduser(name, fuzzyp)
 {
        register struct passwd *pw;
        register char *p;
 {
        register struct passwd *pw;
        register char *p;

-       extern struct passwd *getpwent();
-       extern struct passwd *getpwnam();

 
        if (tTd(29, 4))
                printf("finduser(%s): ", name);
 
        if (tTd(29, 4))
                printf("finduser(%s): ", name);


@@ -652,7 +649,7 @@ finduser(name, fuzzyp)
 #endif
 
        /* look up this login name using fast path */
 #endif
 
        /* look up this login name using fast path */

-       if ((pw = getpwnam(name)) != NULL)
+       if ((pw = sm_getpwnam(name)) != NULL)

        {
                if (tTd(29, 4))
                        printf("found (non-fuzzy)\n");
        {
                if (tTd(29, 4))
                        printf("found (non-fuzzy)\n");


@@ -1008,7 +1005,7 @@ resetuid:
        {
                register struct passwd *pw;
 
        {
                register struct passwd *pw;
 

-               pw = getpwuid(st.st_uid);
+               pw = sm_getpwuid(st.st_uid);

                if (pw == NULL)
                        ctladdr->q_flags |= QBOGUSSHELL;
                else
                if (pw == NULL)
                        ctladdr->q_flags |= QBOGUSSHELL;
                else