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

be replaced by DEBUG() calls?
(This used to be commit 33dd07d1fc6946e53d3bdaad025adfc20abfab77)

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index cc259ab041f3aba1c151f396fd6130515e745b54..7de553da4d67531de54c3cef8c75f761b95e1c50 100644 (file)
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -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;
 }