sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r21122: Simplify code in pam_winbind a bit.

Browse Source 
Guenther
(This used to be commit 08ca5ea6f1b09506055b2508aa79704f39b3bbd7)
This commit is contained in:
Günther Deschner 2007-02-02 13:03:06 +00:00 committed by Gerald (Jerry) Carter
parent fd0f2e20ee
commit 48191ddec6
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source3/nsswitch/pam_winbind.c
View File

@ -1593,20 +1593,19 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags,
ZERO_STRUCT(response);
retval = pam_get_user(pamh, &user, "Username: ");
if (retval == PAM_SUCCESS) {
if (user == NULL) {
_pam_log(pamh, ctrl, LOG_ERR, "username was NULL!");
retval = PAM_USER_UNKNOWN;
goto out;
}
if (retval == PAM_SUCCESS) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "username [%s] obtained", user);
}
} else {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "could not identify user");
if (retval) {
_pam_log(pamh, ctrl, LOG_ERR, "could not identify user");
goto out;
}
if (user == NULL) {
_pam_log(pamh, ctrl, LOG_ERR, "username was NULL!");
retval = PAM_USER_UNKNOWN;
goto out;
}
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "username [%s] obtained", user);
ccname = pam_getenv(pamh, "KRB5CCNAME");
if (ccname == NULL) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "user has no KRB5CCNAME environment");
@ -1677,22 +1676,20 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
* First get the name of a user
*/
ret = pam_get_user(pamh, &user, "Username: ");
if (ret == PAM_SUCCESS) {
if (user == NULL) {
_pam_log(pamh, ctrl, LOG_ERR, "username was NULL!");
ret = PAM_USER_UNKNOWN;
goto out;
}
if (ret == PAM_SUCCESS) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "username [%s] obtained",
user);
}
} else {
_pam_log_debug(pamh, ctrl, LOG_DEBUG,
if (ret) {
_pam_log(pamh, ctrl, LOG_ERR,
"password - could not identify user");
goto out;
}
if (user == NULL) {
_pam_log(pamh, ctrl, LOG_ERR, "username was NULL!");
ret = PAM_USER_UNKNOWN;
goto out;
}
_pam_log_debug(pamh, ctrl, LOG_DEBUG, "username [%s] obtained", user);
/* check if this is really a user in winbindd, not only in NSS */
ret = valid_user(pamh, ctrl, user);
switch (ret) {