[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  30567b8 s3: Fix bug #9085.
      from  3844438 Fix bug #9100 - winbind doesn't return "Domain Local" groups from own domain.

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


- Log -----------------------------------------------------------------
commit 30567b8f9bc0f5a39a3a65039277aa5f839622cd
Author: hargagan <shargagan at novell.com>
Date:   Tue Aug 28 09:29:52 2012 +0200

    s3: Fix bug #9085.
    
    NMB registration for a duplicate workstation fails with registration refuse.
    (cherry picked from commit 71c4227fd0a741984fb273ad1973ad1724ecb04b)

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

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 0a5b1c8..20436c5 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -1014,7 +1014,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