[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-59-gd0c0fc9

[Günther Deschner]

The branch, v3-0-test has been updated
       via  d0c0fc92cd6c7549e190669aeaa605a0d436cf31 (commit)
      from  feef594d275881466e2c3f59c0ff54609a9cc53b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit d0c0fc92cd6c7549e190669aeaa605a0d436cf31
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 25 11:36:56 2008 +0200

    auth: Fix build warning.
    
    Guenther
    (cherry picked from commit 4661ef625a6522d6f859b83e3e3702f01d0b952f)
    (cherry picked from commit 60649a74cdf2594bc89c301025f86d23caba91c2)

-----------------------------------------------------------------------

Summary of changes:
 source/auth/pampass.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index ba11d2e..a1455e6 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -60,6 +60,7 @@ typedef int (*smb_pam_conv_fn)(int, const struct pam_message **, struct pam_resp
  *  Macros to help make life easy
  */
 #define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
 
 /*******************************************************************
  PAM error handler.
@@ -317,7 +318,7 @@ static int smb_pam_passchange_conv(int num_msg,
 					DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We actualy sent: %s\n", current_reply));
 #endif
 					reply[replies].resp_retcode = PAM_SUCCESS;
-					reply[replies].resp = COPY_STRING(current_reply);
+					reply[replies].resp = COPY_FSTRING(current_reply);
 					found = True;
 					break;
 				}
@@ -345,7 +346,7 @@ static int smb_pam_passchange_conv(int num_msg,
 					DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
 					pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
 					reply[replies].resp_retcode = PAM_SUCCESS;
-					reply[replies].resp = COPY_STRING(current_reply);
+					reply[replies].resp = COPY_FSTRING(current_reply);
 #ifdef DEBUG_PASSWORD
 					DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
 #endif


-- 
Samba Shared Repository