diff options
| -rw-r--r-- | source3/nmbd/nmbd_namequery.c | 8 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_nameregister.c | 8 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_namerelease.c | 8 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_nodestatus.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/source3/nmbd/nmbd_namequery.c b/source3/nmbd/nmbd_namequery.c index 66af796b6f..b497526475 100644 --- a/source3/nmbd/nmbd_namequery.c +++ b/source3/nmbd/nmbd_namequery.c @@ -121,9 +121,9 @@ static void query_name_response( struct subnet_record *subrec, } if(success && rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, question_name, answer_ip, nmb->answers); + (*(query_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, answer_ip, nmb->answers); else if( rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, question_name, nmb->header.rcode); + (*(query_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name, nmb->header.rcode); } @@ -156,7 +156,7 @@ static void query_name_timeout_response(struct subnet_record *subrec, dbgtext( "on subnet %s.\n", subrec->subnet_name ); } if(rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, question_name, 0); + (*(query_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name, 0); } remove_response_record(subrec, rrec); @@ -242,7 +242,7 @@ BOOL query_name(struct subnet_record *subrec, char *name, int type, /* Call the success function directly. */ if(success_fn) - (*success_fn)(subrec, userdata, &nmbname, namerec->data.ip[0], &rrec); + (*(query_name_success_function)success_fn)(subrec, userdata, &nmbname, namerec->data.ip[0], &rrec); return False; } diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c index 8805728737..6d4d66cbef 100644 --- a/source3/nmbd/nmbd_nameregister.c +++ b/source3/nmbd/nmbd_nameregister.c @@ -144,12 +144,12 @@ name %s on subnet %s.\n", inet_ntoa(p->ip), nmb_namestr(answer_name), subrec->su the success function. */ standard_success_register(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip); if( rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip); + (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, registered_ip); } else { if( rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, question_name); + (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name); /* Remove the name. */ standard_fail_register( subrec, rrec, question_name); } @@ -226,12 +226,12 @@ responding.\n", inet_ntoa(rrec->packet->ip))); the success function. */ standard_success_register(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip); if( rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip); + (*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip); } else { if( rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, question_name); + (*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name); /* Remove the name. */ standard_fail_register( subrec, rrec, question_name); } diff --git a/source3/nmbd/nmbd_namerelease.c b/source3/nmbd/nmbd_namerelease.c index 2e3b4e8c6a..0f693c63d0 100644 --- a/source3/nmbd/nmbd_namerelease.c +++ b/source3/nmbd/nmbd_namerelease.c @@ -99,14 +99,14 @@ name %s on subnet %s.\n", inet_ntoa(p->ip), nmb_namestr(answer_name), subrec->su putip((char*)&released_ip ,&nmb->answers->rdata[2]); if(rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, answer_name, released_ip); + (*(release_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, released_ip); standard_success_release( subrec, rrec->userdata, answer_name, released_ip); } else { /* We have no standard_fail_release - maybe we should add one ? */ if(rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, answer_name); + (*(release_name_fail_function)rrec->fail_fn)(subrec, rrec, answer_name); } remove_response_record(subrec, rrec); @@ -174,14 +174,14 @@ responding.\n", inet_ntoa(rrec->packet->ip))); if(success && rrec->success_fn) { if(rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, question_name, released_ip); + (*(release_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, released_ip); standard_success_release( subrec, rrec->userdata, question_name, released_ip); } else { /* We have no standard_fail_release - maybe we should add one ? */ if( rrec->fail_fn) - (*rrec->fail_fn)(subrec, rrec, question_name); + (*(release_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name); } remove_response_record(subrec, rrec); diff --git a/source3/nmbd/nmbd_nodestatus.c b/source3/nmbd/nmbd_nodestatus.c index d78f8a5547..d28ea1cff4 100644 --- a/source3/nmbd/nmbd_nodestatus.c +++ b/source3/nmbd/nmbd_nodestatus.c @@ -52,7 +52,7 @@ name %s.\n", nmb_namestr(answer_name), nmb_namestr(question_name))); /* Just send the whole answer resource record for the success function to parse. */ if(rrec->success_fn) - (*rrec->success_fn)(subrec, rrec->userdata, nmb->answers, p->ip); + (*(node_status_success_function)rrec->success_fn)(subrec, rrec->userdata, nmb->answers, p->ip); /* Ensure we don't retry. */ remove_response_record(subrec, rrec); |