Attachment 3156 Details for Bug 3617 – Proper patch.

[patch] Proper patch.

look (text/plain), 1.81 KB, created by Jeremy Allison on 2008-02-29 07:50:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-02-29 07:50:43 UTC

Size: 1.81 KB

patch

obsolete

>diff --git a/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c
>index f9cbcf4..6570fd4 100644
>--- a/source/nmbd/nmbd_namelistdb.c
>+++ b/source/nmbd/nmbd_namelistdb.c
>@@ -297,7 +297,6 @@ void standard_success_register(struct subnet_record *subrec,
>  ******************************************************************/
> 
> void standard_fail_register( struct subnet_record   *subrec,
>-                             struct response_record *rrec,
>                              struct nmb_name        *nmbname )
> {
> 	struct name_record *namerec;
>diff --git a/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c
>index edcf258..98f129a 100644
>--- a/source/nmbd/nmbd_nameregister.c
>+++ b/source/nmbd/nmbd_nameregister.c
>@@ -152,10 +152,11 @@ static void register_name_response(struct subnet_record *subrec,
> 		if( rrec->success_fn)
> 			(*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, register_ip);
> 	} else {
>+		struct nmb_name qname = *question_name;
> 		if( rrec->fail_fn)
> 			(*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
> 		/* Remove the name. */
>-		standard_fail_register( subrec, rrec, question_name);
>+		standard_fail_register( subrec, &qname);
> 	}
> 
> 	/* Ensure we don't retry. */
>@@ -280,10 +281,11 @@ static void register_name_timeout_response(struct subnet_record *subrec,
> 		if( rrec->success_fn)
> 			(*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
> 	} else {
>+		struct nmb_name qname = *question_name;
> 		if( rrec->fail_fn)
> 			(*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
> 		/* Remove the name. */
>-		standard_fail_register( subrec, rrec, question_name);
>+		standard_fail_register( subrec, &qname);
> 	}
> 
> 	/* Ensure we don't retry. */

Actions: View

Attachments on bug 3617: 1812 | 1844 | 1969 | 2915 | 2916 | 2917 | 3021 | 3065 | 3066 | 3070 | 3086 | 3154 | 3155 | 3156 | 3157