Use correct size (17 not 16) when doing a push_ascii(). Ensure that

wins hook is called with unix charset.
Jeremy.
(This used to be commit ecb80573870103de7b3f332fb53bf6b952f25ee7)

diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index b833a2f5df31f7fe099f233f76c43bf53c8cacf2..23eac9ad7cc3c273fe3d071ada04d7129577c889 100644 (file)
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -823,7 +823,7 @@ static int build_dgram(char *buf,struct packet_struct *p)
 void make_nmb_name( struct nmb_name *n, const char *name, int type)
 {
        memset( (char *)n, '\0', sizeof(struct nmb_name) );
-       push_ascii(n->name, name, 16, STR_TERMINATE|STR_UPPER);
+       push_ascii(n->name, name, sizeof(n->name), STR_TERMINATE|STR_UPPER);
        n->name_type = (unsigned int)type & 0xFF;
        StrnCpy( n->scope, global_scope(), 63 );
        strupper_m( n->scope );

diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index cd39dc5e2122107cb59e4bd3756ec80329ab4653..784c909c814390f16762bb16cfdbe21adb30520b 100644 (file)
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -120,7 +120,7 @@ static void wins_hook(const char *operation, struct name_record *namerec, int tt
        p += slprintf(p, sizeof(command)-1, "%s %s %s %02x %d", 
                      cmd,
                      operation, 
-                     namerec->name.name,
+                     nmb_namestr(&namerec->name),
                      namerec->name.name_type,
                      ttl);