sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Removed bogus calles to D() debugging function. Perhaps these should

Browse Source 
be replaced by DEBUG() calls?
(This used to be commit 33dd07d1fc)
This commit is contained in:
Tim Potter 2002-03-11 23:59:20 +00:00
parent 87bba35a62
commit 40976c3bc6
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/nsswitch/pam_winbind.c
View File

@ -245,8 +245,6 @@ int _winbind_read_password(pam_handle_t * pamh
const char *item;
char *token;
D(("called"));
/*
* make sure nothing inappropriate gets returned
*/
@ -502,8 +500,6 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
int retry = 0;
D(("called."));
/*
* First get the name of a user
*/
@ -523,15 +519,12 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
return retval;
}
D(("Got username of %s", user));
/*
* obtain and verify the current password (OLDAUTHTOK) for
* the user.
*/
if (flags & PAM_PRELIM_CHECK) {
D(("prelim check"));
/* instruct user what is happening */
#define greeting "Changing password for "
@ -565,7 +558,6 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
if (retval != PAM_ACCT_EXPIRED
&& retval != PAM_NEW_AUTHTOK_REQD
&& retval != PAM_SUCCESS) {
D(("Authentication failed"));
pass_old = NULL;
return retval;
}
@ -582,23 +574,18 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
* obtain the proposed password
*/
D(("do update"));
/*
* get the old token back.
*/
retval = pam_get_item(pamh, PAM_OLDAUTHTOK
,(const void **) &pass_old);
D(("pass_old [%s]", pass_old));
if (retval != PAM_SUCCESS) {
_pam_log(LOG_NOTICE, "user not authenticated");
return retval;
}
D(("get new password now"));
lctrl = ctrl;
if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) {
@ -626,8 +613,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
pass_old = NULL;/* tidy up */
return retval;
}
D(("returned to main routine"));
/*
* At this point we know who the user is and what they
* propose as their new password. Verify that the new
@ -652,7 +638,6 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
retval = PAM_SERVICE_ERR;
}
D(("retval was %d", retval));
return retval;
}