From owner-svn-src-all@FreeBSD.ORG Sun Apr 19 23:34:22 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AACB51065672; Sun, 19 Apr 2009 23:34:22 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 986258FC17; Sun, 19 Apr 2009 23:34:22 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3JNYMZY024224; Sun, 19 Apr 2009 23:34:22 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JNYMKN024223; Sun, 19 Apr 2009 23:34:22 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200904192334.n3JNYMKN024223@svn.freebsd.org> From: Robert Watson Date: Sun, 19 Apr 2009 23:34:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191297 - head/usr.bin/login X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2009 23:34:23 -0000 Author: rwatson Date: Sun Apr 19 23:34:22 2009 New Revision: 191297 URL: http://svn.freebsd.org/changeset/base/191297 Log: Pass int arguments to auditon(2)'s A_GETCOND API rather than long arguments. This change should be MFC'd with OpenBSM 1.1 since they are interdependent. MFC after: 2 weeks Obtained from: TrustedBSD Project Sponsored by: Apple, Inc. Modified: head/usr.bin/login/login_audit.c Modified: head/usr.bin/login/login_audit.c ============================================================================== --- head/usr.bin/login/login_audit.c Sun Apr 19 23:28:08 2009 (r191296) +++ head/usr.bin/login/login_audit.c Sun Apr 19 23:34:22 2009 (r191297) @@ -67,10 +67,10 @@ au_login_success(void) uid_t uid = pwd->pw_uid; gid_t gid = pwd->pw_gid; pid_t pid = getpid(); - long au_cond; + int au_cond; /* If we are not auditing, don't cut an audit record; just return. */ - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { if (errno == ENOSYS) return; errx(1, "login: Could not determine audit condition"); @@ -115,13 +115,13 @@ au_login_fail(const char *errmsg, int na { token_t *tok; int aufd; - long au_cond; + int au_cond; uid_t uid; gid_t gid; pid_t pid = getpid(); /* If we are not auditing, don't cut an audit record; just return. */ - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { if (errno == ENOSYS) return; errx(1, "login: Could not determine audit condition"); @@ -175,10 +175,10 @@ audit_logout(void) uid_t uid = pwd->pw_uid; gid_t gid = pwd->pw_gid; pid_t pid = getpid(); - long au_cond; + int au_cond; /* If we are not auditing, don't cut an audit record; just return. */ - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (auditon(A_GETCOND, &au_cond, sizeof(int)) < 0) { if (errno == ENOSYS) return; errx(1, "login: Could not determine audit condition");