[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3818-g543dfdc

[Günther Deschner]

The branch, v3-devel has been updated
       via  543dfdc1cf6baf60bffc23c6aebc542fd58d2d2e (commit)
       via  4661ef625a6522d6f859b83e3e3702f01d0b952f (commit)
      from  010c7101e59477f0d5f3bf11c17f474ec6f79cc1 (commit)

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


- Log -----------------------------------------------------------------
commit 543dfdc1cf6baf60bffc23c6aebc542fd58d2d2e
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 25 11:37:57 2008 +0200

    winbindd: only create machine pwd change event when in primary domain child.
    
    Guenther

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

    auth: Fix build warning.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 58921bd..9345eed 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -63,6 +63,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.
@@ -327,7 +328,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;
 				}
@@ -355,7 +356,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
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index d958ed0..916e8c0 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1243,7 +1243,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 			child);
 	}
 
-	if (child->domain && !(child->domain->internal) &&
+	if (child->domain && child->domain->primary &&
 	    lp_server_role() == ROLE_DOMAIN_MEMBER) {
 
 		struct timeval next_change;


-- 
Samba Shared Repository