[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  21c8fa25 Fix bug #9085 - NMB registration for a duplicate workstation fails with registration refuse
      from  6b7a9910 s3-torture: Allow vfstest to set ACLs on a directory

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 21c8fa2566eb2b5a8e1e5c727b22f56479a3da46
Author: S Hargagan <shargagan at novell.com>
Date:   Thu Aug 16 16:27:10 2012 -0700

    Fix bug #9085 - NMB registration for a duplicate workstation fails with registration refuse
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Aug 17 04:15:21 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/nmbd/nmbd_winsserver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index d56d0f8..6524284 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -1038,7 +1038,7 @@ static void wins_register_query_success(struct subnet_record *subrec,
 	DEBUG(3,("wins_register_query_success: Original client at IP %s still wants the \
 name %s. Rejecting registration request.\n", inet_ntoa(ip), nmb_namestr(question_name) ));
 
-	send_wins_name_registration_response(RFS_ERR, 0, orig_reg_packet);
+	send_wins_name_registration_response(ACT_ERR, 0, orig_reg_packet);
 
 	orig_reg_packet->locked = False;
 	free_packet(orig_reg_packet);


-- 
Samba Shared Repository