*** sendmail.c-	Sat Apr 24 20:58:51 1999
--- sendmail.c	Sat Apr 24 23:36:32 1999
***************
*** 7,12 ****
--- 7,17 ----
  #include "env.h"
  #include "str.h"
  
+ #define PUT_SENDER /* by nagoya */
+ #ifdef PUT_SENDER /* by nagoya */
+ static void put_sender(void);
+ #endif
+ 
  void nomem()
  {
    substdio_putsflush(subfderr,"sendmail: fatal: out of memory\n");
***************
*** 123,129 ****
--- 128,150 ----
    for (i = 0;i < argc;++i) *arg++ = argv[i];
    *arg = 0;
   
+ #ifdef PUT_SENDER /* by nagoya */  
+   put_sender();
+ #endif
    execv(*qiargv,qiargv);
    substdio_putsflush(subfderr,"sendmail: fatal: unable to run qmail-inject\n");
    _exit(111);
  }
+ 
+ #ifdef PUT_SENDER /* by nagoya */
+ #include <pwd.h>
+ 
+ static void put_sender(void)
+ {
+   struct passwd *p;
+ 
+   if (env_get("LOGNAME") || !(p = getpwuid(getuid()))) return;
+   if (!env_put2("LOGNAME",p->pw_name)) nomem(); 
+ }
+ 
+ #endif