svn commit: samba r8415 - in branches/SAMBA_4_0/source/setup: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 06:08:35 + (Wed, 13 Jul 2005)
New Revision: 8415

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8415

Log:
get rid of the last 2 runtime perl scripts



Removed:
   branches/SAMBA_4_0/source/setup/dcpromo.pl
   branches/SAMBA_4_0/source/setup/rootdse.pl


Changeset:
Sorry, the patch is too large (388 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8415

svn commit: smb-build r9 - in trunk: . include include/system testprog

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 06:42:06 + (Wed, 13 Jul 2005)
New Revision: 9

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=9

Log:
add a binary to testprog




Added:
   trunk/include/system/
   trunk/include/system/network.h
   trunk/include/system/time.h
   trunk/include/system/wait.h
   trunk/testprog/
   trunk/testprog/config.mk
   trunk/testprog/testprog.c
Modified:
   trunk/config.list
   trunk/include/includes.h


Changeset:
Sorry, the patch is too large (254 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=9

svn commit: smb-build r10 - in trunk: build/smb_build lib script

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 06:59:52 + (Wed, 13 Jul 2005)
New Revision: 10

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=10

Log:
another attempt at a portable target dependent CFLAGS

this one looks for the most specific .cflags file in the target directory

so for lib/replace/replace.o it look for:

  lib/replace/.cflags
  lib/.cflags

and if it finds it, then it gets added to the compile command

Added:
   trunk/lib/.cflags
   trunk/script/cflags.sh
Modified:
   trunk/build/smb_build/makefile.pm


Changeset:
Modified: trunk/build/smb_build/makefile.pm
===
--- trunk/build/smb_build/makefile.pm   2005-07-13 06:42:06 UTC (rev 9)
+++ trunk/build/smb_build/makefile.pm   2005-07-13 06:59:52 UTC (rev 10)
@@ -202,7 +202,7 @@
 # $comment
 .$src.$dst:
[EMAIL PROTECTED] $message \$\*.$src
-   [EMAIL PROTECTED](CC) \$(TARGET_CFLAGS) \$([EMAIL PROTECTED]) 
\$(CFLAGS) $flags -c \$ -o \$\@
+   \$(CC) \$(TARGET_CFLAGS) \$(shell script/cflags.sh \$\@) \$(CFLAGS) 
$flags -c \$ -o \$\@
 [EMAIL PROTECTED]@ -mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 
 __EOD__

Added: trunk/lib/.cflags
===
--- trunk/lib/.cflags   2005-07-13 06:42:06 UTC (rev 9)
+++ trunk/lib/.cflags   2005-07-13 06:59:52 UTC (rev 10)
@@ -0,0 +1 @@
+-Ifoo

Added: trunk/script/cflags.sh
===
--- trunk/script/cflags.sh  2005-07-13 06:42:06 UTC (rev 9)
+++ trunk/script/cflags.sh  2005-07-13 06:59:52 UTC (rev 10)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TARGET=$1
+
+DIR=`dirname $TARGET`
+while [ $DIR != . ]; do
+if [ -r $DIR/.cflags ]; then
+   cat $DIR/.cflags
+   exit 0
+fi
+DIR=`dirname $DIR`
+done
+exit 0;


Property changes on: trunk/script/cflags.sh
___
Name: svn:executable
   + *

svn commit: smb-build r11 - in trunk: build/smb_build testprog

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 07:44:27 + (Wed, 13 Jul 2005)
New Revision: 11

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=11

Log:
fine tune the extra flags hack. I know this looks strange ...

Modified:
   trunk/build/smb_build/makefile.pm
   trunk/testprog/testprog.c


Changeset:
Modified: trunk/build/smb_build/makefile.pm
===
--- trunk/build/smb_build/makefile.pm   2005-07-13 06:59:52 UTC (rev 10)
+++ trunk/build/smb_build/makefile.pm   2005-07-13 07:44:27 UTC (rev 11)
@@ -198,11 +198,16 @@
my $flagsstr = ;
my $output;
 
+# I know the EXTRA_CFLAGS and shell below looks redundent, but it isn't
+# each works with a different type of make 
+
$output =  __EOD__;
 # $comment
+EXTRA_CFLAGS=script/cflags.sh \$\@
+
 .$src.$dst:
[EMAIL PROTECTED] $message \$\*.$src
-   \$(CC) \$(TARGET_CFLAGS) \$(shell script/cflags.sh \$\@) \$(CFLAGS) 
$flags -c \$ -o \$\@
+   \$(CC) \$(TARGET_CFLAGS) \$(EXTRA_CFLAGS:sh) \$(shell script/cflags.sh 
\$\@) \$(CFLAGS) $flags -c \$ -o \$\@
 [EMAIL PROTECTED]@ -mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 
 __EOD__

Modified: trunk/testprog/testprog.c
===
--- trunk/testprog/testprog.c   2005-07-13 06:59:52 UTC (rev 10)
+++ trunk/testprog/testprog.c   2005-07-13 07:44:27 UTC (rev 11)
@@ -1,5 +1,9 @@
 #include includes.h
 
+#ifndef TESTPROG_FLAGS
+#error the build hacks don't work
+#endif
+
  int main(int argc,char *argv[])
 {
printf(I'm a happy test program\n);

svn commit: smb-build r12 - in trunk/testprog: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 07:49:50 + (Wed, 13 Jul 2005)
New Revision: 12

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=12

Log:
forgot this file


Added:
   trunk/testprog/.cflags


Changeset:
Added: trunk/testprog/.cflags
===
--- trunk/testprog/.cflags  2005-07-13 07:44:27 UTC (rev 11)
+++ trunk/testprog/.cflags  2005-07-13 07:49:50 UTC (rev 12)
@@ -0,0 +1 @@
+-DTESTPROG_FLAGS=1

svn commit: smb-build r13 - in trunk/build/smb_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 08:07:30 + (Wed, 13 Jul 2005)
New Revision: 13

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=13

Log:
this seems to be portable to aix, solaris and linux



Modified:
   trunk/build/smb_build/makefile.pm


Changeset:
Modified: trunk/build/smb_build/makefile.pm
===
--- trunk/build/smb_build/makefile.pm   2005-07-13 07:49:50 UTC (rev 12)
+++ trunk/build/smb_build/makefile.pm   2005-07-13 08:07:30 UTC (rev 13)
@@ -198,16 +198,12 @@
my $flagsstr = ;
my $output;
 
-# I know the EXTRA_CFLAGS and shell below looks redundent, but it isn't
-# each works with a different type of make 
-
$output =  __EOD__;
 # $comment
-EXTRA_CFLAGS=script/cflags.sh \$\@
 
 .$src.$dst:
[EMAIL PROTECTED] $message \$\*.$src
-   \$(CC) \$(TARGET_CFLAGS) \$(EXTRA_CFLAGS:sh) \$(shell script/cflags.sh 
\$\@) \$(CFLAGS) $flags -c \$ -o \$\@
+   \$(CC) \$(TARGET_CFLAGS) `script/cflags.sh [EMAIL PROTECTED] \$(CFLAGS) 
$flags -c \$ -o \$\@
 [EMAIL PROTECTED]@ -mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 
 __EOD__

svn commit: smb-build r14 - in trunk/build/smb_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 08:30:05 + (Wed, 13 Jul 2005)
New Revision: 14

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=14

Log:
merged the irix fix from samba4




Modified:
   trunk/build/smb_build/makefile.pm


Changeset:
Modified: trunk/build/smb_build/makefile.pm
===
--- trunk/build/smb_build/makefile.pm   2005-07-13 08:07:30 UTC (rev 13)
+++ trunk/build/smb_build/makefile.pm   2005-07-13 08:30:05 UTC (rev 14)
@@ -363,6 +363,10 @@
my $tmpdepend = array2oneperline($ctx-{DEPEND_LIST});
my $output;
 
+   if (! $ctx-{TARGET}) {
+   return ;
+   }
+
$output = $ctx-{TYPE}_$ctx-{NAME}_DEPEND_LIST = $tmpdepend\n;
 
$output .= $ctx-{TARGET}: ;

svn commit: smb-build r15 - in trunk: . lib script testprog

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 09:29:14 + (Wed, 13 Jul 2005)
New Revision: 15

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=15

Log:
replaced .cflags files with extra_cflags.txt





Added:
   trunk/extra_cflags.txt
Removed:
   trunk/lib/.cflags
   trunk/testprog/.cflags
Modified:
   trunk/script/cflags.sh


Changeset:
Added: trunk/extra_cflags.txt
===
--- trunk/extra_cflags.txt  2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/extra_cflags.txt  2005-07-13 09:29:14 UTC (rev 15)
@@ -0,0 +1,2 @@
+lib/replace -Ifoobar -Ixxx
+testprog -DTESTPROG_FLAGS=1

Deleted: trunk/lib/.cflags
===
--- trunk/lib/.cflags   2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/lib/.cflags   2005-07-13 09:29:14 UTC (rev 15)
@@ -1 +0,0 @@
--Ifoo

Modified: trunk/script/cflags.sh
===
--- trunk/script/cflags.sh  2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/script/cflags.sh  2005-07-13 09:29:14 UTC (rev 15)
@@ -2,12 +2,23 @@
 
 TARGET=$1
 
-DIR=`dirname $TARGET`
-while [ $DIR != . ]; do
-if [ -r $DIR/.cflags ]; then
-   cat $DIR/.cflags
-   exit 0
-fi
-DIR=`dirname $DIR`
+check_flags()
+{
+NAME=$1
+(
+ while read tag flags; do
+if [ $tag = $NAME ]; then
+echo $flags
+exit 0;
+fi
+ done
+)  extra_cflags.txt
+}
+
+
+NAME=$TARGET
+while [ $NAME != . ]; do
+check_flags $NAME
+NAME=`dirname $NAME`
 done
 exit 0;

Deleted: trunk/testprog/.cflags
===
--- trunk/testprog/.cflags  2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/testprog/.cflags  2005-07-13 09:29:14 UTC (rev 15)
@@ -1 +0,0 @@
--DTESTPROG_FLAGS=1

svn commit: samba r8416 - in branches/SAMBA_4_0/source: . build/smb_build heimdal_build script

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 09:44:55 + (Wed, 13 Jul 2005)
New Revision: 8416

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8416

Log:
added the extra_cflags.txt system from smb-build

this removes the need for recursive make for heimdal, which is a big
win. It should also make it easier/cleaner to build ldb/tdb/appweb etc
in both in-tree and out-of-tree forms by allowing us to specify
different CFLAGS (and thus different include paths) per directory or
file

Added:
   branches/SAMBA_4_0/source/extra_cflags.txt
   branches/SAMBA_4_0/source/script/cflags.sh
Modified:
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm  2005-07-13 
06:08:35 UTC (rev 8415)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm  2005-07-13 
09:44:55 UTC (rev 8416)
@@ -24,7 +24,6 @@
MINOR_VERSION = string,
RELEASE_VERSION = string,
ENABLE = bool,
-   TARGET_CFLAGS = list,
CMD = string,
MANPAGE = string
 );

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2005-07-13 
06:08:35 UTC (rev 8415)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2005-07-13 
09:44:55 UTC (rev 8416)
@@ -234,7 +234,7 @@
 # $comment
 .$src.$dst:
[EMAIL PROTECTED] $message \$\*.$src
-   [EMAIL PROTECTED](CC) \$(TARGET_CFLAGS) \$(CFLAGS) $flags -c \$ -o \$\@
+   [EMAIL PROTECTED](CC) `script/cflags.sh [EMAIL PROTECTED] \$(CFLAGS) 
$flags -c \$ -o \$\@
 [EMAIL PROTECTED]@ -mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 
 __EOD__
@@ -402,10 +402,6 @@
 
$output .= $ctx-{TARGET}: ;
 
-   if (defined ($ctx-{TARGET_CFLAGS})) {
-   $output .= [EMAIL PROTECTED](MAKE) TARGET_CFLAGS=\ . join(' 
', @{$ctx-{TARGET_CFLAGS}}) . \ ;
-   } 
-
$output .= \$($ctx-{TYPE}_$ctx-{NAME}_DEPEND_LIST) 
\$($ctx-{TYPE}_$ctx-{NAME}_OBJS)\n;
$output .= [EMAIL PROTECTED] $ctx-{TARGET}\n;
 

Added: branches/SAMBA_4_0/source/extra_cflags.txt
===
--- branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 06:08:35 UTC (rev 
8415)
+++ branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 09:44:55 UTC (rev 
8416)
@@ -0,0 +1 @@
+heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken 
-Iheimdal/include

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 06:08:35 UTC 
(rev 8415)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 09:44:55 UTC 
(rev 8416)
@@ -1,7 +1,6 @@
 ###
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
-TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des 
-Iheimdal/lib/roken -Iheimdal/include 
 ADD_OBJ_FILES = \
heimdal/kdc/default_config.o \
heimdal/kdc/kerberos5.o \
@@ -19,7 +18,6 @@
 ###
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
-TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des 
-Iheimdal/lib/roken -Iheimdal/include 
 ADD_OBJ_FILES = \
heimdal/lib/hdb/db.o \
heimdal/lib/hdb/hdb.o \
@@ -327,7 +325,6 @@
heimdal/lib/roken/setprogname.o \
heimdal/lib/asn1/symbol.o
 REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN
-TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 NOPROTO = YES
 # End SUBSYSTEM ASN1_COMPILER
 ###
@@ -353,7 +350,6 @@
heimdal/lib/roken/strupr.o \
heimdal/lib/roken/print_version.o \
heimdal/lib/roken/setprogname.o
-TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 NOPROTO = YES
 # End SUBSYSTEM COMPILE_ET
 ###
@@ -379,7 +375,6 @@
 # Start SUBSYSTEM HEIMDAL
 [SUBSYSTEM::HEIMDAL]
 NOPROTO = YES
-TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des 
-Iheimdal/lib/roken -Iheimdal/include 
 REQUIRED_SUBSYSTEMS = \
HEIMDAL_GSSAPI HEIMDAL_KRB5 \
HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR 
HEIMDAL_GLUE

Added: branches/SAMBA_4_0/source/script/cflags.sh
===
--- branches/SAMBA_4_0/source/script/cflags.sh  2005-07-13 06:08:35 UTC (rev 
8415)
+++ branches/SAMBA_4_0/source/script/cflags.sh  2005-07-13 09:44:55 UTC (rev 
8416)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# This is a hack to allow per target cflags. It isn't very elegant, but it
+# is the most portable idea we have come up with yet
+# [EMAIL PROTECTED],

svn commit: samba r8417 - in branches/SAMBA_4_0/source: . lib/replace

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 10:22:13 + (Wed, 13 Jul 2005)
New Revision: 8417

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8417

Log:
fixed handling of PRINTF_ATTRIBUTE for heimdal portion of build

Modified:
   branches/SAMBA_4_0/source/extra_cflags.txt
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/extra_cflags.txt
===
--- branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 09:44:55 UTC (rev 
8416)
+++ branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 10:22:13 UTC (rev 
8417)
@@ -1 +1 @@
-heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken 
-Iheimdal/include
+heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken 
-Iheimdal/include -DNO_PRINTF_ATTRIBUTE

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 09:44:55 UTC 
(rev 8416)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 10:22:13 UTC 
(rev 8417)
@@ -112,7 +112,7 @@
 #endif
 
 #ifndef PRINTF_ATTRIBUTE
-#if (__GNUC__ = 3)
+#if !defined(NO_PRINTF_ATTRIBUTE)  (__GNUC__ = 3)
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
  * the parameter containing the format, and a2 the index of the first
  * argument. Note that some gcc 2.x versions don't handle this

svn commit: samba r8418 - in branches/SAMBA_4_0/source/lib/replace: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 10:58:43 + (Wed, 13 Jul 2005)
New Revision: 8418

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8418

Log:
PRINTF_ATTRIBUTE declaration has to come before it is used :-)

Modified:
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 10:22:13 UTC 
(rev 8417)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 10:58:43 UTC 
(rev 8418)
@@ -75,6 +75,18 @@
 #define bzero(a,b) memset((a),'\0',(b))
 #endif
 
+#ifndef PRINTF_ATTRIBUTE
+#if !defined(NO_PRINTF_ATTRIBUTE)  (__GNUC__ = 3)
+/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
+ * the parameter containing the format, and a2 the index of the first
+ * argument. Note that some gcc 2.x versions don't handle this
+ * properly **/
+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
+#else
+#define PRINTF_ATTRIBUTE(a1, a2)
+#endif
+#endif
+
 /* add varargs prototypes with printf checking */
 #ifndef HAVE_SNPRINTF_DECL
 int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
@@ -111,16 +123,4 @@
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
-#ifndef PRINTF_ATTRIBUTE
-#if !defined(NO_PRINTF_ATTRIBUTE)  (__GNUC__ = 3)
-/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
- * the parameter containing the format, and a2 the index of the first
- * argument. Note that some gcc 2.x versions don't handle this
- * properly **/
-#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
-#else
-#define PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#endif
-
-#endif

svn commit: samba r8419 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 11:02:56 + (Wed, 13 Jul 2005)
New Revision: 8419

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8419

Log:
in order to use our replace.h, heimdal needs stdarg.h


Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===
--- branches/SAMBA_4_0/source/heimdal_build/config.h2005-07-13 10:58:43 UTC 
(rev 8418)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h2005-07-13 11:02:56 UTC 
(rev 8419)
@@ -51,5 +51,6 @@
 #define HAVE_GAI_STRERROR
 
 #include sys/types.h
+#include stdarg.h
 #include lib/replace/replace.h
 #endif

svn commit: samba r8420 - in branches/SAMBA_4_0/source: heimdal/lib/roken heimdal_build include lib/replace

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 11:17:32 + (Wed, 13 Jul 2005)
New Revision: 8420

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8420

Log:
slowly getting my way through some more heimdal portability fixes



Added:
   branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin
Modified:
   branches/SAMBA_4_0/source/heimdal/lib/roken/
   branches/SAMBA_4_0/source/heimdal_build/build_external.sh
   branches/SAMBA_4_0/source/heimdal_build/config.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:

Property changes on: branches/SAMBA_4_0/source/heimdal/lib/roken
___
Name: svn:ignore
   - vis.h


   + vis.h
err.h




Added: branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin
===
--- branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin 2005-07-13 11:02:56 UTC 
(rev 8419)
+++ branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin 2005-07-13 11:17:32 UTC 
(rev 8420)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 1995 - 2004 Kungliga Tekniska H�gskolan 
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* $Id: err.hin,v 1.18 2005/04/12 11:28:38 lha Exp $ */
+
+#ifndef __ERR_H__
+#define __ERR_H__
+
+#include errno.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include stdarg.h
+
+#if !defined(__GNUC__)  !defined(__attribute__)
+#define __attribute__(x)
+#endif
+
+#ifndef ROKEN_LIB_FUNCTION
+#ifdef _WIN32
+#define ROKEN_LIB_FUNCTION _stdcall
+#else
+#define ROKEN_LIB_FUNCTION
+#endif
+#endif
+
+void ROKEN_LIB_FUNCTION
+verr(int eval, const char *fmt, va_list ap)
+ __attribute__ ((noreturn, format (printf, 2, 0)));
+
+void ROKEN_LIB_FUNCTION
+err(int eval, const char *fmt, ...)
+ __attribute__ ((noreturn, format (printf, 2, 3)));
+
+void ROKEN_LIB_FUNCTION
+verrx(int eval, const char *fmt, va_list ap)
+ __attribute__ ((noreturn, format (printf, 2, 0)));
+
+void ROKEN_LIB_FUNCTION
+errx(int eval, const char *fmt, ...)
+ __attribute__ ((noreturn, format (printf, 2, 3)));
+void ROKEN_LIB_FUNCTION
+vwarn(const char *fmt, va_list ap)
+ __attribute__ ((format (printf, 1, 0)));
+
+void ROKEN_LIB_FUNCTION
+warn(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
+
+void ROKEN_LIB_FUNCTION
+vwarnx(const char *fmt, va_list ap)
+ __attribute__ ((format (printf, 1, 0)));
+
+void ROKEN_LIB_FUNCTION
+warnx(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
+
+#endif /* __ERR_H__ */

Modified: branches/SAMBA_4_0/source/heimdal_build/build_external.sh
===
--- branches/SAMBA_4_0/source/heimdal_build/build_external.sh   2005-07-13 
11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/heimdal_build/build_external.sh   2005-07-13 
11:17:32 UTC (rev 8420)
@@ -85,6 +85,7 @@
 }
 
 build_cp heimdal/lib/roken/vis.hin
+build_cp heimdal/lib/roken/err.hin
 build_lex heimdal/lib/asn1/lex.l
 build_lex heimdal/lib/com_err/lex.l
 build_bison heimdal/lib/com_err/parse.y

Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===
--- branches/SAMBA_4_0/source/heimdal_build/config.h2005-07-13 11:02:56 UTC 
(rev 8419)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h2005-07-13 11:17:32 UTC 
(rev

svn commit: samba r8421 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 11:28:37 + (Wed, 13 Jul 2005)
New Revision: 8421

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8421

Log:
needed for build on solaris10




Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 11:17:32 UTC 
(rev 8420)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 11:28:37 UTC 
(rev 8421)
@@ -79,6 +79,7 @@
umask   \
uname   \
unsetenv\
+   closefrom   \
writev
 ])

svn commit: samba r8422 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 11:30:34 + (Wed, 13 Jul 2005)
New Revision: 8422

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8422

Log:
needed on irix 6.4





Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 11:28:37 UTC 
(rev 8421)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 11:30:34 UTC 
(rev 8422)
@@ -80,6 +80,7 @@
uname   \
unsetenv\
closefrom   \
+   hstrerror   \
writev
 ])

svn commit: samba r8423 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 12:12:33 + (Wed, 13 Jul 2005)
New Revision: 8423

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8423

Log:
remove the dependency on the full roken lib for asn1_compile

this should fix the -lsocket problem on solaris






Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 11:30:34 UTC 
(rev 8422)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 12:12:33 UTC 
(rev 8423)
@@ -323,8 +323,10 @@
heimdal/lib/roken/getarg.o \
heimdal/lib/roken/print_version.o \
heimdal/lib/roken/setprogname.o \
+   heimdal/lib/roken/strupr.o \
+   heimdal/lib/roken/getprogname.o \
+   heimdal/lib/roken/get_window_size.o \
heimdal/lib/asn1/symbol.o
-REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN
 NOPROTO = YES
 # End SUBSYSTEM ASN1_COMPILER
 ###

svn commit: samba r8425 - in branches/SAMBA_4_0/source: . heimdal_build

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-13 13:55:06 + (Wed, 13 Jul 2005)
New Revision: 8425

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8425

Log:
add err() and errx() functions needed by for compile_et on some systems

Added:
   branches/SAMBA_4_0/source/heimdal_build/replace.c
Modified:
   branches/SAMBA_4_0/source/extra_cflags.txt
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/heimdal_build/glue.c


Changeset:
Modified: branches/SAMBA_4_0/source/extra_cflags.txt
===
--- branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 12:35:21 UTC (rev 
8424)
+++ branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-13 13:55:06 UTC (rev 
8425)
@@ -1 +1,2 @@
 heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken 
-Iheimdal/include -DNO_PRINTF_ATTRIBUTE
+heimdal_build/replace.o -Iheimdal_build -Iheimdal/lib/roken

Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 12:35:21 UTC 
(rev 8424)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-13 13:55:06 UTC 
(rev 8425)
@@ -85,6 +85,8 @@
unsetenv\
closefrom   \
hstrerror   \
+   err \
+   errx\
writev
 ])
 

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 12:35:21 UTC 
(rev 8424)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-13 13:55:06 UTC 
(rev 8425)
@@ -326,7 +326,8 @@
heimdal/lib/roken/strupr.o \
heimdal/lib/roken/getprogname.o \
heimdal/lib/roken/get_window_size.o \
-   heimdal/lib/asn1/symbol.o
+   heimdal/lib/asn1/symbol.o \
+   heimdal_build/replace.o
 NOPROTO = YES
 # End SUBSYSTEM ASN1_COMPILER
 ###
@@ -351,7 +352,8 @@
heimdal/lib/roken/getprogname.o \
heimdal/lib/roken/strupr.o \
heimdal/lib/roken/print_version.o \
-   heimdal/lib/roken/setprogname.o
+   heimdal/lib/roken/setprogname.o \
+   heimdal_build/replace.o
 NOPROTO = YES
 # End SUBSYSTEM COMPILE_ET
 ###

Modified: branches/SAMBA_4_0/source/heimdal_build/glue.c
===
--- branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-13 12:35:21 UTC 
(rev 8424)
+++ branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-13 13:55:06 UTC 
(rev 8425)
@@ -23,6 +23,7 @@
 #include includes.h
 #include system/network.h
 #include system/kerberos.h
+#include err.h
 
 /*
   get the list of IP addresses for configured interfaces
@@ -48,3 +49,12 @@
 
return 0;
 }
+
+
+void errx(int eval, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  verrx(eval, fmt, ap);
+  va_end(ap);
+}

Added: branches/SAMBA_4_0/source/heimdal_build/replace.c
===
--- branches/SAMBA_4_0/source/heimdal_build/replace.c   2005-07-13 12:35:21 UTC 
(rev 8424)
+++ branches/SAMBA_4_0/source/heimdal_build/replace.c   2005-07-13 13:55:06 UTC 
(rev 8425)
@@ -0,0 +1,49 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   some replacement functions for parts of roken that don't fit easily into 
+   our build system
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include config.h
+#include stdio.h
+#include err.h
+
+#ifndef HAVE_ERR
+ void err(int eval, const char *format, ...)
+{
+   va_list ap;
+   va_start(ap, format);
+   vfprintf(stderr, format, ap);
+   perror();
+   va_end(ap);
+   exit(eval);
+}
+#endif
+
+#ifndef HAVE_ERRX
+ void errx(int eval, const char *format, ...)
+{
+   va_list ap;
+   va_start(ap, format);
+   vfprintf(stderr, format, ap);
+   va_end(ap);
+   exit(eval);
+}
+#endif

svn commit: samba r8426 - in branches/tmp/pdb_trust_pw/source: include passdb

2005-07-13 Thread gd 
Author: gd
Date: 2005-07-13 14:43:22 + (Wed, 13 Jul 2005)
New Revision: 8426

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8426

Log:
allow to at least compile mimirs pdb_trust_pw-work

Guenther

Modified:
   branches/tmp/pdb_trust_pw/source/include/popt_common.h
   branches/tmp/pdb_trust_pw/source/passdb/pdb_get_set.c


Changeset:
Modified: branches/tmp/pdb_trust_pw/source/include/popt_common.h
===
--- branches/tmp/pdb_trust_pw/source/include/popt_common.h  2005-07-13 
13:55:06 UTC (rev 8425)
+++ branches/tmp/pdb_trust_pw/source/include/popt_common.h  2005-07-13 
14:43:22 UTC (rev 8426)
@@ -21,6 +21,8 @@
 #ifndef _POPT_COMMON_H
 #define _POPT_COMMON_H
 
+#include popt.h
+
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
 extern struct poptOption popt_common_connection[];

Modified: branches/tmp/pdb_trust_pw/source/passdb/pdb_get_set.c
===
--- branches/tmp/pdb_trust_pw/source/passdb/pdb_get_set.c   2005-07-13 
13:55:06 UTC (rev 8425)
+++ branches/tmp/pdb_trust_pw/source/passdb/pdb_get_set.c   2005-07-13 
14:43:22 UTC (rev 8426)
@@ -1258,7 +1258,7 @@
  * Get/set functions for SAM_TRUST_PASSWD.
  */
 
-const uint16 pdb_get_tp_flags(const SAM_TRUST_PASSWD *trust)
+uint16 pdb_get_tp_flags(const SAM_TRUST_PASSWD *trust)
 {
if (!trust)
return -1;

svn commit: samba r8427 - branches/SAMBA_3_0/source/include trunk/source/include

2005-07-13 Thread gd 
Author: gd
Date: 2005-07-13 14:44:12 + (Wed, 13 Jul 2005)
New Revision: 8427

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8427

Log:
Printerdb has been moved into a tmp branch.

Guenther

Modified:
   branches/SAMBA_3_0/source/include/debug.h
   trunk/source/include/debug.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/debug.h
===
--- branches/SAMBA_3_0/source/include/debug.h   2005-07-13 14:43:22 UTC (rev 
8426)
+++ branches/SAMBA_3_0/source/include/debug.h   2005-07-13 14:44:12 UTC (rev 
8427)
@@ -94,9 +94,8 @@
 #define DBGC_IDMAP 13
 #define DBGC_QUOTA 14
 #define DBGC_ACLS  15
-#define DBGC_PRINTERDB 16
-#define DBGC_LOCKING   17
-#define DBGC_MSDFS 18
+#define DBGC_LOCKING   16
+#define DBGC_MSDFS 17
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS

Modified: trunk/source/include/debug.h
===
--- trunk/source/include/debug.h2005-07-13 14:43:22 UTC (rev 8426)
+++ trunk/source/include/debug.h2005-07-13 14:44:12 UTC (rev 8427)
@@ -94,9 +94,8 @@
 #define DBGC_IDMAP 13
 #define DBGC_QUOTA 14
 #define DBGC_ACLS  15
-#define DBGC_PRINTERDB 16
-#define DBGC_LOCKING   17
-#define DBGC_MSDFS 18
+#define DBGC_LOCKING   16
+#define DBGC_MSDFS 17
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS

svn commit: samba r8428 - branches/SAMBA_3_0/source/lib trunk/source/lib

2005-07-13 Thread gd 
Author: gd
Date: 2005-07-13 14:46:57 + (Wed, 13 Jul 2005)
New Revision: 8428

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8428

Log:
some more old printerdb stuff.

Guenther

Modified:
   branches/SAMBA_3_0/source/lib/debug.c
   trunk/source/lib/debug.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/debug.c
===
--- branches/SAMBA_3_0/source/lib/debug.c   2005-07-13 14:44:12 UTC (rev 
8427)
+++ branches/SAMBA_3_0/source/lib/debug.c   2005-07-13 14:46:57 UTC (rev 
8428)
@@ -164,7 +164,6 @@
idmap, /* DBGC_IDMAP*/
quota, /* DBGC_QUOTA*/
acls,  /* DBGC_ACLS */
-   printerdb, /* DBGC_PRINTERDB*/
locking,   /* DBGC_LOCKING  */
msdfs, /* DBGC_MSDFS*/
NULL

Modified: trunk/source/lib/debug.c
===
--- trunk/source/lib/debug.c2005-07-13 14:44:12 UTC (rev 8427)
+++ trunk/source/lib/debug.c2005-07-13 14:46:57 UTC (rev 8428)
@@ -164,7 +164,6 @@
idmap, /* DBGC_IDMAP*/
quota, /* DBGC_QUOTA*/
acls,  /* DBGC_ACLS */
-   printerdb, /* DBGC_PRINTERDB*/
locking,   /* DBGC_LOCKING  */
msdfs, /* DBGC_MSDFS*/
NULL

svn commit: samba r8430 - in branches/SAMBA_4_0/source/torture/rpc: .

2005-07-13 Thread metze 
Author: metze
Date: 2005-07-13 15:19:28 + (Wed, 13 Jul 2005)
New Revision: 8430

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8430

Log:
readd my hack to display the hashes with -d 100

metze
Modified:
   branches/SAMBA_4_0/source/torture/rpc/samsync.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-07-13 15:18:20 UTC 
(rev 8429)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-07-13 15:19:28 UTC 
(rev 8430)
@@ -543,6 +543,15 @@
}
}
 
+   if (nt_hash_p) {
+   DATA_BLOB nt_hash_blob = data_blob_const(nt_hash_p, 16);
+   DEBUG(100,(ACCOUNT [%s\\%-25s] NTHASH %s\n, 
samsync_state-domain_name[0], username, data_blob_hex_string(mem_ctx, 
nt_hash_blob)));
+   }
+   if (lm_hash_p) {
+   DATA_BLOB lm_hash_blob = data_blob_const(lm_hash_p, 16);
+   DEBUG(100,(ACCOUNT [%s\\%-25s] LMHASH %s\n, 
samsync_state-domain_name[0], username, data_blob_hex_string(mem_ctx, 
lm_hash_blob)));
+   }
+
nt_status = test_SamLogon(samsync_state-p_netlogon_wksta, mem_ctx, 
samsync_state-creds_netlogon_wksta, 
  domain,
  username,

svn commit: samba r8431 - branches/SAMBA_3_0/source/python trunk/source/python

2005-07-13 Thread lmuelle 
Author: lmuelle
Date: 2005-07-13 16:47:42 + (Wed, 13 Jul 2005)
New Revision: 8431

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8431

Log:
Ensure to use dev_private and not private after Jeremy's CPP reserved
names rename.

Jerry: I'm not sure if we have to use the string 'dev_private' instead
of 'private' as second arg to PyDict_SetItemString().

Modified:
   branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
   trunk/source/python/py_spoolss_printers_conv.c


Changeset:
Modified: branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c
===
--- branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c 2005-07-13 
15:19:28 UTC (rev 8430)
+++ branches/SAMBA_3_0/source/python/py_spoolss_printers_conv.c 2005-07-13 
16:47:42 UTC (rev 8431)
@@ -154,7 +154,7 @@
 
PyDict_SetItemString(*dict, private,
 PyString_FromStringAndSize(
-devmode-private, devmode-driverextra));
+devmode-dev_private, 
devmode-driverextra));
 
return True;
 }
@@ -170,7 +170,7 @@
if (!PyString_Check(obj))
goto done;
 
-   devmode-private = PyString_AsString(obj);
+   devmode-dev_private = PyString_AsString(obj);
devmode-driverextra = PyString_Size(obj);
 
PyDict_DelItemString(dict_copy, private);

Modified: trunk/source/python/py_spoolss_printers_conv.c
===
--- trunk/source/python/py_spoolss_printers_conv.c  2005-07-13 15:19:28 UTC 
(rev 8430)
+++ trunk/source/python/py_spoolss_printers_conv.c  2005-07-13 16:47:42 UTC 
(rev 8431)
@@ -154,7 +154,7 @@
 
PyDict_SetItemString(*dict, private,
 PyString_FromStringAndSize(
-devmode-private, devmode-driverextra));
+devmode-dev_private, 
devmode-driverextra));
 
return True;
 }
@@ -170,7 +170,7 @@
if (!PyString_Check(obj))
goto done;
 
-   devmode-private = PyString_AsString(obj);
+   devmode-dev_private = PyString_AsString(obj);
devmode-driverextra = PyString_Size(obj);
 
PyDict_DelItemString(dict_copy, private);

svn commit: samba-docs r782 - in trunk/xslt: .

2005-07-13 Thread jelmer 
Author: jelmer
Date: 2005-07-13 19:20:22 + (Wed, 13 Jul 2005)
New Revision: 782

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=782

Log:
Fix italics issues in Subject Index

Modified:
   trunk/xslt/latex.xsl


Changeset:
Modified: trunk/xslt/latex.xsl
===
--- trunk/xslt/latex.xsl2005-07-12 18:47:32 UTC (rev 781)
+++ trunk/xslt/latex.xsl2005-07-13 19:20:22 UTC (rev 782)
@@ -178,7 +178,7 @@
 xsl:template match=//samba:parameter
xsl:for-each select=synonym
xsl:text\item[{/xsl:textxsl:value-of 
select=./xsl:text}]\null{}#10;/xsl:text
-   xsl:text\index{/xsl:textxsl:value-of 
select=./xsl:text|it}#10;/xsl:text
+   xsl:text\index{/xsl:textxsl:value-of 
select=./xsl:text}#10;/xsl:text
xsl:textThis parameter is a synonym for 
\smbconfoption{/xsl:textxsl:value-of 
select=../@name/xsl:text}./xsl:text
/xsl:for-each
 
@@ -187,7 +187,7 @@
xsl:value-of select=@context/
xsl:text)/xsl:text
xsl:text}]\null{}#10;#10;/xsl:text
-   xsl:text\index{/xsl:textxsl:value-of 
select=@name/xsl:text|it}#10;/xsl:text
+   xsl:text\index{/xsl:textxsl:value-of 
select=@name/xsl:text}#10;/xsl:text
 
!-- Print default value--
xsl:text#10;/xsl:text

svn commit: samba r8432 - in branches/SAMBA_3_0/source: auth include rpc_server

2005-07-13 Thread jmcd 
Author: jmcd
Date: 2005-07-13 20:04:26 + (Wed, 13 Jul 2005)
New Revision: 8432

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8432

Log:
Fix #2077 - login to trusted domain doesn't allow home drive map and login
scripts to be executed.

We were filling in our name as the server which processed the login, even
when it was done by a trusted DC.

Thanks to John Janosik [EMAIL PROTECTED] for the fix.

Modified:
   branches/SAMBA_3_0/source/auth/auth_util.c
   branches/SAMBA_3_0/source/include/auth.h
   branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_util.c
===
--- branches/SAMBA_3_0/source/auth/auth_util.c  2005-07-13 16:47:42 UTC (rev 
8431)
+++ branches/SAMBA_3_0/source/auth/auth_util.c  2005-07-13 20:04:26 UTC (rev 
8432)
@@ -1327,6 +1327,9 @@
return nt_status;
}
 
+   (*server_info)-login_server = unistr2_tdup(mem_ctx, 
+   (info3-uni_logon_srv));
+
(*server_info)-ptok = token; 
 
SAFE_FREE(lgroupSIDs);

Modified: branches/SAMBA_3_0/source/include/auth.h
===
--- branches/SAMBA_3_0/source/include/auth.h2005-07-13 16:47:42 UTC (rev 
8431)
+++ branches/SAMBA_3_0/source/include/auth.h2005-07-13 20:04:26 UTC (rev 
8432)
@@ -69,6 +69,8 @@

DATA_BLOB user_session_key;
DATA_BLOB lm_session_key;
+
+char *login_server; /* which server authorized the login? */

uint32 sam_fill_level;  /* How far is this structure filled? */


Modified: branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c2005-07-13 
16:47:42 UTC (rev 8431)
+++ branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c2005-07-13 
20:04:26 UTC (rev 8432)
@@ -764,8 +764,13 @@
return NT_STATUS_UNSUCCESSFUL;
}

-   pstrcpy(my_name, global_myname());
-
+   
+   if(server_info-login_server) {
+   pstrcpy(my_name, server_info-login_server);
+   } else {
+   pstrcpy(my_name, global_myname());
+   }
+   
if (!NT_STATUS_IS_OK(status 
 = nt_token_to_group_list(p-mem_ctx, 
  domain_sid,

svn commit: samba r8433 - in trunk/source: auth include rpc_server

2005-07-13 Thread jmcd 
Author: jmcd
Date: 2005-07-13 20:10:26 + (Wed, 13 Jul 2005)
New Revision: 8433

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8433

Log:
Merge from 3.0: Fix #2077, passing our server name as the login server
when logging in on trusted domain account.  We now pass the correct (trusted
DC) server name in this case.

Modified:
   trunk/source/auth/auth_util.c
   trunk/source/include/auth.h
   trunk/source/rpc_server/srv_netlog_nt.c


Changeset:
Modified: trunk/source/auth/auth_util.c
===
--- trunk/source/auth/auth_util.c   2005-07-13 20:04:26 UTC (rev 8432)
+++ trunk/source/auth/auth_util.c   2005-07-13 20:10:26 UTC (rev 8433)
@@ -1327,6 +1327,9 @@
return nt_status;
}
 
+   (*server_info)-login_server = unistr2_tdup(mem_ctx, 
+   (info3-uni_logon_srv));
+
(*server_info)-ptok = token; 
 
SAFE_FREE(lgroupSIDs);

Modified: trunk/source/include/auth.h
===
--- trunk/source/include/auth.h 2005-07-13 20:04:26 UTC (rev 8432)
+++ trunk/source/include/auth.h 2005-07-13 20:10:26 UTC (rev 8433)
@@ -69,6 +69,8 @@

DATA_BLOB user_session_key;
DATA_BLOB lm_session_key;
+
+char *login_server; /* which server authorized the login? */

uint32 sam_fill_level;  /* How far is this structure filled? */


Modified: trunk/source/rpc_server/srv_netlog_nt.c
===
--- trunk/source/rpc_server/srv_netlog_nt.c 2005-07-13 20:04:26 UTC (rev 
8432)
+++ trunk/source/rpc_server/srv_netlog_nt.c 2005-07-13 20:10:26 UTC (rev 
8433)
@@ -764,8 +764,13 @@
return NT_STATUS_UNSUCCESSFUL;
}

-   pstrcpy(my_name, global_myname());
-
+   
+   if(server_info-login_server) {
+   pstrcpy(my_name, server_info-login_server);
+   } else {
+   pstrcpy(my_name, global_myname());
+   }
+   
if (!NT_STATUS_IS_OK(status 
 = nt_token_to_group_list(p-mem_ctx, 
  domain_sid,

svn commit: samba r8434 - in branches/SAMBA_4_0/source: . include lib/replace lib/replace/win32

2005-07-13 Thread jelmer 
Author: jelmer
Date: 2005-07-13 20:44:46 + (Wed, 13 Jul 2005)
New Revision: 8434

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8434

Log:
Win32 portability updates from Steven Edwards [EMAIL PROTECTED]:
 - undefine anything in the win32 api or PSDK headers that Samba already defines
 - map BSD error codes to Winsock Error codes

Added:
   branches/SAMBA_4_0/source/lib/replace/win32/
   branches/SAMBA_4_0/source/lib/replace/win32/config.m4
   branches/SAMBA_4_0/source/lib/replace/win32/replace.h
Removed:
   branches/SAMBA_4_0/source/lib/replace/win32.m4
Modified:
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/include/includes.h


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===
--- branches/SAMBA_4_0/source/configure.in  2005-07-13 20:10:26 UTC (rev 
8433)
+++ branches/SAMBA_4_0/source/configure.in  2005-07-13 20:44:46 UTC (rev 
8434)
@@ -10,7 +10,7 @@
 
 sinclude(build/m4/env.m4)
 sinclude(build/m4/rewrite.m4)
-sinclude(lib/replace/win32.m4)
+sinclude(lib/replace/win32/config.m4)
 sinclude(heimdal_build/config.m4)
 sinclude(lib/popt/config.m4)
 sinclude(lib/iconv.m4)

Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-07-13 20:10:26 UTC 
(rev 8433)
+++ branches/SAMBA_4_0/source/include/includes.h2005-07-13 20:44:46 UTC 
(rev 8434)
@@ -68,6 +68,10 @@
 #include windows.h
 #endif
 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include lib/replace/win32/replace.h
+#endif
+
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS)  defined(HAVE_KRB5)  defined(HAVE_LDAP)
 #define HAVE_ADS

Copied: branches/SAMBA_4_0/source/lib/replace/win32/config.m4 (from rev 8433, 
branches/SAMBA_4_0/source/lib/replace/win32.m4)

Added: branches/SAMBA_4_0/source/lib/replace/win32/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/win32/replace.h   2005-07-13 
20:10:26 UTC (rev 8433)
+++ branches/SAMBA_4_0/source/lib/replace/win32/replace.h   2005-07-13 
20:44:46 UTC (rev 8434)
@@ -0,0 +1,143 @@
+#ifndef _WIN32_REPLACE_H
+#define _WIN32_REPLACE_H
+
+/* Map BSD Socket errorcodes to the WSA errorcodes (if possible) */ 
+
+#define EAFNOSUPPORT   WSAEAFNOSUPPORT
+#define ECONNREFUSEDWSAECONNREFUSED 
+#define EINPROGRESSWSAEINPROGRESS
+#define EMSGSIZE   WSAEMSGSIZE 
+#define ENOBUFS WSAENOBUFS
+#define ENOTSOCK   WSAENOTSOCK
+#define ENETUNREACHWSAENETUNREACH
+#define ENOPROTOOPTWSAENOPROTOOPT
+#define ENOTCONN   WSAENOTCONN 
+#define ENOTSUP134 
+
+/* We undefine the following constants due to conflicts with the w32api headers
+ * and the Windows Platform SDK/DDK.
+ */
+
+#undef interface
+
+#undef ERROR_INVALID_PARAMETER
+#undef ERROR_INSUFFICIENT_BUFFER
+#undef ERROR_INVALID_DATATYPE
+
+#undef FILE_GENERIC_READ
+#undef FILE_GENERIC_WRITE
+#undef FILE_GENERIC_EXECUTE
+#undef FILE_ATTRIBUTE_READONLY
+#undef FILE_ATTRIBUTE_HIDDEN
+#undef FILE_ATTRIBUTE_SYSTEM
+#undef FILE_ATTRIBUTE_DIRECTORY
+#undef FILE_ATTRIBUTE_ARCHIVE
+#undef FILE_ATTRIBUTE_DEVICE
+#undef FILE_ATTRIBUTE_NORMAL
+#undef FILE_ATTRIBUTE_TEMPORARY
+#undef FILE_ATTRIBUTE_REPARSE_POINT
+#undef FILE_ATTRIBUTE_COMPRESSED
+#undef FILE_ATTRIBUTE_OFFLINE
+#undef FILE_ATTRIBUTE_ENCRYPTED
+#undef FILE_FLAG_WRITE_THROUGH
+#undef FILE_FLAG_NO_BUFFERING
+#undef FILE_FLAG_RANDOM_ACCESS
+#undef FILE_FLAG_SEQUENTIAL_SCAN
+#undef FILE_FLAG_DELETE_ON_CLOSE
+#undef FILE_FLAG_BACKUP_SEMANTICS
+#undef FILE_FLAG_POSIX_SEMANTICS
+#undef FILE_TYPE_DISK
+#undef FILE_TYPE_UNKNOWN
+#undef FILE_CASE_SENSITIVE_SEARCH
+#undef FILE_CASE_PRESERVED_NAMES
+#undef FILE_UNICODE_ON_DISK
+#undef FILE_PERSISTENT_ACLS
+#undef FILE_FILE_COMPRESSION
+#undef FILE_VOLUME_QUOTAS
+#undef FILE_VOLUME_IS_COMPRESSED
+#undef FILE_NOTIFY_CHANGE_DIR_NAME
+#undef FILE_NOTIFY_CHANGE_ATTRIBUTES
+#undef FILE_NOTIFY_CHANGE_SIZE
+#undef FILE_NOTIFY_CHANGE_LAST_WRITE
+#undef FILE_NOTIFY_CHANGE_LAST_ACCESS
+#undef FILE_NOTIFY_CHANGE_CREATION
+#undef FILE_NOTIFY_CHANGE_EA
+#undef FILE_NOTIFY_CHANGE_SECURITY
+#undef FILE_NOTIFY_CHANGE_FILE_NAME
+
+#undef PRINTER_ATTRIBUTE_QUEUED
+#undef PRINTER_ATTRIBUTE_DIRECT
+#undef PRINTER_ATTRIBUTE_DEFAULT
+#undef PRINTER_ATTRIBUTE_SHARED
+#undef PRINTER_ATTRIBUTE_NETWORK
+#undef PRINTER_ATTRIBUTE_HIDDEN
+#undef PRINTER_ATTRIBUTE_LOCAL
+#undef PRINTER_ATTRIBUTE_ENABLE_DEVQ
+#undef PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS
+#undef PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST
+#undef PRINTER_ATTRIBUTE_WORK_OFFLINE
+#undef PRINTER_ATTRIBUTE_ENABLE_BIDI
+#undef PRINTER_ATTRIBUTE_RAW_ONLY
+#undef PRINTER_ATTRIBUTE_PUBLISHED
+#undef PRINTER_ENUM_DEFAULT
+#undef PRINTER_ENUM_LOCAL
+#undef PRINTER_ENUM_CONNECTIONS
+#undef PRINTER_ENUM_FAVORITE
+#undef PRINTER_ENUM_NAME

svn commit: samba r8435 - branches/SAMBA_3_0/source/python trunk/source/python

2005-07-13 Thread lmuelle 
Author: lmuelle
Date: 2005-07-13 21:10:12 + (Wed, 13 Jul 2005)
New Revision: 8435

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8435

Log:
Use OPENX_FILE_EXISTS_OPEN instead of FILE_EXISTS_OPEN.

Modified:
   branches/SAMBA_3_0/source/python/py_smb.c
   trunk/source/python/py_smb.c


Changeset:
Modified: branches/SAMBA_3_0/source/python/py_smb.c
===
--- branches/SAMBA_3_0/source/python/py_smb.c   2005-07-13 20:44:46 UTC (rev 
8434)
+++ branches/SAMBA_3_0/source/python/py_smb.c   2005-07-13 21:10:12 UTC (rev 
8435)
@@ -154,7 +154,7 @@
char *filename;
uint32 desired_access, file_attributes = 0, 
share_access = FILE_SHARE_READ | FILE_SHARE_WRITE,
-   create_disposition = FILE_EXISTS_OPEN, create_options = 0;
+   create_disposition = OPENX_FILE_EXISTS_OPEN, create_options = 0;
int result;
 
/* Parse parameters */

Modified: trunk/source/python/py_smb.c
===
--- trunk/source/python/py_smb.c2005-07-13 20:44:46 UTC (rev 8434)
+++ trunk/source/python/py_smb.c2005-07-13 21:10:12 UTC (rev 8435)
@@ -154,7 +154,7 @@
char *filename;
uint32 desired_access, file_attributes = 0, 
share_access = FILE_SHARE_READ | FILE_SHARE_WRITE,
-   create_disposition = FILE_EXISTS_OPEN, create_options = 0;
+   create_disposition = OPENX_FILE_EXISTS_OPEN, create_options = 0;
int result;
 
/* Parse parameters */

svn commit: samba r8436 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread jelmer 
Author: jelmer
Date: 2005-07-13 21:44:56 + (Wed, 13 Jul 2005)
New Revision: 8436

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8436

Log:
Check for sys/sockets.h

Modified:
   branches/SAMBA_4_0/source/heimdal_build/krb5-types.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/krb5-types.h
===
--- branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2005-07-13 
21:10:12 UTC (rev 8435)
+++ branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2005-07-13 
21:44:56 UTC (rev 8436)
@@ -13,7 +13,9 @@
 #if HAVE_SYS_BITYPES_H
 #include sys/bitypes.h
 #endif
+#ifdef HAVE_SYS_SOCKET_H
 #include sys/socket.h
+#endif
 
 
 typedef socklen_t krb5_socklen_t;

svn commit: samba r8437 - in branches/SAMBA_4_0/source/lib/replace/win32: .

2005-07-13 Thread jelmer 
Author: jelmer
Date: 2005-07-13 21:54:34 + (Wed, 13 Jul 2005)
New Revision: 8437

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8437

Log:
Win32 doesn't have u_int*_t

Modified:
   branches/SAMBA_4_0/source/lib/replace/win32/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/win32/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/win32/replace.h   2005-07-13 
21:44:56 UTC (rev 8436)
+++ branches/SAMBA_4_0/source/lib/replace/win32/replace.h   2005-07-13 
21:54:34 UTC (rev 8437)
@@ -140,4 +140,7 @@
 #undef SE_GROUP_ENABLED_BY_DEFAULT
 #undef SE_GROUP_ENABLED
 
+typedef uint32_t u_int32_t;
+typedef uint16_t u_int16_t;
+
 #endif /* _WIN32_REPLACE_H */

svn commit: samba r8438 - in branches/SAMBA_4_0: . source/heimdal_build source/include

2005-07-13 Thread jelmer 
Author: jelmer
Date: 2005-07-13 22:11:52 + (Wed, 13 Jul 2005)
New Revision: 8438

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8438

Log:
- More win32 portability fixes. Now fails on socketwrapper (because 
unix domain sockets are not available on win32)
- Update howto

Modified:
   branches/SAMBA_4_0/howto.txt
   branches/SAMBA_4_0/source/heimdal_build/glue.c
   branches/SAMBA_4_0/source/include/includes.h


Changeset:
Modified: branches/SAMBA_4_0/howto.txt
===
--- branches/SAMBA_4_0/howto.txt2005-07-13 21:54:34 UTC (rev 8437)
+++ branches/SAMBA_4_0/howto.txt2005-07-13 22:11:52 UTC (rev 8438)
@@ -29,30 +29,6 @@
   $ cd samba4
   $ svn up
 
-Step 1a: Use Lorikeet/Heimdal
--
-
-If you want to use Kerberos in Samba4, you must use
-'Lorikeet/heimdal', and place a checkout into samba4/source/heimdal
-
-There are 2 methods of doing this:
-
-  method 1:  
-$ cd samba4/source
-$ rsync -avz samba.org::ftp/unpacked/lorikeet-heimdal heimdal
-
-  method 2:  
-
-$ cd samba4/source
-$ svn co svn://svnanon.samba.org/lorikeet/trunk/heimdal heimdal
-
-both methods will create a directory called heimdal in the samba4/source
-directory. 
-
-(Long-term, we will either import Heimdal from 'lorikeet', or setup a
-reference between the repositories, so this and svn update works
-automaticly. In the short term, you must manually update this directory). 
-
 Step 2: compile Samba4
 --
 
@@ -60,13 +36,13 @@
 
   $ cd samba4/source
   $ ./autogen.sh
-  $ ./configure.developer -C
+  $ ./configure.developer
 
 If you did not include heimdal, run this:
   $ make proto all
 
 If you did include Heimdal, a different step is required:
-  $ make proto HEIMDAL_EXTERNAL all
+  $ make proto all
 
 If you have gcc 3.4 or newer, then substitue pch for proto to
 greatly speed up the compile process (about 5x faster).
@@ -88,7 +64,7 @@
 The provision step sets up a basic user database. 
 
   $ cd source
-  $ ./setup/provision.pl --realm=YOUR.REALM --domain=YOURDOM 
--adminpass=SOMEPASSWORD
+  $ ./setup/provision --realm=YOUR.REALM --domain=YOURDOM 
--adminpass=SOMEPASSWORD
 
 This will create a number of new 'ldb' database files in a directory
 newdb.XXX. You need to move these to the private subdirectory of

Modified: branches/SAMBA_4_0/source/heimdal_build/glue.c
===
--- branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-13 21:54:34 UTC 
(rev 8437)
+++ branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-13 22:11:52 UTC 
(rev 8438)
@@ -23,12 +23,11 @@
 #include includes.h
 #include system/network.h
 #include system/kerberos.h
-#include err.h
 
 /*
   get the list of IP addresses for configured interfaces
 */
-krb5_error_code krb5_get_all_client_addrs(krb5_context context, krb5_addresses 
*res)
+krb5_error_code KRB5_LIB_FUNCTION krb5_get_all_client_addrs(krb5_context 
context, krb5_addresses *res)
 {
int i;
res-len = iface_count();

Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-07-13 21:54:34 UTC 
(rev 8437)
+++ branches/SAMBA_4_0/source/include/includes.h2005-07-13 22:11:52 UTC 
(rev 8438)
@@ -64,6 +64,10 @@
 #include winsock2.h
 #endif
 
+#ifdef HAVE_WS2TCPIP_H
+#include ws2tcpip.h
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include windows.h
 #endif

Build status as of Thu Jul 14 00:00:03 2005

2005-07-13 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2005-07-13 
00:00:12.0 +
+++ /home/build/master/cache/broken_results.txt 2005-07-14 00:00:10.0 
+
@@ -1,16 +1,16 @@
-Build status as of Wed Jul 13 00:00:02 2005
+Build status as of Thu Jul 14 00:00:03 2005
 
 Build counts:
 Tree Total  Broken Panic 
-ccache   9  4  0 
-distcc   11 1  0 
-lorikeet-heimdal 33 8  0 
+ccache   11 5  0 
+distcc   13 3  0 
+lorikeet-heimdal 35 11 0 
 ppp  20 2  0 
-rsync35 2  0 
+rsync15 2  0 
 samba-docs   0  0  0 
-samba4   37 34 2 
-samba_3_035 7  0 
-smb-build27 0  0 
-talloc   14 6  0 
-tdb  32 32 0 
+samba4   39 35 2 
+samba_3_037 9  0 
+smb-build33 3  0 
+talloc   15 7  0 
+tdb  34 34 0

svn commit: samba r8439 - in branches/SAMBA_4_0/source/heimdal_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 00:52:12 + (Thu, 14 Jul 2005)
New Revision: 8439

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8439

Log:
removed an accidential commit

Modified:
   branches/SAMBA_4_0/source/heimdal_build/glue.c


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/glue.c
===
--- branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-13 22:11:52 UTC 
(rev 8438)
+++ branches/SAMBA_4_0/source/heimdal_build/glue.c  2005-07-14 00:52:12 UTC 
(rev 8439)
@@ -50,10 +50,3 @@
 }
 
 
-void errx(int eval, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  verrx(eval, fmt, ap);
-  va_end(ap);
-}

svn commit: samba r8440 - in branches/SAMBA_4_0/source/build/smb_build: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 01:11:40 + (Thu, 14 Jul 2005)
New Revision: 8440

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8440

Log:
- several build farm hosts were failing 'make clean' as the list of
  objects was overflowing their command line limits. Fix this by using a
  find -exec command. It's slower, but should be more portable.

- remove generated ASN1 files in 'make clean'

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2005-07-14 
00:52:12 UTC (rev 8439)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2005-07-14 
01:11:40 UTC (rev 8440)
@@ -548,13 +548,17 @@
 
 clean: delheaders
@echo Removing objects
-   @-rm -f $(_ALL_OBJS_OBJS)
+   @-find . -name '*.o' -exec rm -f '{}' \;
@echo Removing binaries
@-rm -f bin/*
@echo Removing dummy targets
@-rm -f bin/.*_*
@echo Removing generated files
@-rm -rf librpc/gen_*
+   @echo Removing generated ASN1 files
+   @-find heimdal/lib/asn1 -name 'asn1_*.[xc]' -exec rm -f '{}' \;
+   @-find heimdal/lib/gssapi -name 'asn1_*.[xc]' -exec rm -f '{}' \;
+   @-find heimdal/lib/hdb -name 'asn1_*.[xc]' -exec rm -f '{}' \;
 
 distclean: clean
-rm -f bin/.dummy

svn commit: samba r8441 - in branches/SAMBA_4_0/source/lib/tdb: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 02:35:51 + (Thu, 14 Jul 2005)
New Revision: 8441

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8441

Log:
don't build tdbtest by default as there are too many systems that
don't have libgdbm, and the configure test for gdbm is broken

Modified:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 01:11:40 UTC 
(rev 8440)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 02:35:51 UTC 
(rev 8441)
@@ -10,7 +10,7 @@
 includedir = @includedir@
 libdir = @libdir@
 
-PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
+PROGS = bin/tdbtool bin/tdbtorture
 TDB_OBJ = common/tdb.o common/spinlock.o
 
 all: $(PROGS)

Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4
===
--- branches/SAMBA_4_0/source/lib/tdb/config.m4 2005-07-14 01:11:40 UTC (rev 
8440)
+++ branches/SAMBA_4_0/source/lib/tdb/config.m4 2005-07-14 02:35:51 UTC (rev 
8441)
@@ -3,19 +3,3 @@
SMB_LIBRARY_ENABLE(libtdb,YES)
 fi
 
-###
-# start SMB_EXT_LIB_GDBM 
-# check for gdbm.h and -lgdbm
-AC_CHECK_HEADERS(gdbm.h)
-AC_CHECK_LIB_EXT(gdbm, GDBM_LIBS, gdbm_open)
-if test x$ac_cv_header_gdbm_h = xyes -a x$ac_cv_lib_ext_gdbm_gdbm_open = 
xyes;then
-   SMB_EXT_LIB_ENABLE(GDBM,YES)
-fi
-SMB_EXT_LIB(GDBM, $GDBM_LIBS)
-# end SMB_EXT_LIB_GDBM
-###
-
-SMB_BINARY_ENABLE(tdbtest, NO)
-if test x$SMB_EXT_LIB_ENABLE_GDBM = xYES; then
-   SMB_BINARY_ENABLE(tdbtest, YES)
-fi

svn commit: samba r8442 - in branches/SAMBA_4_0/source/lib/tdb: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 02:37:01 + (Thu, 14 Jul 2005)
New Revision: 8442

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8442

Log:
remove tdbtest from our build. If you want it, then do 
'make bin/tdbtest' manually in the tdb tree

Modified:
   branches/SAMBA_4_0/source/lib/tdb/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk
===
--- branches/SAMBA_4_0/source/lib/tdb/config.mk 2005-07-14 02:35:51 UTC (rev 
8441)
+++ branches/SAMBA_4_0/source/lib/tdb/config.mk 2005-07-14 02:37:01 UTC (rev 
8442)
@@ -26,16 +26,6 @@
 
 
 
-# Start BINARY tdbtest
-[BINARY::tdbtest]
-OBJ_FILES= \
-   lib/tdb/tools/tdbtest.o
-REQUIRED_SUBSYSTEMS = \
-   LIBTDB EXT_LIB_GDBM
-# End BINARY tdbtest
-
-
-
 # Start BINARY tdbtool
 [BINARY::tdbtool]
 ENABLE = NO

svn commit: samba r8443 - in branches/SAMBA_4_0/source/lib/talloc: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 02:44:30 + (Thu, 14 Jul 2005)
New Revision: 8443

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8443

Log:
added talloc.3 to the tree to try to allow talloc to build on systems without 
xsltproc
Added:
   branches/SAMBA_4_0/source/lib/talloc/talloc.3


Changeset:
Sorry, the patch is too large (494 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8443

svn commit: samba r8444 - in branches/SAMBA_4_0/source: .

2005-07-13 Thread lha 
Author: lha
Date: 2005-07-14 02:56:18 + (Thu, 14 Jul 2005)
New Revision: 8444

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8444

Log:
make ./configure.mumble CC='ccache cc'
work by using @$ instead of $*

Modified:
   branches/SAMBA_4_0/source/configure.developer
   branches/SAMBA_4_0/source/configure.nodebug.developer
   branches/SAMBA_4_0/source/configure.tridge.opt


Changeset:
Modified: branches/SAMBA_4_0/source/configure.developer
===
--- branches/SAMBA_4_0/source/configure.developer   2005-07-14 02:44:30 UTC 
(rev 8443)
+++ branches/SAMBA_4_0/source/configure.developer   2005-07-14 02:56:18 UTC 
(rev 8444)
@@ -1,2 +1,2 @@
 #!/bin/sh
-`dirname $0`/configure -C --enable-developer $*
+`dirname $0`/configure -C --enable-developer $@

Modified: branches/SAMBA_4_0/source/configure.nodebug.developer
===
--- branches/SAMBA_4_0/source/configure.nodebug.developer   2005-07-14 
02:44:30 UTC (rev 8443)
+++ branches/SAMBA_4_0/source/configure.nodebug.developer   2005-07-14 
02:56:18 UTC (rev 8444)
@@ -1,3 +1,3 @@
 #!/bin/sh
 CFLAGS=-Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual 
-Wcast-align -DDEBUG_PASSWORD; export CFLAGS
-./configure $*
+./configure $@

Modified: branches/SAMBA_4_0/source/configure.tridge.opt
===
--- branches/SAMBA_4_0/source/configure.tridge.opt  2005-07-14 02:44:30 UTC 
(rev 8443)
+++ branches/SAMBA_4_0/source/configure.tridge.opt  2005-07-14 02:56:18 UTC 
(rev 8444)
@@ -1,2 +1,2 @@
 #!/bin/sh
-./configure $* -C --prefix=/home/tridge/samba/samba4/prefix --enable-developer 
--enable-debug --enable-socket-wrapper 
+./configure $@ -C --prefix=/home/tridge/samba/samba4/prefix 
--enable-developer --enable-debug --enable-socket-wrapper

svn commit: samba r8445 - in branches/SAMBA_4_0/source/scripting/libjs: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 03:10:17 + (Thu, 14 Jul 2005)
New Revision: 8445

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8445

Log:
if a system doesn't have nogroup then try nobody

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js  2005-07-14 
02:56:18 UTC (rev 8444)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js  2005-07-14 
03:10:17 UTC (rev 8445)
@@ -208,7 +208,7 @@
subobj.USN  = nextusn;
subobj.ROOT = findnss(getpwnam, root);
subobj.NOBODY   = findnss(getpwnam, nobody);
-   subobj.NOGROUP  = findnss(getgrnam, nogroup);
+   subobj.NOGROUP  = findnss(getgrnam, nogroup, nobody);
subobj.WHEEL= findnss(getgrnam, wheel, root);
subobj.USERS= findnss(getgrnam, users, guest, other);
subobj.DNSDOMAIN= strlower(subobj.REALM);

svn commit: samba r8446 - in branches/SAMBA_4_0/source/script/tests: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 03:13:04 + (Thu, 14 Jul 2005)
New Revision: 8446

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8446

Log:
if provisioning fails then don't try to run the test suite!

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2005-07-14 03:10:17 UTC 
(rev 8445)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2005-07-14 03:13:04 UTC 
(rev 8446)
@@ -95,7 +95,7 @@
 EOF
 
 ./setup/provision $CONFIGURATION --quiet --domain $DOMAIN --realm $REALM \
---adminpass $PASSWORD --root=$ROOT
+--adminpass $PASSWORD --root=$ROOT || exit 1
 
 if [ x$RUN_FROM_BUILD_FARM = xyes ];then
CONFIGURATION=$CONFIGURATION --option=\torture:progress=no\

svn commit: samba r8447 - in branches/SAMBA_4_0/source/lib/tdb: .

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 04:00:38 + (Thu, 14 Jul 2005)
New Revision: 8447

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8447

Log:
fixed make install in the farm



Modified:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 03:13:04 UTC 
(rev 8446)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 04:00:38 UTC 
(rev 8447)
@@ -16,6 +16,9 @@
 all: $(PROGS)
 
 install: all
+   mkdir -p $(bindir)
+   mkdir -p $(includedir)
+   mkdir -p $(libdir)
cp $(PROGS) $(bindir)
cp include/tdb.h $(includedir)
cp tdb.pc $(libdir)/pkgconfig

svn commit: samba r8448 - in branches/SAMBA_4_0/source/lib/tdb: . tools

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 04:27:55 + (Thu, 14 Jul 2005)
New Revision: 8448

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8448

Log:
- added a test target for tdb

- reduced the torture size so it doesn't kill the build farm hosts




Modified:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 04:00:38 UTC 
(rev 8447)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in   2005-07-14 04:27:55 UTC 
(rev 8448)
@@ -40,3 +40,8 @@
 
 clean:
rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core 
test.db test.tdb test.gdbm
+
+installcheck: install
+   $(bindir)/tdbtorture
+
+test: installcheck

Modified: branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c
===
--- branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c2005-07-14 
04:00:38 UTC (rev 8447)
+++ branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c2005-07-14 
04:27:55 UTC (rev 8448)
@@ -182,11 +182,11 @@
 }
 
 #ifndef NPROC
-#define NPROC 6
+#define NPROC 2
 #endif
 
 #ifndef NLOOPS
-#define NLOOPS 20
+#define NLOOPS 5000
 #endif
 
  int main(int argc, const char *argv[])
@@ -197,6 +197,8 @@
 
pids[0] = getpid();
 
+   unlink(torture.tdb);
+
for (i=0;iNPROC-1;i++) {
if ((pids[i+1]=fork()) == 0) break;
}

svn commit: samba r8449 - in branches/SAMBA_4_0/source: . heimdal_build

2005-07-13 Thread tridge 
Author: tridge
Date: 2005-07-14 05:54:32 + (Thu, 14 Jul 2005)
New Revision: 8449

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8449

Log:
- search for lex and yacc properly

- added target specific flags to get the #include order right for
  com_err and asn1 files in heimdal

Modified:
   branches/SAMBA_4_0/source/extra_cflags.txt
   branches/SAMBA_4_0/source/heimdal_build/build_external.sh
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/extra_cflags.txt
===
--- branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-14 04:27:55 UTC (rev 
8448)
+++ branches/SAMBA_4_0/source/extra_cflags.txt  2005-07-14 05:54:32 UTC (rev 
8449)
@@ -1,2 +1,4 @@
 heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken 
-Iheimdal/include -DNO_PRINTF_ATTRIBUTE
+heimdal/lib/com_err -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/kdc 
-Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include -DNO_PRINTF_ATTRIBUTE
+heimdal/lib/asn1 -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/kdc 
-Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include -DNO_PRINTF_ATTRIBUTE
 heimdal_build/replace.o -Iheimdal_build -Iheimdal/lib/roken

Modified: branches/SAMBA_4_0/source/heimdal_build/build_external.sh
===
--- branches/SAMBA_4_0/source/heimdal_build/build_external.sh   2005-07-14 
04:27:55 UTC (rev 8448)
+++ branches/SAMBA_4_0/source/heimdal_build/build_external.sh   2005-07-14 
05:54:32 UTC (rev 8449)
@@ -3,15 +3,14 @@
 # build generated asn1, et and flex files in heimdal/ tree
 # [EMAIL PROTECTED], June 2005
 
-CC=shift
+CC=$1
+LEX=$2
+YACC=$3
+
 TOP=`pwd`
 ASN1_COMPILE=$TOP/bin/asn1_compile
 ET_COMPILE=$TOP/bin/compile_et
 
-# we need to substitute these correctly based on configure output
-FLEX=flex
-BISON=bison
-
 build_asn1() {
 f=$1
 name=$2
@@ -41,31 +40,39 @@
 dir=`dirname $f`
 file=`basename $f`
 base=`basename $f .l`
+if [ -z $LEX ]; then
+   echo lex not found
+   return;
+fi
 if [ -r $dir/$base.c ]; then
if [ x`find $f -newer $dir/$base.c -print` != x$f ]; then
return;
-   fi
+fi
 fi
 echo Building $f
-if cd $dir  $FLEX $file; then
+if cd $dir  $LEX $file; then
sed '/^#/ s|$base.yy\.c|$base.c|' $base.yy.c  $base.c
rm -f $base.yy.c
 fi
 cd $TOP || exit 1
 }
 
-build_bison() {
+build_yacc() {
 f=$1
 dir=`dirname $f`
 file=`basename $f`
 base=`basename $f .y`
+if [ -z $YACC ]; then
+   echo yacc not found
+   return;
+fi
 if [ -r $dir/$base.c ]; then
if [ x`find $f -newer $dir/$base.c -print` != x$f ]; then
return;
-   fi
+fi
 fi
 echo Building $f
-if cd $dir  $BISON -y -d $file; then
+if cd $dir  $YACC -d $file; then
sed -e /^#/!b -e s|y\.tab\.h|$base.h| y.tab.h  $base.h
sed '/^#/ s|y\.tab\.c|$base.c|' y.tab.c  $base.c
rm -f y.tab.c y.tab.h
@@ -88,8 +95,8 @@
 build_cp heimdal/lib/roken/err.hin
 build_lex heimdal/lib/asn1/lex.l
 build_lex heimdal/lib/com_err/lex.l
-build_bison heimdal/lib/com_err/parse.y
-build_bison heimdal/lib/asn1/parse.y
+build_yacc heimdal/lib/com_err/parse.y
+build_yacc heimdal/lib/asn1/parse.y
 
 make bin/asn1_compile || exit 1
 build_asn1 heimdal/lib/hdb/hdb.asn1 hdb_asn1

Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-14 04:27:55 UTC 
(rev 8448)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2005-07-14 05:54:32 UTC 
(rev 8449)
@@ -171,6 +171,9 @@
 SMB_BINARY_ENABLE(asn1_compile, NO)
 SMB_BINARY_ENABLE(compile_et, NO)
 
+AC_PROG_LEX
+AC_PROG_YACC
+
 # to enable kerberos, unpack a heimdal source tree in the heimdal directory
 # of the samba source tree
 if test -d heimdal; then

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-14 04:27:55 UTC 
(rev 8448)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2005-07-14 05:54:32 UTC 
(rev 8449)
@@ -369,7 +369,7 @@
 ###
 # Start TARGET HEIMDAL_EXTERNAL
 [TARGET::HEIMDAL_EXTERNAL]
-CMD = heimdal_build/build_external.sh $(CC)
+CMD = heimdal_build/build_external.sh @CC@ @LEX@ @YACC@
 REQUIRED_SUBSYSTEMS = ASN1_COMPILER
 # END TARGET HEIMDAL_EXTERNAL
 ###