summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-09-22 00:50:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:45 -0500
commit772c250250f567d9a2429bc619a211f74dee2ef4 (patch)
tree677c7ceb6ba4cdbfe1a6c9a11931d7c5693ce0d0
parent75ea9982fb82b5c20f54910926901057b56acdc5 (diff)
downloadsamba-772c250250f567d9a2429bc619a211f74dee2ef4.tar.gz
samba-772c250250f567d9a2429bc619a211f74dee2ef4.tar.bz2
samba-772c250250f567d9a2429bc619a211f74dee2ef4.zip
r2482: Fix from Arthur van Dongen <avdongen@xs4all.nl> to fix acces -> access typos.
Jeremy. (This used to be commit a278dca1b2c103f368d154aee2d3a1edd5604687)
-rw-r--r--packaging/SuSE/samba3-vscan.diff6
-rw-r--r--source3/nsswitch/pam_winbind.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff
index 330b470af2..cf474c97d0 100644
--- a/packaging/SuSE/samba3-vscan.diff
+++ b/packaging/SuSE/samba3-vscan.diff
@@ -18,7 +18,7 @@
- lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
+ lrufiles_add(filepath, stat_buf.st_mtime, True);
- /* virus found, deny acces */
+ /* virus found, deny access */
errno = EACCES;
return -1;
} else if ( retval == 0 ) {
@@ -68,7 +68,7 @@
- lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
+ lrufiles_add(filepath, stat_buf.st_mtime, True);
- /* virus found, deny acces */
+ /* virus found, deny access */
errno = EACCES;
return -1;
} else if ( retval == 0 ) {
@@ -197,7 +197,7 @@
- lrufiles_add(filepath, stat_buf.st_mtime, TRUE);
+ lrufiles_add(filepath, stat_buf.st_mtime, True);
- /* virus found, deny acces */
+ /* virus found, deny access */
errno = EACCES;
return -1;
} else if ( retval == 0 ) {
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index de0738239c..64e2173822 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -176,7 +176,7 @@ static int pam_winbind_request_log(enum winbindd_cmd req_type,
case PAM_SUCCESS:
if (req_type == WINBINDD_PAM_AUTH) {
/* Otherwise, the authentication looked good */
- _pam_log(LOG_NOTICE, "user '%s' granted acces", user);
+ _pam_log(LOG_NOTICE, "user '%s' granted access", user);
} else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
/* Otherwise, the authentication looked good */
_pam_log(LOG_NOTICE, "user '%s' password changed", user);
@@ -551,7 +551,7 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
return PAM_USER_UNKNOWN;
case 0:
/* Otherwise, the authentication looked good */
- _pam_log(LOG_NOTICE, "user '%s' granted acces", username);
+ _pam_log(LOG_NOTICE, "user '%s' granted access", username);
return PAM_SUCCESS;
default:
/* we don't know anything about this return value */