From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:44:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 874E216A423; Sat, 4 Feb 2006 18:44:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B1E216A420 for ; Sat, 4 Feb 2006 18:44:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F336543D4C for ; Sat, 4 Feb 2006 18:44:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14Ii3dh039081 for ; Sat, 4 Feb 2006 18:44:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Ii3DB039078 for perforce@freebsd.org; Sat, 4 Feb 2006 18:44:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 18:44:03 GMT Message-Id: <200602041844.k14Ii3DB039078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91091 Change 91091 by rwatson@rwatson_peppercorn on 2006/02/04 18:43:10 Rename audit functions to indicate that they are associated with login, so that when we add a logout function they are distinct. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#10 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#10 (text+ko) ==== @@ -300,19 +300,19 @@ pam_err = pam_start("login", username, &pamc, &pamh); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_start()"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_TTY)"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_RHOST, hostname); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_RHOST)"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } @@ -346,7 +346,7 @@ * We are not exiting here, but this corresponds to a failed * login event, so set exitstatus to 1. */ - au_fail("Login incorrect", 1); + au_login_fail("Login incorrect", 1); (void)printf("Login incorrect\n"); failures++; @@ -372,7 +372,7 @@ /* Audit successful login. */ if (auditsuccess) - au_success(); + au_login_success(); /* * Establish the login class. ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#3 (text+ko) ==== @@ -27,8 +27,8 @@ void login_fbtab(char *, uid_t, gid_t); -void au_success(void); -void au_fail(char *errmsg, int na); +void au_login_success(void); +void au_login_fail(char *errmsg, int na); extern char **environ; extern struct passwd *pwd; ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#3 (text+ko) ==== @@ -86,7 +86,7 @@ * login: header, subject, return. */ void -au_success(void) +au_login_success(void) { token_t *tok; int aufd; @@ -157,7 +157,7 @@ * login attempts: header, subject, text, return. */ void -au_fail(char *errmsg, int na) +au_login_fail(char *errmsg, int na) { token_t *tok; int aufd;