Convert all uses of uint8/16/32 to _t in nmbd and the include file.

[samba.git] / source3 / nmbd / nmbd_incomingrequests.c

diff --git a/source3/nmbd/nmbd_incomingrequests.c b/source3/nmbd/nmbd_incomingrequests.c
index b2545f102fc9463cad4ca64932cbe32ce556b092..6f3eee368909666de8bd6ab0d46497a65b64a1a0 100644 (file)
--- a/source3/nmbd/nmbd_incomingrequests.c
+++ b/source3/nmbd/nmbd_incomingrequests.c
@@ -60,7 +60,7 @@ void process_name_release_request(struct subnet_record *subrec,
        struct nmb_name *question = &nmb->question.question_name;
        unstring qname;
        bool bcast = nmb->header.nm_flags.bcast;
-       uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+       uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
        bool group = (nb_flags & NB_GROUP) ? True : False;
        struct name_record *namerec;
        int rcode = 0;
@@ -192,7 +192,7 @@ void process_name_registration_request(struct subnet_record *subrec,
        struct nmb_packet *nmb = &p->packet.nmb;
        struct nmb_name *question = &nmb->question.question_name;
        bool bcast = nmb->header.nm_flags.bcast;
-       uint16 nb_flags = get_nb_flags(nmb->additional->rdata);
+       uint16_t nb_flags = get_nb_flags(nmb->additional->rdata);
        bool group = (nb_flags & NB_GROUP) ? True : False;
        struct name_record *namerec = NULL;
        int ttl = nmb->additional->ttl;
@@ -347,7 +347,10 @@ subnet %s - name not found.\n", nmb_namestr(&nmb->question.question_name),
                        unstring name;
 
                        pull_ascii_nstring(name, sizeof(name), namerec->name.name);
-                       strupper_m(name);
+                       if (!strupper_m(name)) {
+                               DEBUG(2,("strupper_m %s failed\n", name));
+                               return;
+                       }
                        if (!strequal(name,"*") &&
                                        !strequal(name,"__SAMBA__") &&
                                        (name_type < 0x1b || name_type >= 0x20 ||