PERFORCE change 91091 for review

Robert Watson rwatson at FreeBSD.org
Sat Feb 4 10:44:05 PST 2006


http://perforce.freebsd.org/chv.cgi?CH=91091

Change 91091 by rwatson at 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;


More information about the p4-projects mailing list