diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/nmbd | |
parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.bz2 samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip |
Merge from HEAD:
- fstring/pstring mixups
- the detection code that found them (disabled)
- a bit of whitespace
- a static
Andrew Bartlett
(This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9)
Diffstat (limited to 'source3/nmbd')
-rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index e43dd3f467..4ef476f814 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -250,7 +250,8 @@ BOOL initialise_wins(void) kbuf.dptr; newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) { - pstring name_type, name, ip_str; + fstring name_type; + pstring name, ip_str; char *p; int type = 0; int nb_flags; |