diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-15 21:45:45 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-15 21:45:45 +0000 |
| commit | ce0c99312c7da78679357610730ba5b60f4319b9 (patch) | |
| tree | b1b35c4e6bb6ab27e5d945f86fded1b86bc8daff /source3/include | |
| parent | 96c66b7be726b2361f18edde01d7b71e124e33e7 (diff) | |
| download | samba-ce0c99312c7da78679357610730ba5b60f4319b9.tar.gz samba-ce0c99312c7da78679357610730ba5b60f4319b9.tar.bz2 samba-ce0c99312c7da78679357610730ba5b60f4319b9.zip | |
Use "unix netbios name" type unstring - 64 bytes long to manipulate netbios
names in nmbd. Allows conversion from dos codepage mb strings (ie. SJIS) to
expand to utf8 size on read.
Jeremy.
(This used to be commit 834d816caf9cd6318da00febde50d9233469dac2)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/nameserv.h | 8 | ||||
| -rw-r--r-- | source3/include/safe_string.h | 1 | ||||
| -rw-r--r-- | source3/include/smb.h | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index 5362960d62..ec3d56c06b 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -226,8 +226,8 @@ struct name_record { /* Browser cache for synchronising browse lists. */ struct browse_cache_record { ubi_dlNode node[1]; - fstring lmb_name; - fstring work_group; + unstring lmb_name; + unstring work_group; struct in_addr ip; time_t sync_time; time_t death_time; /* The time the record must be removed. */ @@ -265,9 +265,9 @@ struct work_record { enum logon_state log_state; /* Work group info. */ - fstring work_group; + unstring work_group; int token; /* Used when communicating with backup browsers. */ - fstring local_master_browser_name; /* Current local master browser. */ + unstring local_master_browser_name; /* Current local master browser. */ /* Announce info. */ time_t lastannounce_time; diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index cb3f37c484..b22c5efcc9 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -139,6 +139,7 @@ size_t __unsafe_string_function_usage_here_char__(void); #define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) #define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) #define nstrcpy(d,s) safe_strcpy((d), (s),sizeof(nstring)-1) +#define unstrcpy(d,s) safe_strcpy((d), (s),sizeof(unstring)-1) /* the addition of the DEVELOPER checks in safe_strcpy means we must * update a lot of code. To make this a little easier here are some diff --git a/source3/include/smb.h b/source3/include/smb.h index 500aff997e..6c2f74e3b9 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1505,7 +1505,10 @@ struct cnotify_fns { #include "smb_macros.h" #define MAX_NETBIOSNAME_LEN 16 +/* DOS character, NetBIOS namestring. Type used on the wire. */ typedef char nstring[MAX_NETBIOSNAME_LEN]; +/* Unix character, NetBIOS namestring. Type used to manipulate name in nmbd. */ +typedef char unstring[MAX_NETBIOSNAME_LEN*4]; /* A netbios name structure. */ struct nmb_name { |