diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-12 05:32:27 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-12 05:32:27 +0000 |
| commit | e5691d44a8e4551abe6290b8994f6fc8568e5759 (patch) | |
| tree | 21b64c246e47de69c2e038a6e23c1528223f5fdb | |
| parent | 71ef4e018348df03bba429ebf4b323e35b773e86 (diff) | |
| download | samba-e5691d44a8e4551abe6290b8994f6fc8568e5759.tar.gz samba-e5691d44a8e4551abe6290b8994f6fc8568e5759.tar.bz2 samba-e5691d44a8e4551abe6290b8994f6fc8568e5759.zip | |
Merged John's changes.
Jeremy.
(This used to be commit add847778bf458238bf2a1b14ab71b8cdfd7aec0)
| -rw-r--r-- | source3/auth/pampass.c | 2 | ||||
| -rw-r--r-- | source3/lib/sysacls.c | 6 | ||||
| -rw-r--r-- | source3/passdb/pampass.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c index 90a6f773ce..204deaf8c7 100644 --- a/source3/auth/pampass.c +++ b/source3/auth/pampass.c @@ -180,6 +180,7 @@ static BOOL proc_pam_start(pam_handle_t **pamh, char *user) } #endif #ifdef PAM_TTY + DEBUG(4,("PAM: setting tty\n")); pam_error = pam_set_item(*pamh, PAM_TTY, "samba"); if (!pam_error_handler(*pamh, pam_error, "set tty failed", 0)) { proc_pam_end(*pamh); @@ -272,6 +273,7 @@ static BOOL pam_account(pam_handle_t *pamh, char * user, char * password) * exporting an AFS cell, be able to /write/ to this cell. */ + DEBUG(4,("PAM: Account Management SetCredentials for User: %s\n", user)); pam_error = pam_setcred(pamh, (PAM_ESTABLISH_CRED|PAM_SILENT)); if(!pam_error_handler(pamh, pam_error, "Set Credential Failure", 2)) { proc_pam_end(pamh); diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 59f8e2e043..2963049572 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -636,7 +636,7 @@ int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d) int sys_acl_valid(SMB_ACL_T acl_d) { - if (aclsort(acl_d->count, 0, acl_d->acl) != 0) { + if (aclsort(acl_d->count, 1, acl_d->acl) != 0) { errno = EINVAL; return -1; } @@ -726,7 +726,7 @@ int sys_acl_set_file(char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d) return -1; } - if (aclsort(acl_count, 0, acl_p) != 0) { + if (aclsort(acl_count, 1, acl_p) != 0) { errno = EINVAL; ret = -1; } else { @@ -742,7 +742,7 @@ int sys_acl_set_file(char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d) int sys_acl_set_fd(int fd, SMB_ACL_T acl_d) { - if (aclsort(acl_d->count, 0, acl_d->acl) != 0) { + if (aclsort(acl_d->count, 1, acl_d->acl) != 0) { errno = EINVAL; return -1; } diff --git a/source3/passdb/pampass.c b/source3/passdb/pampass.c index 90a6f773ce..204deaf8c7 100644 --- a/source3/passdb/pampass.c +++ b/source3/passdb/pampass.c @@ -180,6 +180,7 @@ static BOOL proc_pam_start(pam_handle_t **pamh, char *user) } #endif #ifdef PAM_TTY + DEBUG(4,("PAM: setting tty\n")); pam_error = pam_set_item(*pamh, PAM_TTY, "samba"); if (!pam_error_handler(*pamh, pam_error, "set tty failed", 0)) { proc_pam_end(*pamh); @@ -272,6 +273,7 @@ static BOOL pam_account(pam_handle_t *pamh, char * user, char * password) * exporting an AFS cell, be able to /write/ to this cell. */ + DEBUG(4,("PAM: Account Management SetCredentials for User: %s\n", user)); pam_error = pam_setcred(pamh, (PAM_ESTABLISH_CRED|PAM_SILENT)); if(!pam_error_handler(pamh, pam_error, "Set Credential Failure", 2)) { proc_pam_end(pamh); |