From f1c74ba219a1042784ef7532b4e75c7f13f21c32 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 25 Jul 2003 10:27:38 +0000
Subject: [PATCH] INTEGRATION: CWS crashrep10 (1.11.8); FILE MERGED 2003/07/24
 17:38:54 hro 1.11.8.1: #111037# Don't include UID in error report

---
 crashrep/source/unx/main.cxx | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 33b7081be6b1..8326f53f0dd5 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: main.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: hr $ $Date: 2003-07-16 17:11:57 $
+ *  last change: $Author: vg $ $Date: 2003-07-25 11:27:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -141,13 +141,6 @@ static const char *getlocale()
     return locale;
 }
 
-static const char *get_user_name()
-{
-    struct passwd *ppwd = getpwuid( getuid() );
-
-    return ppwd ? (ppwd->pw_name ? ppwd->pw_name : "") : "";
-}
-
 static const char *get_home_dir()
 {
     struct passwd *ppwd = getpwuid( getuid() );
@@ -301,7 +294,7 @@ bool write_report( const hash_map< string, string >& rSettings )
     fprintf( fp,
        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
        "<!DOCTYPE errormail:errormail PUBLIC \"-//OpenOffice.org//DTD ErrorMail 1.0//EN\" \"errormail.dtd\">\n"
-       "<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" uid=\"%s\" usertype=\"%s\">\n"
+       "<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" usertype=\"%s\">\n"
        "<reportmail:mail xmlns:reportmail=\"http://openoffice.org/2002/reportmail\" version=\"1.0\" feedback=\"%s\" email=\"%s\">\n"
        "<reportmail:title>%s</reportmail:title>\n"
        "<reportmail:attachment name=\"description.txt\" media-type=\"text/plain\" class=\"UserComment\"/>\n"
@@ -309,7 +302,6 @@ bool write_report( const hash_map< string, string >& rSettings )
        "</reportmail:mail>\n"
        "<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" exceptiontype=\"%d\" product=\"%s\" procpath=\"%s\"/>\n"
        ,
-       get_user_name(),
        pszUserType ? pszUserType : "",
        xml_encode(rSettings.find( "CONTACT" )->second).c_str(),
        xml_encode(rSettings.find( "EMAIL" )->second).c_str(),