s3: Fix some nonemtpy blank lines
authorVolker Lendecke <vl@samba.org>
Sun, 22 Aug 2010 16:41:39 +0000 (18:41 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 22 Aug 2010 20:42:21 +0000 (22:42 +0200)
source3/auth/pampass.c
source3/lib/pam_errors.c

index 6c7294dd8b600149fa29d7cfcd5bf67200d238c5..50bfec1a0c9fcccc9a8ed05f08f5ab6edb5d8971 100644 (file)
@@ -5,17 +5,17 @@
    Copyright (C) John H Terpsta 1999-2001
    Copyright (C) Andrew Bartlett 2001
    Copyright (C) Jeremy Allison 2001
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -75,7 +75,6 @@ static bool smb_pam_error_handler(pam_handle_t *pamh, int pam_error, const char
        if( pam_error != PAM_SUCCESS) {
                DEBUG(dbglvl, ("smb_pam_error_handler: PAM: %s : %s\n",
                                msg, pam_strerror(pamh, pam_error)));
-               
                return False;
        }
        return True;
@@ -280,7 +279,7 @@ static int smb_pam_passchange_conv(int num_msg,
        struct chat_struct *t;
        bool found; 
        *resp = NULL;
-       
+
        DEBUG(10,("smb_pam_passchange_conv: starting converstation for %d messages\n", num_msg));
 
        if (num_msg <= 0)
@@ -365,7 +364,7 @@ static int smb_pam_passchange_conv(int num_msg,
                                }
                        }
                        /* PAM frees resp */
-                       
+
                        if (!found) {
                                DEBUG(3,("smb_pam_passchange_conv: Could not find reply for PAM prompt: %s\n",msg[replies]->msg));
                                free_pw_chat(pw_chat);
@@ -382,7 +381,7 @@ static int smb_pam_passchange_conv(int num_msg,
                        reply[replies].resp_retcode = PAM_SUCCESS;
                        reply[replies].resp = NULL;
                        break;
-                       
+
                default:
                        /* Must be an error of some sort... */
                        free_pw_chat(pw_chat);
@@ -390,7 +389,7 @@ static int smb_pam_passchange_conv(int num_msg,
                        return PAM_CONV_ERR;
                }
        }
-               
+
        free_pw_chat(pw_chat);
        if (reply)
                *resp = reply;
@@ -443,7 +442,7 @@ static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
        int pam_error;
 
        smb_free_pam_conv(smb_pam_conv_ptr);
-       
+
        if( pamh != NULL ) {
                pam_error = pam_end(pamh, 0);
                if(smb_pam_error_handler(pamh, pam_error, "End Cleanup Failed", 2) == True) {
@@ -520,7 +519,7 @@ static NTSTATUS smb_pam_auth(pam_handle_t *pamh, const char *user)
         * To enable debugging set in /etc/pam.d/samba:
         *      auth required /lib/security/pam_pwdb.so nullok shadow audit
         */
-       
+
        DEBUG(4,("smb_pam_auth: PAM: Authenticate User: %s\n", user));
        pam_error = pam_authenticate(pamh, PAM_SILENT | lp_null_passwords() ? 0 : PAM_DISALLOW_NULL_AUTHTOK);
        switch( pam_error ){
index 1073f269e562e64a7c89bcd48f16ebf099c6dbde..e55d7a0415f87191b6c861140aeb46aae5656287 100644 (file)
@@ -92,7 +92,7 @@ NTSTATUS pam_to_nt_status(int pam_error)
 {
        int i;
        if (pam_error == 0) return NT_STATUS_OK;
-       
+
        for (i=0; NT_STATUS_V(pam_to_nt_status_map[i].ntstatus); i++) {
                if (pam_error == pam_to_nt_status_map[i].pam_code)
                        return pam_to_nt_status_map[i].ntstatus;
@@ -107,7 +107,7 @@ int nt_status_to_pam(NTSTATUS nt_status)
 {
        int i;
        if NT_STATUS_IS_OK(nt_status) return PAM_SUCCESS;
-       
+
        for (i=0; NT_STATUS_V(nt_status_to_pam_map[i].ntstatus); i++) {
                if (NT_STATUS_EQUAL(nt_status,nt_status_to_pam_map[i].ntstatus))
                        return nt_status_to_pam_map[i].pam_code;