r2482: Fix from Arthur van Dongen <avdongen@xs4all.nl> to fix acces -> access typos.

Jeremy.
(This used to be commit a278dca1b2c103f368d154aee2d3a1edd5604687)

diff --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff
index 330b470af2cb0dba17e9f548ad5df5cfc8da8271..cf474c97d0093add256f1b294d7da05ca09171b3 100644 (file)
--- 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 de0738239c6cd71539016a995d3cfb7fdfba4f3c..64e21738221a38539fc8f019aae4a1694e5cae29 100644 (file)
--- 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 */