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 | add847778bf458238bf2a1b14ab71b8cdfd7aec0 (patch) | |
| tree | 75f9a26ed21556da068ed788cabfd9bf0dca6903 | |
| parent | be45c82c3ab3b626cd761f2cec3b160df2b7fcac (diff) | |
| download | samba-add847778bf458238bf2a1b14ab71b8cdfd7aec0.tar.gz samba-add847778bf458238bf2a1b14ab71b8cdfd7aec0.tar.xz samba-add847778bf458238bf2a1b14ab71b8cdfd7aec0.zip | |
Merged John's changes.
Jeremy.
| -rw-r--r-- | source/auth/pampass.c | 2 | ||||
| -rw-r--r-- | source/lib/sysacls.c | 6 | ||||
| -rw-r--r-- | source/passdb/pampass.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source/auth/pampass.c b/source/auth/pampass.c index 90a6f773ced..204deaf8c76 100644 --- a/source/auth/pampass.c +++ b/source/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/source/lib/sysacls.c b/source/lib/sysacls.c index 59f8e2e043f..29630495725 100644 --- a/source/lib/sysacls.c +++ b/source/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/source/passdb/pampass.c b/source/passdb/pampass.c index 90a6f773ced..204deaf8c76 100644 --- a/source/passdb/pampass.c +++ b/source/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); |