diff options
| -rw-r--r-- | source3/include/proto.h | 28 | ||||
| -rw-r--r-- | source3/lib/kanji.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 3 |
3 files changed, 21 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 9ad6e6b183..7dd4918028 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1314,16 +1314,25 @@ void refresh_my_names(time_t t); void set_samba_nb_type(void); BOOL ms_browser_name( char *name, int type ); +void update_name_in_namelist( struct subnet_record *subrec, + struct name_record *namerec ); void remove_name_from_namelist( struct subnet_record *subrec, - struct name_record *namerec ); -struct name_record *find_name_on_subnet(struct subnet_record *subrec, - struct nmb_name *nmbname, BOOL self_only); -struct name_record *find_name_for_remote_broadcast_subnet( struct nmb_name *nmbname, - BOOL self_only ); + struct name_record *namerec ); +struct name_record *find_name_on_subnet( struct subnet_record *subrec, + struct nmb_name *nmbname, + BOOL self_only ); +struct name_record *find_name_for_remote_broadcast_subnet( + struct nmb_name *nmbname, + BOOL self_only ); void update_name_ttl( struct name_record *namerec, int ttl ); -struct name_record *add_name_to_subnet(struct subnet_record *subrec, - char *name, int type, uint16 nb_flags, int ttl, - enum name_source source, int num_ips, struct in_addr *iplist); +struct name_record *add_name_to_subnet( struct subnet_record *subrec, + char *name, + int type, + uint16 nb_flags, + int ttl, + enum name_source source, + int num_ips, + struct in_addr *iplist); void standard_success_register(struct subnet_record *subrec, struct userdata_struct *userdata, struct nmb_name *nmbname, uint16 nb_flags, int ttl, @@ -1332,7 +1341,7 @@ void standard_fail_register( struct subnet_record *subrec, struct response_record *rrec, struct nmb_name *nmbname ); BOOL find_ip_in_name_record( struct name_record *namerec, struct in_addr ip ); -void add_ip_to_name_record(struct name_record *namerec, struct in_addr new_ip); +void add_ip_to_name_record( struct name_record *namerec, struct in_addr new_ip ); void remove_ip_from_name_record( struct name_record *namerec, struct in_addr remove_ip ); void standard_success_release( struct subnet_record *subrec, @@ -1505,6 +1514,7 @@ void write_browse_list(time_t t, BOOL force_write); /*The following definitions come from nmbd_subnetdb.c */ +int namelist_entry_compare( ubi_trItemPtr Item, ubi_trNodePtr Node ); BOOL create_subnets(void); BOOL we_are_a_wins_client(void); struct subnet_record *get_next_subnet_maybe_unicast(struct subnet_record *subrec); diff --git a/source3/lib/kanji.c b/source3/lib/kanji.c index afe255d36a..523eb178e2 100644 --- a/source3/lib/kanji.c +++ b/source3/lib/kanji.c @@ -411,7 +411,7 @@ static char *sj_to_euc(char *from, BOOL overwrite) *out++ = code; from += 2; } else if (is_kana (*from)) { - *out++ = euc_kana; + *out++ = (char)euc_kana; *out++ = *from++; } else { *out++ = *from++; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 59fd45f75e..ba7a0a18f1 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1237,8 +1237,7 @@ static BOOL check_access_allowed_for_current_user( char *fname, int accmode ) } #else /* defined(WIFEXITED) && defined(WEXITSTATUS) */ if(status_code != 0) { - DEBUG(9,("check_access_allowed_for_current_user: The status of the process e -xiting was %d. Returning access denied.\n", status_code)); + DEBUG(9,("check_access_allowed_for_current_user: The status of the process exiting was %d. Returning access denied.\n", status_code)); return(False); } #endif /* defined(WIFEXITED) && defined(WEXITSTATUS) */ |