[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1234-g92fcf22

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  92fcf22b79809393c734e4005c34a5e7e4aaa912 (commit)
       via  231a148badf1f9b868ed1d37532020defa27bbd6 (commit)
       via  318cbcfae51fc5dae549c60107d12480d8e478c8 (commit)
      from  2a5c53220a5cc2b4a80fc7c6cb38e87789c5e797 (commit)

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


- Log -----------------------------------------------------------------
commit 92fcf22b79809393c734e4005c34a5e7e4aaa912
Merge: 231a148badf1f9b868ed1d37532020defa27bbd6 2a5c53220a5cc2b4a80fc7c6cb38e87789c5e797
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 9 14:35:37 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 231a148badf1f9b868ed1d37532020defa27bbd6
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 9 14:35:15 2008 -0800

    Try and fix the AIX build.
    Jeremy.

commit 318cbcfae51fc5dae549c60107d12480d8e478c8
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 9 14:35:00 2008 -0800

    Ensure we don't take address of one past buffer.
    Jeremy.

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

Summary of changes:
 source/libaddns/dns.h               |   10 +++++++++-
 source/nmbd/nmbd_incomingrequests.c |    2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index a83c0b4..188d139 100644
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -25,7 +25,15 @@
 #ifndef _DNS_H
 #define _DNS_H
 
-#include "config.h"
+#include "lib/replace/replace.h"
+
+/* make sure we have included the correct config.h */
+#ifndef NO_CONFIG_H /* for some tests */
+#ifndef CONFIG_H_IS_FROM_SAMBA
+#error "make sure you have removed all config.h files from standalone builds!"
+#error "the included config.h isn't from samba!"
+#endif
+#endif /* NO_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/source/nmbd/nmbd_incomingrequests.c b/source/nmbd/nmbd_incomingrequests.c
index 90773c1..ebe1948 100644
--- a/source/nmbd/nmbd_incomingrequests.c
+++ b/source/nmbd/nmbd_incomingrequests.c
@@ -331,7 +331,7 @@ subnet %s - name not found.\n", nmb_namestr(&nmb->question.question_name),
  
 	/* this is not an exact calculation. the 46 is for the stats buffer
 		and the 60 is to leave room for the header etc */
-	bufend = &rdata[MAX_DGRAM_SIZE] - (18 + 46 + 60);
+	bufend = &rdata[MAX_DGRAM_SIZE-1] - (18 + 46 + 60);
 	countptr = buf = rdata;
 	buf += 1;
 	buf0 = buf;


-- 
Samba Shared Repository