From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/2817 Path: news.gmane.org!not-for-mail From: Chris Spiegel Newsgroups: gmane.linux.lib.musl.general Subject: Fix for fields in utmp Date: Wed, 20 Feb 2013 10:23:09 -0800 Message-ID: <5125148D.8080205@gmail.com> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060400080806070500090001" X-Trace: ger.gmane.org 1361384604 3498 80.91.229.3 (20 Feb 2013 18:23:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 20 Feb 2013 18:23:24 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-2818-gllmg-musl=m.gmane.org@lists.openwall.com Wed Feb 20 19:23:46 2013 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1U8EKV-0005WX-Im for gllmg-musl@plane.gmane.org; Wed, 20 Feb 2013 19:23:43 +0100 Original-Received: (qmail 19547 invoked by uid 550); 20 Feb 2013 18:23:23 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 19539 invoked from network); 20 Feb 2013 18:23:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=S4BCe0gG+HmXj4PhQTXxGkrRp+esIcJLhBKC3C8KPpI=; b=OXvmykpimwcPNy17rXAmLtBVFHApU68aeIDdVILQDKcN5Rg7hFdJORyIcDjUy2Hz5g BUwxgTdd0fHtLqtBQw0Z/Epl9d6lWy2zWE03EzasjoUwJ2a0fC+kRVbhTxCsKw9hTKjt xk6w0WZUFeBeos6PZc4pgU/vBCMDIG9XhdohX/q8PKtvlLL63Yyz5tbYTezPSW19JJVr cBlIu9YQeJ9OakJaEdBQgdIPtr09rQp7q6cq/fH7KDuCFZJFkUPIM2NoBtv7XaSCtmGX P8M/IPmmge3Lj5qUxUtpFEVSO+GZoQV1M2nG1w7z02HyJOZmoolOeJCP/torljOzDMhx yoHg== X-Received: by 10.68.189.99 with SMTP id gh3mr3872893pbc.203.1361384590609; Wed, 20 Feb 2013 10:23:10 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130109 Thunderbird/17.0.2 Xref: news.gmane.org gmane.linux.lib.musl.general:2817 Archived-At: This is a multi-part message in MIME format. --------------060400080806070500090001 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit The utmp.h header defines a few macros to access __ut_exit in the utmpx struct; however, the underscores were removed in utmpx, so the macros now point to non-existent struct members. Attached is a simple patch which removes them. Chris --------------060400080806070500090001 Content-Type: text/plain; charset=UTF-8; name="no-private-utmp-names.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="no-private-utmp-names.diff" diff --git a/include/utmp.h b/include/utmp.h index b145a11..c24d0a8 100644 --- a/include/utmp.h +++ b/include/utmp.h @@ -19,9 +19,6 @@ struct lastlog { #define ut_time ut_tv.tv_sec #define ut_name ut_user -#define ut_exit __ut_exit -#define e_termination __e_termination -#define e_exit __e_exit #define utmp utmpx #define utmpname(x) (-1) --------------060400080806070500090001--