Merge from HEAD:

 - heimdal updates to configure
 - make DEBUG() const
 - add testsuite for:
   - preexec
   - preexec close
   - valid users
 - fix testsuite for 'invalid users'

Andrew Bartlett
(This used to be commit aa41fb8703db4a4ecd3b353874c99a994e8ed630)

4 files changed, 11 insertions, 11 deletions

diff --git a/source3/configure b/source3/configure
index 6f32e7cfb6..574879adde 100755
--- a/source3/configure
+++ b/source3/configure
@@ -6229,7 +6229,7 @@ _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20516,8 +20516,8 @@ if test x$FOUND_KRB5 = x"no"; then
 echo "$as_me:$LINENO: checking for /usr/include/heimdal" >&5
 echo $ECHO_N "checking for /usr/include/heimdal... $ECHO_C" >&6
 if test -d /usr/include/heimdal; then
-    CFLAGS="$CFLAGS -I/usr/heimdal/include"
-    CPPFLAGS="$CPPFLAGS -I/usr/heimdal/include"
+    CFLAGS="$CFLAGS -I/usr/include/heimdal"
+    CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
diff --git a/source3/configure.in b/source3/configure.in
index 2299fe8863..167f977522 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1993,8 +1993,8 @@ if test x$FOUND_KRB5 = x"no"; then
 # see if this box has the SuSE location for the heimdal kerberos implementation
 AC_MSG_CHECKING(for /usr/include/heimdal)
 if test -d /usr/include/heimdal; then
-    CFLAGS="$CFLAGS -I/usr/heimdal/include"
-    CPPFLAGS="$CPPFLAGS -I/usr/heimdal/include"
+    CFLAGS="$CFLAGS -I/usr/include/heimdal"
+    CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
     AC_MSG_RESULT(yes)
 else
     AC_MSG_RESULT(no)
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 4b0b4b1ac4..5f87bf06fd 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -36,9 +36,9 @@
    arguemnts to DEBUG() right. We have got them wrong too often in the 
    past.
  */
-int  Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
-BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
-BOOL dbghdr( int level, char *file, char *func, int line );
+int  Debug1( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
+BOOL dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
+BOOL dbghdr( int level, const char *file, const char *func, int line );
 
 extern XFILE *dbf;
 extern pstring debugf;
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index f2a362bb86..ea5bad3b6d 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -702,7 +702,7 @@ void check_log_size( void )
  * This is called by dbghdr() and format_debug_text().
  * ************************************************************************** **
  */
- int Debug1( char *format_str, ... )
+ int Debug1( const char *format_str, ... )
 {
   va_list ap;  
   int old_errno = errno;
@@ -897,7 +897,7 @@ void dbgflush( void )
  * ************************************************************************** **
  */
 
-BOOL dbghdr( int level, char *file, char *func, int line )
+BOOL dbghdr( int level, const char *file, const char *func, int line )
 {
   /* Ensure we don't lose any real errno value. */
   int old_errno = errno;
@@ -967,7 +967,7 @@ BOOL dbghdr( int level, char *file, char *func, int line )
  *
  * ************************************************************************** **
  */
- BOOL dbgtext( char *format_str, ... )
+ BOOL dbgtext( const char *format_str, ... )
   {
   va_list ap;
   pstring msgbuf;