diff options
| author | Matthew Chapman <matty@samba.org> | 1999-02-15 05:33:30 +0000 |
|---|---|---|
| committer | Matthew Chapman <matty@samba.org> | 1999-02-15 05:33:30 +0000 |
| commit | 2737f26ad64ee32d6ef7365dcce0a3eb881f99db (patch) | |
| tree | 52dce623844dbea155cb961ad50f1edf83d8a1df /source3/nmbd | |
| parent | 0baa42bdd751b81ca6d17d1b5377a4e345936cad (diff) | |
| download | samba-2737f26ad64ee32d6ef7365dcce0a3eb881f99db.tar.gz samba-2737f26ad64ee32d6ef7365dcce0a3eb881f99db.tar.bz2 samba-2737f26ad64ee32d6ef7365dcce0a3eb881f99db.zip | |
Always null-terminate strings.
Also some string length and sizeof(pointer) corrections.
(This used to be commit ce24191939b82985d09eabe945199f38b0fea486)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd_processlogon.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index 67678db069..98ce8a680a 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -140,8 +140,8 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); q = align2(q, buf); /* PDC and domain name */ - q = ascii_to_unibuf(q, my_name, outbuf+sizeof(outbuf)-q); - q = ascii_to_unibuf(q, global_myworkgroup, outbuf+sizeof(outbuf)-q); + q = ascii_to_unibuf(q, my_name, outbuf+sizeof(outbuf)-q-2); + q = ascii_to_unibuf(q, global_myworkgroup, outbuf+sizeof(outbuf)-q-2); SIVAL(q, 0, ntversion); q += 4; @@ -204,8 +204,8 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", fstring ascuser; fstring asccomp; - unibuf_to_ascii(ascuser, uniuser, sizeof(ascuser)); - unibuf_to_ascii(asccomp, unicomp, sizeof(asccomp)); + unibuf_to_ascii(ascuser, uniuser, sizeof(ascuser)-1); + unibuf_to_ascii(asccomp, unicomp, sizeof(asccomp)-1); DEBUGADD(3,("process_logon_packet: SAMLOGON request from %s(%s) for %s, returning logon svr %s domain %s code %x token=%x\n", asccomp,inet_ntoa(p->ip), ascuser, reply_name, @@ -219,9 +219,9 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", q += 2; /* Logon server, trust account, domain */ - q = ascii_to_unibuf(q, reply_name, outbuf+sizeof(outbuf)-q); - q = uni_strncpy(q, uniuser, outbuf+sizeof(outbuf)-q); - q = ascii_to_unibuf(q, lp_workgroup(), outbuf+sizeof(outbuf)-q); + q = ascii_to_unibuf(q, reply_name, outbuf+sizeof(outbuf)-q-2); + q = uni_strncpy(q, uniuser, outbuf+sizeof(outbuf)-q-2); + q = ascii_to_unibuf(q, lp_workgroup(), outbuf+sizeof(outbuf)-q-2); SIVAL(q, 0, ntversion); q += 4; |