*** sbr/addrsbr.c.orig	Wed Aug  5 15:48:34 1998
--- sbr/addrsbr.c	Wed Aug  5 15:59:31 1998
***************
*** 303,308 ****
--- 303,326 ----
      return buffer;
  }
  
+ /*
+  * getmailname: will do a check for alternatives to the username.
+  */
+ 
+ char *
+ getmailname (void)
+ {
+ #ifdef QMAIL
+ 
+ 	if ( getenv("QMAILUSER") )
+ 		return( getenv ("QMAILUSER") );
+ 
+ #endif /* QMAIL */
+ 
+ /* Add any other checks needed here */
+ 
+ 	return ( getusername() );
+ }
  
  /*
   * address specific "sprintf"
***************
*** 315,324 ****
  
      if (local == NULL)
  #ifdef REALLYDUMB
! 	return getusername ();
      else
  #endif /* REALLYDUMB */
! 	local = getusername ();
  
      if (domain == NULL)
  #ifdef REALLYDUMB
--- 333,342 ----
  
      if (local == NULL)
  #ifdef REALLYDUMB
! 	return getmailname ();
      else
  #endif /* REALLYDUMB */
! 	local = getmailname ();
  
      if (domain == NULL)
  #ifdef REALLYDUMB