[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-74-gca61ba5

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  ca61ba5e1ac4935036b9419290453d82c161cfbd (commit)
      from  fa25c239e7624a863088008f58ed2b2f82a1cd1b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit ca61ba5e1ac4935036b9419290453d82c161cfbd
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Sat Dec 29 14:48:20 2007 -0800

    Make send_getdc_request match 3.2.x codebase.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/nsswitch/winbindd_cm.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c
index 6dc2522..1593b2b 100644
--- a/source/nsswitch/winbindd_cm.c
+++ b/source/nsswitch/winbindd_cm.c
@@ -940,13 +940,22 @@ static BOOL send_getdc_request(struct in_addr dc_ip,
        SIVAL(p, 0, 0); /* The sender's token ... */
        p += 2;
 
-       p += dos_PutUniCode(p, global_myname(), sizeof(pstring), True);
+       p += dos_PutUniCode(p, global_myname(),
+               sizeof(outbuf) - PTR_DIFF(p, outbuf), True);
        fstr_sprintf(my_acct_name, "%s$", global_myname());
-       p += dos_PutUniCode(p, my_acct_name, sizeof(pstring), True);
+       p += dos_PutUniCode(p, my_acct_name,
+                       sizeof(outbuf) - PTR_DIFF(p, outbuf), True);
+
+       if (strlen(my_mailslot)+1 > sizeof(outbuf) - PTR_DIFF(p, outbuf)) {
+               return False;
+       }
 
        memcpy(p, my_mailslot, strlen(my_mailslot)+1);
        p += strlen(my_mailslot)+1;
 
+       if (sizeof(outbuf) - PTR_DIFF(p, outbuf) < 8) {
+               return False;
+       }
        SIVAL(p, 0, 0x80);
        p+=4;
 
@@ -955,7 +964,15 @@ static BOOL send_getdc_request(struct in_addr dc_ip,
 
        p = ALIGN4(p, outbuf);
 
-       sid_linearize(p, sid_size(sid), sid);
+       if (PTR_DIFF(p, outbuf) > sizeof(outbuf)) {
+               return False;
+       }
+
+       if (sid_size(sid) + 8 > sizeof(outbuf) - PTR_DIFF(p, outbuf)) {
+               return False;
+       }
+
+       sid_linearize(p, sizeof(outbuf) - PTR_DIFF(p, outbuf), sid);
        p += sid_size(sid);
 
        SIVAL(p, 0, 1);


-- 
Samba Shared Repository