diff options
| -rw-r--r-- | lib/util/util_net.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/clierror.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/errormap.c | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 52 |
4 files changed, 34 insertions, 34 deletions
diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 64aa674d8b..566bf56e8f 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -8,17 +8,17 @@ Copyright (C) Jim McDonough (jmcd@us.ibm.com) 2003. Copyright (C) James J Myers 2003 Copyright (C) Tim Potter 2000-2001 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index d5ac8937ed..65ce81855b 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -4,17 +4,17 @@ Copyright (C) Andrew Tridgell 1994-1998 Copyright (C) Jelmer Vernooij 2003 Copyright (C) Jeremy Allison 2006 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -288,7 +288,7 @@ bool cli_is_error(struct cli_state *cli) rcls = IVAL(cli->inbuf, smb_rcls); return (rcls & 0xF0000000) == 0xC0000000; } - + /* Return error if error class in non-zero */ rcls = CVAL(cli->inbuf, smb_rcls); diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c index 35b4137ec3..975de4f3c6 100644 --- a/source3/libsmb/errormap.c +++ b/source3/libsmb/errormap.c @@ -392,7 +392,7 @@ NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor) if (gss_maj == GSS_S_FAILURE) { return map_nt_error_from_unix((int)minor); } - + /* Look through list */ while(gss_to_ntstatus_errormap[i].gss_err != 0) { if (gss_to_ntstatus_errormap[i].gss_err == gss_maj) { diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index 50cdc0acf9..6ac6007c49 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -8,15 +8,15 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. - + Converted to store WINS data in a tdb. Dec 2005. JRA. */ @@ -133,7 +133,7 @@ static struct name_record *wins_record_to_name_record(TDB_DATA key, TDB_DATA dat /* We're using a byte-by-byte compare, so we must be sure that * unused space doesn't have garbage in it. */ - + for( i = strlen( namerec->name.name ); i < sizeof( namerec->name.name ); i++ ) { namerec->name.name[i] = '\0'; } @@ -276,7 +276,7 @@ struct name_record *find_name_on_wins_subnet(const struct nmb_name *nmbname, boo break; } } - + DLIST_ADD(wins_server_subnet->namelist, namerec); return namerec; } @@ -445,9 +445,9 @@ static void get_global_id_and_update(uint64_t *current_id, bool update) static uint64_t general_id = 1; DEBUG(5,("get_global_id_and_update: updating version ID: %d\n", (int)general_id)); - + *current_id = general_id; - + if (update) { general_id++; } @@ -478,7 +478,7 @@ static void wins_hook(const char *operation, struct name_record *namerec, int tt return; } } - + /* Use the name without the nametype (and scope) appended */ namestr = nmb_namestr(&namerec->name); @@ -1674,7 +1674,7 @@ to register name %s from IP %s.", nmb_namestr(question), inet_ntoa(p->ip) )); remove_name_from_namelist(subrec, namerec); namerec = NULL; } - + /* * Deal with the case where the name found was a dns entry. * Remove it as we now have a NetBIOS client registering the @@ -1767,7 +1767,7 @@ is one of our (WINS server) names. Denying registration.\n", nmb_namestr(questio update_wins_owner(namerec, our_fake_ip); update_wins_flag(namerec, WINS_ACTIVE); } - + wins_hook("refresh", namerec, ttl); send_wins_name_registration_response(0, ttl, p); return; @@ -1877,7 +1877,7 @@ void fetch_all_active_wins_1b_names(void) /*********************************************************************** Deal with the special name query for *<1b>. ***********************************************************************/ - + static void process_wins_dmb_query_request(struct subnet_record *subrec, struct packet_struct *p) { @@ -2159,7 +2159,7 @@ received for name %s from IP %s on subnet %s. Error - should not be sent to WINS DEBUG(3,("wins_process_name_release_request: %s name release for name %s \ IP %s\n", releasing_group_name ? "Group" : "Unique", nmb_namestr(question), inet_ntoa(from_ip) )); - + /* * Deal with policy regarding 0x1d names. */ @@ -2174,7 +2174,7 @@ to release name %s from IP %s.", nmb_namestr(question), inet_ntoa(p->ip) )); /* * See if the name already exists. */ - + namerec = find_name_on_subnet(subrec, question, FIND_ANY_NAME); if( (namerec == NULL) || ((namerec != NULL) && (namerec->data.source != REGISTER_NAME)) ) { @@ -2541,10 +2541,10 @@ void nmbd_wins_new_entry(struct messaging_context *msg, if (buf==NULL) { return; } - + /* Record should use UNIX codepage. Ensure this is so in the wrepld code. JRA. */ record=(WINS_RECORD *)buf; - + make_nmb_name(&question, record->name, record->type); namerec = find_name_on_subnet(wins_server_subnet, &question, FIND_ANY_NAME); @@ -2592,7 +2592,7 @@ void nmbd_wins_new_entry(struct messaging_context *msg, get_global_id_and_update(&namerec->data.id, True); else overwrite=True; - + } else { /* the 2 records have different IP address */ if (namerec->data.wins_flags&WINS_ACTIVE) { @@ -2607,7 +2607,7 @@ void nmbd_wins_new_entry(struct messaging_context *msg, } } - + /* the replica is a standard group */ if (record->wins_flags&WINS_NGROUP || record->wins_flags&WINS_SGROUP) { /* if the database record is unique and active force a name release */ @@ -2615,9 +2615,9 @@ void nmbd_wins_new_entry(struct messaging_context *msg, /* send a release name to the unique node */ ; overwrite=True; - + } - + /* the replica is a special group */ if (record->wins_flags&WINS_SGROUP && namerec->data.wins_flags&WINS_SGROUP) { if (namerec->data.wins_flags&WINS_ACTIVE) { @@ -2628,11 +2628,11 @@ void nmbd_wins_new_entry(struct messaging_context *msg, overwrite=True; } } - + /* the replica is a multihomed host */ - + /* I'm giving up on multi homed. Too much complex to understand */ - + if (record->wins_flags&WINS_MHOMED) { if (! (namerec->data.wins_flags&WINS_ACTIVE)) { if ( !(namerec->data.wins_flags&WINS_RELEASED) && !(namerec->data.wins_flags&WINS_NGROUP)) @@ -2641,19 +2641,19 @@ void nmbd_wins_new_entry(struct messaging_context *msg, else { if (ip_equal_v4(record->wins_ip, namerec->data.wins_ip)) overwrite=True; - + if (ip_equal_v4(namerec->data.wins_ip, our_fake_ip)) if (namerec->data.wins_flags&WINS_UNIQUE) get_global_id_and_update(&namerec->data.id, True); - + } - + if (record->wins_flags&WINS_ACTIVE && namerec->data.wins_flags&WINS_ACTIVE) if (namerec->data.wins_flags&WINS_UNIQUE || namerec->data.wins_flags&WINS_MHOMED) if (ip_equal_v4(record->wins_ip, namerec->data.wins_ip)) overwrite=True; - + } if (overwrite == False) |