date:20070115

svn commit: samba r20823 - in branches/SAMBA_4_0/source/torture: basic local

2007-01-15 Thread jelmer

Author: jelmer
Date: 2007-01-16 01:36:15 + (Tue, 16 Jan 2007)
New Revision: 20823

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20823

Log:
Remove newlines in calls to torture_fail().
Modified:
   branches/SAMBA_4_0/source/torture/basic/base.c
   branches/SAMBA_4_0/source/torture/local/dbspeed.c
   branches/SAMBA_4_0/source/torture/local/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/base.c
===
--- branches/SAMBA_4_0/source/torture/basic/base.c  2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/basic/base.c  2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -93,7 +93,7 @@
if (status) {
torture_fail(tctx, talloc_asprintf(tctx, 
   "tconx to share %s with type %s "
-  "should have failed but succeeded\n",
+  "should have failed but succeeded",
   myshare, devtype));
} else {
if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),
@@ -725,7 +725,7 @@
 NT_STATUS_INVALID_HANDLE)) {
torture_fail(tctx, talloc_asprintf(tctx, 
"qfileinfo should have returned DOS error "
-  "ERRSRV:ERRbaduid\n  but returned %s\n",
+  "ERRSRV:ERRbaduid\n  but returned %s",
   smbcli_errstr(cli->tree)));
}
 

Modified: branches/SAMBA_4_0/source/torture/local/dbspeed.c
===
--- branches/SAMBA_4_0/source/torture/local/dbspeed.c   2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/dbspeed.c   2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -63,7 +63,7 @@
tdbw = tdb_wrap_open(tmp_ctx, "test.tdb", 
 1, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
if (!tdbw) {
-   torture_fail(torture, "Failed to open test.tdb\n");
+   torture_fail(torture, "Failed to open test.tdb");
goto failed;
}
 
@@ -171,7 +171,7 @@
ldb = ldb_wrap_connect(tmp_ctx, "tdb://test.ldb", 
NULL, NULL, LDB_FLG_NOSYNC, NULL);
if (!ldb) {
-   torture_fail(torture, "Failed to open test.ldb\n");
+   torture_fail(torture, "Failed to open test.ldb");
goto failed;
}
 
@@ -207,20 +207,20 @@
i = random() % torture_entries;
dn = ldb_dn_new_fmt(tmp_ctx, ldb, 
"SID=S-1-5-21-53173311-3623041448-2049097239-%u", i);
if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != 
LDB_SUCCESS || res->count != 1) {
-   torture_fail(torture, talloc_asprintf(torture, "Failed 
to find SID %d\n", i));
+   torture_fail(torture, talloc_asprintf(torture, "Failed 
to find SID %d", i));
}
talloc_free(res);
talloc_free(dn);
expr = talloc_asprintf(tmp_ctx, "(UID=%u)", i);
if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) 
!= LDB_SUCCESS || res->count != 1) {
-   torture_fail(torture, talloc_asprintf(torture, "Failed 
to find UID %d\n", i));
+   torture_fail(torture, talloc_asprintf(torture, "Failed 
to find UID %d", i));
}
talloc_free(res);
talloc_free(expr);
}
 
if (talloc_total_blocks(torture) > 100) {
-   torture_fail(torture, "memory leak in ldb search\n");
+   torture_fail(torture, "memory leak in ldb search");
goto failed;
}
 

Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===
--- branches/SAMBA_4_0/source/torture/local/iconv.c 2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c 2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -133,7 +133,7 @@
if (cd == (iconv_t)-1) {
torture_fail(test, 
 talloc_asprintf(test, 
-"failed to open %s to 
UTF-16LE\n",
+"failed to open %s to 
UTF-16LE",
 charset));
cd = NULL;
return false;

svn commit: smb-build r69 - in trunk: .

2007-01-15 Thread jelmer

Author: jelmer
Date: 2007-01-16 01:13:13 + (Tue, 16 Jan 2007)
New Revision: 69

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=smb-build&rev=69

Log:
Check if the build breakage script still works.
Modified:
   trunk/foo.c


Changeset:
Modified: trunk/foo.c
===
--- trunk/foo.c 2006-10-11 12:08:17 UTC (rev 68)
+++ trunk/foo.c 2007-01-16 01:13:13 UTC (rev 69)
@@ -1,3 +1,4 @@
+#error "Fails"
 #include 
 
 #define eprintf(...) fprintf(stderr, __VA_ARGS__)

Build status as of Tue Jan 16 00:00:02 2007

2007-01-15 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-01-15 
00:00:35.0 +
+++ /home/build/master/cache/broken_results.txt 2007-01-16 00:00:23.0 
+
@@ -1,22 +1,22 @@
-Build status as of Mon Jan 15 00:00:02 2007
+Build status as of Tue Jan 16 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
 SOC  0  0  0 
 build_farm   0  0  0 
-ccache   35 7  0 
+ccache   36 7  0 
 ctdb 0  0  0 
-distcc   2  0  0 
-ldb  34 3  0 
+distcc   3  0  0 
+ldb  34 4  0 
 libreplace   32 2  0 
 lorikeet-heimdal 31 17 0 
 ppp  17 0  0 
-rsync35 3  0 
+rsync36 4  0 
 samba0  0  0 
 samba-docs   0  0  0 
-samba4   32 11 1 
-samba_3_035 12 0 
+samba4   33 6  1 
+samba_3_036 9  0 
 smb-build32 2  0 
-talloc   35 0  0 
-tdb  33 2  0 
+talloc   36 0  0 
+tdb  34 2  0

Rev 11156: Fix lseek() argument order. in file:///home/jelmer/bzr.samba/4.0-regwrite/

2007-01-15 Thread Jelmer Vernooij


revno: 11156
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-regwrite
timestamp: Tue 2007-01-16 00:54:10 +0100
message:
  Fix lseek() argument order.
modified:
  source/lib/registry/reg_backend_regf.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/reg_backend_regf.c'
--- a/source/lib/registry/reg_backend_regf.c2007-01-14 15:15:41 +
+++ b/source/lib/registry/reg_backend_regf.c2007-01-15 23:54:10 +
@@ -1011,7 +1011,7 @@
struct regf_data *regf = hive->backend_data;
int i;
 
-   if (lseek(regf->fd, SEEK_SET, 0) == -1) {
+   if (lseek(regf->fd, 0, SEEK_SET) == -1) {
DEBUG(0, ("Error lseeking in regf file\n"));
return WERR_GENERAL_FAILURE;
}
@@ -1021,7 +1021,7 @@
return WERR_GENERAL_FAILURE;
}
 
-   if (lseek(regf->fd, SEEK_SET, 0x1000) == -1) {
+   if (lseek(regf->fd, 0x1000, SEEK_SET) == -1) {
DEBUG(0, ("Error lseeking to 0x1000 in regf file\n"));
return WERR_GENERAL_FAILURE;
}

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

2007-01-15 Thread jelmer

Author: jelmer
Date: 2007-01-15 23:42:52 + (Mon, 15 Jan 2007)
New Revision: 20822

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20822

Log:
Fix total failure counting. 

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  2007-01-15 19:28:24 UTC 
(rev 20821)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-15 23:42:52 UTC 
(rev 20822)
@@ -219,8 +219,6 @@
  bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
 
 # start off with 0 failures
-failed=0
-export failed
 totalfailed=0
 export totalfailed
 
@@ -238,12 +236,12 @@
else
echo "$LINE"
fi
- done
-)
-
- exit $totalfailed
+   done
+   exit $totalfailed
+)
+exit $?
 ) 9>$SMBD_TEST_FIFO
-failed=$?
+totalfailed=$?
 
 kill `cat $PIDDIR/smbd.pid`
 
@@ -261,10 +259,10 @@
 for f in $PREFIX/valgrind.log*; do
if [ -s $f ] && grep -v DWARF2.CFI.reader $f > /dev/null; then
echo "VALGRIND FAILURE";
-   failed=`expr $failed + 1`
+   totalfailed=`expr $totalfailed + 1`
cat $f
fi
 done
 fi
 
-teststatus $ARG0 $failed
+teststatus $ARG0 $totalfailed

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

2007-01-15 Thread tridge

Jelmer,

 > Log:
 > Simplify code for calculating total number of failed tests.

I suspect this is wrong. We are now reporting zero failures in the
build farm for hosts that are failing quite a few tests. For example, 

 
http://build.samba.org/?function=View+Build;host=coreserverbuild;tree=samba4;compiler=gcc;revision=20819

if you expand the 'test' section, you'll see it failed 5 tests, but it
shows as green in the farm.

I'm not completely sure that it was r20754 that broke this, but it
seems a likely candidate.

Cheers, Tridge

svn commit: samba r20821 - in branches/SAMBA_3_0_24/source/lib/replace: system test

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:28:24 + (Mon, 15 Jan 2007)
New Revision: 20821

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20821

Log:
merge from samba4:

- include system/aio.h
- use full prototype for main
- use ifdef instead if

metze
Modified:
   branches/SAMBA_3_0_24/source/lib/replace/system/aio.h
   branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/replace/system/aio.h
===
--- branches/SAMBA_3_0_24/source/lib/replace/system/aio.h   2007-01-15 
19:28:02 UTC (rev 20820)
+++ branches/SAMBA_3_0_24/source/lib/replace/system/aio.h   2007-01-15 
19:28:24 UTC (rev 20821)
@@ -22,7 +22,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if HAVE_LIBAIO_H
+#ifdef HAVE_LIBAIO_H
 #include 
 #endif
 

Modified: branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c
===
--- branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c   2007-01-15 
19:28:02 UTC (rev 20820)
+++ branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c   2007-01-15 
19:28:24 UTC (rev 20821)
@@ -46,6 +46,7 @@
 #include "system/terminal.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/aio.h"
 
 #define TESTFILE "testfile.dat"
 
@@ -470,7 +471,7 @@
 }
 
 #if _SAMBA_BUILD_<4
-int main()
+int main(void)
 {
bool ret = torture_local_replace(NULL);
if (ret)

svn commit: samba r20820 - in branches/SAMBA_3_0/source/lib/replace: system test

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:28:02 + (Mon, 15 Jan 2007)
New Revision: 20820

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20820

Log:
merge from samba4:

- include system/aio.h
- use full prototype for main
- use ifdef instead if

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/system/aio.h
   branches/SAMBA_3_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/system/aio.h
===
--- branches/SAMBA_3_0/source/lib/replace/system/aio.h  2007-01-15 19:27:45 UTC 
(rev 20819)
+++ branches/SAMBA_3_0/source/lib/replace/system/aio.h  2007-01-15 19:28:02 UTC 
(rev 20820)
@@ -22,7 +22,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if HAVE_LIBAIO_H
+#ifdef HAVE_LIBAIO_H
 #include 
 #endif
 

Modified: branches/SAMBA_3_0/source/lib/replace/test/testsuite.c
===
--- branches/SAMBA_3_0/source/lib/replace/test/testsuite.c  2007-01-15 
19:27:45 UTC (rev 20819)
+++ branches/SAMBA_3_0/source/lib/replace/test/testsuite.c  2007-01-15 
19:28:02 UTC (rev 20820)
@@ -46,6 +46,7 @@
 #include "system/terminal.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/aio.h"
 
 #define TESTFILE "testfile.dat"
 
@@ -470,7 +471,7 @@
 }
 
 #if _SAMBA_BUILD_<4
-int main()
+int main(void)
 {
bool ret = torture_local_replace(NULL);
if (ret)

svn commit: samba r20819 - in branches/SAMBA_4_0/source/lib/replace: system test

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:27:45 + (Mon, 15 Jan 2007)
New Revision: 20819

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20819

Log:
- include system/aio.h
- use full prototype for main
- use ifdef instead if

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/system/aio.h
   branches/SAMBA_4_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/system/aio.h
===
--- branches/SAMBA_4_0/source/lib/replace/system/aio.h  2007-01-15 19:20:34 UTC 
(rev 20818)
+++ branches/SAMBA_4_0/source/lib/replace/system/aio.h  2007-01-15 19:27:45 UTC 
(rev 20819)
@@ -22,7 +22,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if HAVE_LIBAIO_H
+#ifdef HAVE_LIBAIO_H
 #include 
 #endif
 

Modified: branches/SAMBA_4_0/source/lib/replace/test/testsuite.c
===
--- branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
19:20:34 UTC (rev 20818)
+++ branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
19:27:45 UTC (rev 20819)
@@ -46,6 +46,7 @@
 #include "system/terminal.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/aio.h"
 
 #define TESTFILE "testfile.dat"
 
@@ -470,7 +471,7 @@
 }
 
 #if _SAMBA_BUILD_<4
-int main()
+int main(void)
 {
bool ret = torture_local_replace(NULL);
if (ret)

svn commit: samba r20818 - in branches/SAMBA_3_0_24/source/lib/replace: . system test

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:20:34 + (Mon, 15 Jan 2007)
New Revision: 20818

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20818

Log:
sync lib/replace with samba4

metze
Added:
   branches/SAMBA_3_0_24/source/lib/replace/.checker_innocent
   branches/SAMBA_3_0_24/source/lib/replace/system/aio.h
Modified:
   branches/SAMBA_3_0_24/source/lib/replace/README
   branches/SAMBA_3_0_24/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0_24/source/lib/replace/libreplace_cc.m4
   branches/SAMBA_3_0_24/source/lib/replace/replace.c
   branches/SAMBA_3_0_24/source/lib/replace/replace.h
   branches/SAMBA_3_0_24/source/lib/replace/snprintf.c
   branches/SAMBA_3_0_24/source/lib/replace/system/kerberos.h
   branches/SAMBA_3_0_24/source/lib/replace/system/wait.h
   branches/SAMBA_3_0_24/source/lib/replace/test/os2_delete.c
   branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c


Changeset:
Added: branches/SAMBA_3_0_24/source/lib/replace/.checker_innocent
===
--- branches/SAMBA_3_0_24/source/lib/replace/.checker_innocent  2007-01-15 
19:10:54 UTC (rev 20817)
+++ branches/SAMBA_3_0_24/source/lib/replace/.checker_innocent  2007-01-15 
19:20:34 UTC (rev 20818)
@@ -0,0 +1,4 @@
+>>>MISTAKE21_create_files_6a9e68ada99a97cb
+>>>MISTAKE21_os2_delete_9b2bfa7f38711d09
+>>>MISTAKE21_os2_delete_2fcc29aaa99a97cb
+>>>SECURITY2_os2_delete_9b2bfa7f1c9396ca

Modified: branches/SAMBA_3_0_24/source/lib/replace/README
===
--- branches/SAMBA_3_0_24/source/lib/replace/README 2007-01-15 19:10:54 UTC 
(rev 20817)
+++ branches/SAMBA_3_0_24/source/lib/replace/README 2007-01-15 19:20:34 UTC 
(rev 20818)
@@ -52,6 +52,7 @@
 inet_ntoa
 strtoll
 strtoull
+socketpair
 
 Types:
 bool

Modified: branches/SAMBA_3_0_24/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_3_0_24/source/lib/replace/libreplace.m4  2007-01-15 
19:10:54 UTC (rev 20817)
+++ branches/SAMBA_3_0_24/source/lib/replace/libreplace.m4  2007-01-15 
19:20:34 UTC (rev 20818)
@@ -62,6 +62,7 @@
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat 
getpgrp)
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(setjmp.h)
 
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
@@ -147,7 +148,7 @@
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
 AC_HAVE_DECL(setresuid, [#include ])
 AC_HAVE_DECL(setresgid, [#include ])
 AC_HAVE_DECL(errno, [#include ])

Modified: branches/SAMBA_3_0_24/source/lib/replace/libreplace_cc.m4
===
--- branches/SAMBA_3_0_24/source/lib/replace/libreplace_cc.m4   2007-01-15 
19:10:54 UTC (rev 20817)
+++ branches/SAMBA_3_0_24/source/lib/replace/libreplace_cc.m4   2007-01-15 
19:20:34 UTC (rev 20818)
@@ -140,23 +140,27 @@
 
 
 # check if the compiler can do immediate structures
-AC_CACHE_CHECK([for immediate structures],samba_cv_immediate_structures, [
-AC_TRY_COMPILE([
-#include ],
-[
-   typedef struct {unsigned x;} FOOBAR;
-   #define X_FOOBAR(x) ((FOOBAR) { x })
-   #define FOO_ONE X_FOOBAR(1)
-   FOOBAR f = FOO_ONE;   
-   static const struct {
-   FOOBAR y; 
-   } f2[] = {
-   {FOO_ONE}
-   };   
-],
-   samba_cv_immediate_structures=yes,samba_cv_immediate_structures=no)])
-if test x"$samba_cv_immediate_structures" = x"yes"; then
-   AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports 
immediate structures])
+AC_SUBST(libreplace_cv_immediate_structures)
+AC_CACHE_CHECK([for immediate structures],libreplace_cv_immediate_structures,[
+   AC_TRY_COMPILE([
+   #include 
+   ],[
+   typedef struct {unsigned x;} FOOBAR;
+   #define X_FOOBAR(x) ((FOOBAR) { x })
+   #define FOO_ONE X_FOOBAR(1)
+   FOOBAR f = FOO_ONE;   
+   static const struct {
+   FOOBAR y; 
+   } f2[] = {
+   {FOO_ONE}
+   };   
+   ],
+   libreplace_cv_immediate_structures=yes,
+   libreplace_cv_immediate_structures=no,
+   libreplace_cv_immediate_structures=cross)
+])
+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
+   AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports 
immediate structures])
 fi
 
 AC__LIBREPLACE_ONLY_CC_CHECKS_END

Modified: branches/SAMBA_3_0_24/source/lib/replace/replace.c
=

svn commit: samba r20817 - in branches/SAMBA_3_0/source/lib/replace: . system test

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:10:54 + (Mon, 15 Jan 2007)
New Revision: 20817

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20817

Log:
sync lib/replace with samba4

metze
Added:
   branches/SAMBA_3_0/source/lib/replace/.checker_innocent
   branches/SAMBA_3_0/source/lib/replace/system/aio.h
Modified:
   branches/SAMBA_3_0/source/lib/replace/README
   branches/SAMBA_3_0/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4
   branches/SAMBA_3_0/source/lib/replace/replace.c
   branches/SAMBA_3_0/source/lib/replace/replace.h
   branches/SAMBA_3_0/source/lib/replace/snprintf.c
   branches/SAMBA_3_0/source/lib/replace/system/kerberos.h
   branches/SAMBA_3_0/source/lib/replace/system/wait.h
   branches/SAMBA_3_0/source/lib/replace/test/os2_delete.c
   branches/SAMBA_3_0/source/lib/replace/test/testsuite.c


Changeset:
Added: branches/SAMBA_3_0/source/lib/replace/.checker_innocent
===
--- branches/SAMBA_3_0/source/lib/replace/.checker_innocent 2007-01-15 
19:08:03 UTC (rev 20816)
+++ branches/SAMBA_3_0/source/lib/replace/.checker_innocent 2007-01-15 
19:10:54 UTC (rev 20817)
@@ -0,0 +1,4 @@
+>>>MISTAKE21_create_files_6a9e68ada99a97cb
+>>>MISTAKE21_os2_delete_9b2bfa7f38711d09
+>>>MISTAKE21_os2_delete_2fcc29aaa99a97cb
+>>>SECURITY2_os2_delete_9b2bfa7f1c9396ca

Modified: branches/SAMBA_3_0/source/lib/replace/README
===
--- branches/SAMBA_3_0/source/lib/replace/README2007-01-15 19:08:03 UTC 
(rev 20816)
+++ branches/SAMBA_3_0/source/lib/replace/README2007-01-15 19:10:54 UTC 
(rev 20817)
@@ -52,6 +52,7 @@
 inet_ntoa
 strtoll
 strtoull
+socketpair
 
 Types:
 bool

Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2007-01-15 19:08:03 UTC 
(rev 20816)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2007-01-15 19:10:54 UTC 
(rev 20817)
@@ -62,6 +62,7 @@
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat 
getpgrp)
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(setjmp.h)
 
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
@@ -147,7 +148,7 @@
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
 AC_HAVE_DECL(setresuid, [#include ])
 AC_HAVE_DECL(setresgid, [#include ])
 AC_HAVE_DECL(errno, [#include ])

Modified: branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4
===
--- branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4  2007-01-15 
19:08:03 UTC (rev 20816)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4  2007-01-15 
19:10:54 UTC (rev 20817)
@@ -140,23 +140,27 @@
 
 
 # check if the compiler can do immediate structures
-AC_CACHE_CHECK([for immediate structures],samba_cv_immediate_structures, [
-AC_TRY_COMPILE([
-#include ],
-[
-   typedef struct {unsigned x;} FOOBAR;
-   #define X_FOOBAR(x) ((FOOBAR) { x })
-   #define FOO_ONE X_FOOBAR(1)
-   FOOBAR f = FOO_ONE;   
-   static const struct {
-   FOOBAR y; 
-   } f2[] = {
-   {FOO_ONE}
-   };   
-],
-   samba_cv_immediate_structures=yes,samba_cv_immediate_structures=no)])
-if test x"$samba_cv_immediate_structures" = x"yes"; then
-   AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports 
immediate structures])
+AC_SUBST(libreplace_cv_immediate_structures)
+AC_CACHE_CHECK([for immediate structures],libreplace_cv_immediate_structures,[
+   AC_TRY_COMPILE([
+   #include 
+   ],[
+   typedef struct {unsigned x;} FOOBAR;
+   #define X_FOOBAR(x) ((FOOBAR) { x })
+   #define FOO_ONE X_FOOBAR(1)
+   FOOBAR f = FOO_ONE;   
+   static const struct {
+   FOOBAR y; 
+   } f2[] = {
+   {FOO_ONE}
+   };   
+   ],
+   libreplace_cv_immediate_structures=yes,
+   libreplace_cv_immediate_structures=no,
+   libreplace_cv_immediate_structures=cross)
+])
+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
+   AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports 
immediate structures])
 fi
 
 AC__LIBREPLACE_ONLY_CC_CHECKS_END

Modified: branches/SAMBA_3_0/source/lib/replace/replace.c
===
--- branches/SAMBA_3_0/source/lib/re

svn commit: samba r20816 - in branches/SAMBA_4_0/source: . lib/replace lib/replace/system web_server

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:08:03 + (Mon, 15 Jan 2007)
New Revision: 20816

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20816

Log:
merge from samba3:

include setjmp.h via system/wait.h

metze
Removed:
   branches/SAMBA_4_0/source/web_server/config.m4
Modified:
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/replace/system/wait.h
   branches/SAMBA_4_0/source/web_server/http.c


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===
--- branches/SAMBA_4_0/source/configure.ac  2007-01-15 19:05:11 UTC (rev 
20815)
+++ branches/SAMBA_4_0/source/configure.ac  2007-01-15 19:08:03 UTC (rev 
20816)
@@ -42,7 +42,6 @@
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
 m4_include(lib/socket_wrapper/config.m4)
-m4_include(web_server/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-01-15 19:05:11 UTC 
(rev 20815)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-01-15 19:08:03 UTC 
(rev 20816)
@@ -62,6 +62,7 @@
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat 
getpgrp)
 
 AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(setjmp.h)
 
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,

Modified: branches/SAMBA_4_0/source/lib/replace/system/wait.h
===
--- branches/SAMBA_4_0/source/lib/replace/system/wait.h 2007-01-15 19:05:11 UTC 
(rev 20815)
+++ branches/SAMBA_4_0/source/lib/replace/system/wait.h 2007-01-15 19:08:03 UTC 
(rev 20816)
@@ -36,4 +36,8 @@
 #define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
+#ifdef HAVE_SETJMP_H
+#include 
 #endif
+
+#endif

Deleted: branches/SAMBA_4_0/source/web_server/config.m4
===
--- branches/SAMBA_4_0/source/web_server/config.m4  2007-01-15 19:05:11 UTC 
(rev 20815)
+++ branches/SAMBA_4_0/source/web_server/config.m4  2007-01-15 19:08:03 UTC 
(rev 20816)
@@ -1,2 +0,0 @@
-AC_CHECK_HEADERS(setjmp.h)
-

Modified: branches/SAMBA_4_0/source/web_server/http.c
===
--- branches/SAMBA_4_0/source/web_server/http.c 2007-01-15 19:05:11 UTC (rev 
20815)
+++ branches/SAMBA_4_0/source/web_server/http.c 2007-01-15 19:08:03 UTC (rev 
20816)
@@ -27,6 +27,7 @@
 #include "smbd/service.h"
 #include "lib/events/events.h"
 #include "system/time.h"
+#include "system/wait.h"
 #include "lib/appweb/esp/esp.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "lib/util/dlinklist.h"
@@ -484,7 +485,6 @@
it hits a major error. We need to catch these and
report a internal server error via http
 */
-#include 
 static jmp_buf ejs_exception_buf;
 static const char *exception_reason;

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 19:05:11 + (Mon, 15 Jan 2007)
New Revision: 20815

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20815

Log:
merge from samba3

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/test/testsuite.c
===
--- branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
18:44:06 UTC (rev 20814)
+++ branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
19:05:11 UTC (rev 20815)
@@ -469,7 +469,7 @@
return ret;
 }
 
-#ifndef _SAMBA_BUILD_
+#if _SAMBA_BUILD_<4
 int main()
 {
bool ret = torture_local_replace(NULL);

svn commit: samba r20814 - in branches/SAMBA_4_0/source/build/m4: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 18:44:06 + (Mon, 15 Jan 2007)
New Revision: 20814

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20814

Log:
always define SHLIBEXT, to fix the build on host with no support for shared 
libs,
there we just define it to an invalid value

metze
Modified:
   branches/SAMBA_4_0/source/build/m4/check_ld.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4  2007-01-15 18:38:43 UTC 
(rev 20813)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4  2007-01-15 18:44:06 UTC 
(rev 20814)
@@ -154,34 +154,55 @@
 # test whether building a shared library actually works
 if test $BLDSHARED = true; then
 
-AC_MSG_CHECKING([SHLD])
-AC_MSG_RESULT([$SHLD])
-AC_MSG_CHECKING([SHLD_FLAGS])
-AC_MSG_RESULT([$SHLD_FLAGS])
+   AC_MSG_CHECKING([SHLD])
+   AC_MSG_RESULT([$SHLD])
+   AC_MSG_CHECKING([SHLD_FLAGS])
+   AC_MSG_RESULT([$SHLD_FLAGS])
 
-AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
-AC_MSG_CHECKING([SHLIBEXT])
-AC_MSG_RESULT([$SHLIBEXT])
-AC_MSG_CHECKING([SONAMEFLAG])
-AC_MSG_RESULT([$SONAMEFLAG])
+   AC_MSG_CHECKING([SHLIBEXT])
+   AC_MSG_RESULT([$SHLIBEXT])
+   AC_MSG_CHECKING([SONAMEFLAG])
+   AC_MSG_RESULT([$SONAMEFLAG])
 
-AC_MSG_CHECKING([PICFLAG])
-AC_MSG_RESULT([$PICFLAG])
+   AC_MSG_CHECKING([PICFLAG])
+   AC_MSG_RESULT([$PICFLAG])
 
-AC_CACHE_CHECK([whether building shared libraries actually works], 
-   [ac_cv_shlib_works],[
-   ac_cv_shlib_works=no
-   # try building a trivial shared library
-   ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o &&
-   ${SHLD} `eval echo ${SHLD_FLAGS} ` -o shlib.${SHLIBEXT} shlib.o &&
-   ac_cv_shlib_works=yes
-   rm -f shlib.${SHLIBEXT} shlib.o
-])
-if test $ac_cv_shlib_works = no; then
-   BLDSHARED=false
+   AC_CACHE_CHECK([whether building shared libraries actually works], 
+  [ac_cv_shlib_works],[
+   ac_cv_shlib_works=no
+   # try building a trivial shared library
+   ${CC} ${CFLAGS} ${PICFLAG} -c 
${srcdir-.}/build/tests/shlib.c -o shlib.o &&
+   ${SHLD} `eval echo ${SHLD_FLAGS} ` -o 
shlib.${SHLIBEXT} shlib.o && 
+   ac_cv_shlib_works=yes
+   rm -f shlib.${SHLIBEXT} shlib.o
+   ])
+   if test $ac_cv_shlib_works = no; then
+   BLDSHARED=false
+   fi
 fi
+
+if test $BLDSHARED != true; then
+   SHLD="shared-libraries-disabled"
+   SHLD_FLAGS="shared-libraries-disabled"
+   SHLIBEXT="shared_libraries_disabled"
+   SONAMEFLAG="shared-libraries-disabled"
+   PICFLAG=""
+   AC_MSG_CHECKING([SHLD])
+   AC_MSG_RESULT([$SHLD])
+   AC_MSG_CHECKING([SHLD_FLAGS])
+   AC_MSG_RESULT([$SHLD_FLAGS])
+
+   AC_MSG_CHECKING([SHLIBEXT])
+   AC_MSG_RESULT([$SHLIBEXT])
+   AC_MSG_CHECKING([SONAMEFLAG])
+   AC_MSG_RESULT([$SONAMEFLAG])
+
+   AC_MSG_CHECKING([PICFLAG])
+   AC_MSG_RESULT([$PICFLAG])
 fi
 
+AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
+
 AC_MSG_CHECKING([if we can link using the selected flags])
 AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
AC_MSG_RESULT(yes),

svn commit: samba r20813 - in branches/SAMBA_4_0/source/scripting/ejs/ejsnet: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 18:38:43 + (Mon, 15 Jan 2007)
New Revision: 20813

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20813

Log:
fix the build with autodependencies

metze
Modified:
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c   2007-01-15 
18:02:47 UTC (rev 20812)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_user.c   2007-01-15 
18:38:43 UTC (rev 20813)
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "libnet/libnet.h"
-#include "proto.h"
+#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "events/events.h"
 #include "auth/credentials/credentials.h"

svn commit: samba r20812 - in branches/SAMBA_3_0_24/source: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 18:02:47 + (Mon, 15 Jan 2007)
New Revision: 20812

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20812

Log:
merge from SAMBA_3_0:

fix comment

metze
Modified:
   branches/SAMBA_3_0_24/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0_24/source/configure.in
===
--- branches/SAMBA_3_0_24/source/configure.in   2007-01-15 18:01:25 UTC (rev 
20811)
+++ branches/SAMBA_3_0_24/source/configure.in   2007-01-15 18:02:47 UTC (rev 
20812)
@@ -979,7 +979,7 @@
 fi
 
 
-# check if the compiler can do immediate structures
+# check if the compiler will optimize out function calls
 AC_CACHE_CHECK([if the compiler will optimize out function 
calls],samba_cv_optimize_out_funcation_calls, [
 AC_TRY_LINK([
 #include ],

svn commit: samba r20811 - in branches/SAMBA_3_0/source: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 18:01:25 + (Mon, 15 Jan 2007)
New Revision: 20811

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20811

Log:
fix comment

metze
Modified:
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in  2007-01-15 17:55:26 UTC (rev 
20810)
+++ branches/SAMBA_3_0/source/configure.in  2007-01-15 18:01:25 UTC (rev 
20811)
@@ -983,7 +983,7 @@
 fi
 
 
-# check if the compiler can do immediate structures
+# check if the compiler will optimize out function calls
 AC_CACHE_CHECK([if the compiler will optimize out function 
calls],samba_cv_optimize_out_funcation_calls, [
 AC_TRY_LINK([
 #include ],

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 17:55:26 + (Mon, 15 Jan 2007)
New Revision: 20810

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20810

Log:
unlink the test file when the test is done

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/test/testsuite.c
===
--- branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
17:53:53 UTC (rev 20809)
+++ branches/SAMBA_4_0/source/lib/replace/test/testsuite.c  2007-01-15 
17:55:26 UTC (rev 20810)
@@ -78,6 +78,7 @@
   (int)st.st_size, size);
return false;
}
+   unlink(TESTFILE);
printf("success: ftruncate\n");
return true;
 }

svn commit: samba r20809 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 17:53:53 + (Mon, 15 Jan 2007)
New Revision: 20809

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20809

Log:
rename struct partition into struct dsdb_control_current_partition

we'll soon pass this down as DSDB_CONTROL_CURRENT_PARTITION_OID control
so that the repl_meta_data module knows where to update the replUpToDateVector
attribute

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-01-15 17:41:53 UTC (rev 20808)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-01-15 17:53:53 UTC (rev 20809)
@@ -38,13 +38,13 @@
 #include "ldb/include/includes.h"
 #include "dsdb/samdb/samdb.h"
 
-struct partition {
+struct dsdb_control_current_partition {
struct ldb_module *module;
const char *backend;
struct ldb_dn *dn;
 };
 struct partition_private_data {
-   struct partition **partitions;
+   struct dsdb_control_current_partition **partitions;
struct ldb_dn **replicate;
 };
 
@@ -609,10 +609,12 @@
 static int sort_compare(void *void1,
void *void2, void *opaque)
 {
-   struct partition **pp1 = void1;
-   struct partition **pp2 = void2;
-   struct partition *partition1 = talloc_get_type(*pp1, struct partition);
-   struct partition *partition2 = talloc_get_type(*pp2, struct partition);
+   struct dsdb_control_current_partition **pp1 = void1;
+   struct dsdb_control_current_partition **pp2 = void2;
+   struct dsdb_control_current_partition *partition1 = 
talloc_get_type(*pp1,
+   struct 
dsdb_control_current_partition);
+   struct dsdb_control_current_partition *partition2 = 
talloc_get_type(*pp2,
+   struct 
dsdb_control_current_partition);
 
return ldb_dn_compare(partition1->dn, partition2->dn);
 }
@@ -666,7 +668,7 @@
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
}
-   data->partitions = talloc_array(data, struct partition *, 
partition_attributes->num_values + 1);
+   data->partitions = talloc_array(data, struct 
dsdb_control_current_partition *, partition_attributes->num_values + 1);
if (!data->partitions) {
talloc_free(mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
@@ -690,7 +692,7 @@
talloc_free(mem_ctx);
return LDB_ERR_CONSTRAINT_VIOLATION;
}
-   data->partitions[i] = talloc(data->partitions, struct 
partition);
+   data->partitions[i] = talloc(data->partitions, struct 
dsdb_control_current_partition);
if (!data->partitions[i]) {
talloc_free(mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
@@ -771,7 +773,7 @@
for (i=0; i < modules_attributes->num_values; i++) {
struct ldb_dn *base_dn;
int partition_idx;
-   struct partition *partition = NULL;
+   struct dsdb_control_current_partition *partition = NULL;
const char **modules = NULL;
 
char *base = talloc_strdup(data->partitions, (char 
*)modules_attributes->values[i].data);

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

2007-01-15 Thread Stefan (metze) Metzmacher

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

> remove whitespace

This was the problem on the Tru64 build...

it's very important to not have whitespaces between -Ifoo...

axp> cat ipath.c
#include 
int main(void) { return 0; }
axp> cc -I foo -c -o ipath.o ipath.c
cc: Severe: ipath.c, line 1: Cannot find file  specified in
#include directive. (noinclfilef)
#include 
- -^
axp> cc -Ifoo -c -o ipath.o ipath.c

metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFFq765m70gjA5TCD8RAkc6AJsGqr41WxgeOjwh0E3OPSezhaS8ogCeOxeI
RN9Lz/ccBS3xlhWDHa6mijg=
=TD6P
-END PGP SIGNATURE-

Re: svn commit: samba r20791 - in branches/SAMBA_4_0/source: . scripting/ejs scripting/ejs/ejsnet

2007-01-15 Thread Stefan (metze) Metzmacher

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

>> Log:
>> the ejsnet stuff can be a normal smbcalls module...
> 
> Why is it still called smbcalls ? I realise there are "historical"
> reasons, but ejs interface has became much more than just a gateway
> to smbcalls.

maybe ejscalls or so would be better...

metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFFq73cm70gjA5TCD8RArQUAJ0e+jlQtjVqwpi/YYO8FkgBTUftLgCgyzuZ
elVHWsM3U2M11vw/bmC0Blk=
=Oui7
-END PGP SIGNATURE-

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 17:41:53 + (Mon, 15 Jan 2007)
New Revision: 20808

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20808

Log:
remove whitespace

metze
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   2007-01-15 14:19:03 UTC 
(rev 20807)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2007-01-15 17:41:53 UTC 
(rev 20808)
@@ -54,7 +54,7 @@
 ###
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
-CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi 
-Iheimdal/lib/gssapi/krb5 -I heimdal/lib/gssapi/mech
+CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi 
-Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
 OBJ_FILES = \
../heimdal/lib/gssapi/mech/gss_krb5.o \
../heimdal/lib/gssapi/mech/gss_mech_switch.o \

Re: svn commit: samba r20791 - in branches/SAMBA_4_0/source: . scripting/ejs scripting/ejs/ejsnet

2007-01-15 Thread Rafal Szczesniak

On Mon, Jan 15, 2007 at 07:34:04AM +, [EMAIL PROTECTED] wrote:
> Author: metze
> Date: 2007-01-15 07:34:04 + (Mon, 15 Jan 2007)
> New Revision: 20791
> 
> WebSVN: 
> http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20791
> 
> Log:
> the ejsnet stuff can be a normal smbcalls module...

Why is it still called smbcalls ? I realise there are "historical"
reasons, but ejs interface has became much more than just a gateway
to smbcalls.

> mimir: when you want to register more functions
>please do that in the smb_setup_ejs_net() function

ok.


cheers,
-- 
Rafal Szczesniak
Samba Team member  http://www.samba.org



signature.asc
Description: Digital signature

Rev 11155: Update .bzrignore. in file:///home/jelmer/bzr.samba/4.0-regwrite/

2007-01-15 Thread Jelmer Vernooij


revno: 11155
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-regwrite
timestamp: Mon 2007-01-15 18:04:35 +0100
message:
  Update .bzrignore.
modified:
  .bzrignore svn-v2:[EMAIL PROTECTED]
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-14 15:22:36 +
+++ b/.bzrignore2007-01-15 17:04:35 +
@@ -148,3 +148,6 @@
 source/lib/policy/lex.c
 source/lib/policy/parse_adm.c
 source/lib/policy/parse_adm.h
+source/heimdal/lib/roken/err.h
+source/kdc/pac_glue.h
+source/scripting/ejs/ejsnet/proto.h

Rev 11154: Merge from upstream in file:///home/jelmer/bzr.samba/4.0-regwrite/

2007-01-15 Thread Jelmer Vernooij


revno: 11154
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-regwrite
timestamp: Mon 2007-01-15 17:58:38 +0100
message:
  Merge from upstream
removed:
  source/scripting/ejs/ejsnet.c  svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet.h  svn-v2:[EMAIL PROTECTED]
added:
  source/dsdb/samdb/ldb_modules/schema_fsmo.c svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/asn1_compile_wrapper.sh svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/et_compile_wrapper.sh svn-v2:[EMAIL PROTECTED]
  source/rpc_server/mgmt/svn-v2:[EMAIL PROTECTED]
  source/rpc_server/mgmt/dcesrv_mgmt.c svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet/   svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet/config.mk svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet/mpr_user.c svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet/net_ctx.c svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/ejsnet/net_user.c svn-v2:[EMAIL PROTECTED]
modified:
  source/build/smb_build/makefile.pm svn-v2:[EMAIL PROTECTED]
  source/dsdb/repl/replicated_objects.c svn-v2:[EMAIL PROTECTED]
  source/dsdb/samdb/ldb_modules/config.mk svn-v2:[EMAIL PROTECTED]
  source/dsdb/samdb/ldb_modules/kludge_acl.c svn-v2:[EMAIL PROTECTED]
  source/dsdb/samdb/ldb_modules/repl_meta_data.c svn-v2:[EMAIL PROTECTED]
  source/dsdb/samdb/ldb_modules/rootdse.c svn-v2:[EMAIL PROTECTED]
  source/dsdb/samdb/samdb.c  svn-v2:[EMAIL PROTECTED]
  source/dsdb/schema/schema_init.c svn-v2:[EMAIL PROTECTED]
  source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED]
  source/heimdal/lib/com_err/lex.c svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/asn1_deps.pl svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/config.h  svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/config.m4 svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/config.mk svn-v2:[EMAIL PROTECTED]
  source/heimdal_build/et_deps.pl svn-v2:[EMAIL PROTECTED]
  source/lib/events/config.m4svn-v2:[EMAIL PROTECTED]
  source/lib/events/config.mksvn-v2:[EMAIL PROTECTED]
  source/lib/events/events_aio.c svn-v2:[EMAIL PROTECTED]
  source/lib/events/events_epoll.c svn-v2:[EMAIL PROTECTED]
  source/lib/ldb/common/ldb.csvn-v2:[EMAIL PROTECTED]
  source/lib/ldb/include/ldb_private.h svn-v2:[EMAIL PROTECTED]
  source/lib/ldb/modules/ldb_map_outbound.c svn-v2:[EMAIL PROTECTED]
  source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED]
  source/lib/replace/system/select.h svn-v2:[EMAIL PROTECTED]
  source/libcli/security/sddl.c  svn-v2:[EMAIL PROTECTED]
  source/libcli/security/security_descriptor.c svn-v2:[EMAIL PROTECTED]
  source/libcli/util/doserr.csvn-v2:[EMAIL PROTECTED]
  source/libcli/util/doserr.hsvn-v2:[EMAIL PROTECTED]
  source/librpc/idl/mgmt.idl svn-v2:[EMAIL PROTECTED]
  source/librpc/idl/security.idl svn-v2:[EMAIL PROTECTED]
  source/librpc/ndr/ndr_sec_helper.c svn-v2:[EMAIL PROTECTED]
  source/param/loadparm.csvn-v2:[EMAIL PROTECTED]
  source/param/secrets.c svn-v2:[EMAIL PROTECTED]
  source/rpc_server/config.mksvn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/config.mk svn-v2:[EMAIL PROTECTED]
  source/scripting/ejs/smbcalls.c svn-v2:[EMAIL PROTECTED]
  source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED]
  source/setup/secrets.ldif  svn-v2:[EMAIL PROTECTED]
  source/torture/ldap/schema.c   svn-v2:[EMAIL PROTECTED]
  source/torture/libnet/libnet_BecomeDC.c svn-v2:[EMAIL PROTECTED]
  source/torture/rpc/mgmt.c  svn-v2:[EMAIL PROTECTED]

revno: 11140.1.57
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-15 14:19:03 +
message:
  test static password for the test_*.ldb' files
  
  metze

revno: 11140.1.56
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-15 14:17:26 +
message:
  make it possible to configure the secrets.ldb url
  via "secrets database = my_secrets.ldb"
  
  metze

revno: 11140.1.55
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-15 13:54:21 +
message:
  don't use hardcoded values for secrects.keytab and sam.ldb
  
  metze

revno: 11140.1.54
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-15 13:28:09 +
message:
  work arround HPUX and Tru64 make which don't like $$startdir
  
  we now call asn1_compile and compile_et via a wrapper script
  
  m

svn commit: samba r20807 - in branches/SAMBA_4_0/source/torture/libnet: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 14:19:03 + (Mon, 15 Jan 2007)
New Revision: 20807

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20807

Log:
test static password for the test_*.ldb' files

metze
Modified:
   branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c  2007-01-15 
14:17:26 UTC (rev 20806)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c  2007-01-15 
14:19:03 UTC (rev 20807)
@@ -198,6 +198,10 @@
"subobj.CONFIGDN_MOD = \"repl_meta_data\";\n"
"subobj.SCHEMADN_MOD = \"schema_fsmo,repl_meta_data\";\n"
"\n"
+   "subobj.KRBTGTPASS   = \"test\";\n"
+   "subobj.MACHINEPASS  = \"test\";\n"
+   "subobj.ADMINPASS= \"test\";\n"
+   "\n"
"var paths = provision_default_paths(subobj);\n"
"paths.samdb = \"%s\";\n"
"paths.secrets = \"%s\";\n"

svn commit: samba r20806 - in branches/SAMBA_4_0/source: param scripting/libjs torture/libnet

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 14:17:26 + (Mon, 15 Jan 2007)
New Revision: 20806

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20806

Log:
make it possible to configure the secrets.ldb url
via "secrets database = my_secrets.ldb"

metze
Modified:
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/param/secrets.c
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c  2007-01-15 13:54:21 UTC (rev 
20805)
+++ branches/SAMBA_4_0/source/param/loadparm.c  2007-01-15 14:17:26 UTC (rev 
20806)
@@ -107,6 +107,7 @@
char *szConfigFile;
char *szShareBackend;
char *szSAM_URL;
+   char *szSECRETS_URL;
char *szSPOOLSS_URL;
char *szWINS_CONFIG_URL;
char *szWINS_URL;
@@ -403,6 +404,7 @@
{"obey pam restrictions", P_BOOL, P_GLOBAL, 
&Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"password server", P_LIST, P_GLOBAL, &Globals.szPasswordServers, NULL, 
NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
{"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, 
FLAG_ADVANCED | FLAG_DEVELOPER},
+   {"secrets database", P_STRING, P_GLOBAL, &Globals.szSECRETS_URL, NULL, 
NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_URL, NULL, 
NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"wins config database", P_STRING, P_GLOBAL, 
&Globals.szWINS_CONFIG_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"wins database", P_STRING, P_GLOBAL, &Globals.szWINS_URL, NULL, NULL, 
FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -610,6 +612,7 @@
do_parameter("auth methods", "anonymous sam_ignoredomain", NULL);
do_parameter("private dir", dyn_PRIVATE_DIR, NULL);
do_parameter("sam database", "sam.ldb", NULL);
+   do_parameter("secrets database", "secrets.ldb", NULL);
do_parameter("spoolss database", "spoolss.ldb", NULL);
do_parameter("wins config database", "wins_config.ldb", NULL);
do_parameter("wins database", "wins.ldb", NULL);
@@ -833,6 +836,7 @@
 _PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
 _PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, &Globals.szShareBackend)
 _PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_secrets_url, &Globals.szSECRETS_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, &Globals.szWINS_CONFIG_URL)
 _PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL)

Modified: branches/SAMBA_4_0/source/param/secrets.c
===
--- branches/SAMBA_4_0/source/param/secrets.c   2007-01-15 13:54:21 UTC (rev 
20805)
+++ branches/SAMBA_4_0/source/param/secrets.c   2007-01-15 14:17:26 UTC (rev 
20806)
@@ -96,6 +96,7 @@
 struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
 {
char *path;
+   const char *url;
struct ldb_context *ldb;
BOOL existed;
const char *init_ldif = 
@@ -103,11 +104,16 @@
"computerName: CASE_INSENSITIVE\n" \
"flatname: CASE_INSENSITIVE\n";
 
-   path = private_path(mem_ctx, "secrets.ldb");
+   url = lp_secrets_url();
+   if (!url || !url[0]) {
+   return NULL;
+   }
+
+   path = private_path(mem_ctx, url);
if (!path) {
return NULL;
}
-   
+
existed = file_exist(path);
 
/* Secrets.ldb *must* always be local.  If we call for a

Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-01-15 
13:54:21 UTC (rev 20805)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-01-15 
14:17:26 UTC (rev 20806)
@@ -381,7 +381,7 @@
paths.hkpd = "hkpd.ldb";
paths.hkpt = "hkpt.ldb";
paths.samdb = lp.get("sam database");
-   paths.secrets = "secrets.ldb";
+   paths.secrets = lp.get("secrets database");
paths.keytab = "secrets.keytab";
paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
paths.winsdb = "wins.ldb";
@@ -484,6 +484,20 @@
ok = samdb.transaction_commit();
assert(ok);
 
+   message("Setting up " + paths.secrets + "\n");
+   setup_ldb("secrets.ldif", info, paths.secrets);
+
+   tmp = lp.get("secrets database");
+   ok = lp.set("secrets database", paths.secrets);
+   assert(ok);
+
+   message("Setting up keytabs\n");
+   var keytab_ok = credentials_update_all_keytabs();
+   assert(keytab_ok);
+

svn commit: samba r20805 - in branches/SAMBA_4_0/source: scripting/libjs setup

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 13:54:21 + (Mon, 15 Jan 2007)
New Revision: 20805

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20805

Log:
don't use hardcoded values for secrects.keytab and sam.ldb

metze
Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/secrets.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-01-15 
13:28:09 UTC (rev 20804)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-01-15 
13:54:21 UTC (rev 20805)
@@ -382,6 +382,7 @@
paths.hkpt = "hkpt.ldb";
paths.samdb = lp.get("sam database");
paths.secrets = "secrets.ldb";
+   paths.keytab = "secrets.keytab";
paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
paths.winsdb = "wins.ldb";
paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN 
+ ".ldif";
@@ -431,7 +432,7 @@
return true;
 }
 
-function provision_fix_subobj(subobj, message)
+function provision_fix_subobj(subobj, message, paths)
 {
subobj.REALM   = strupper(subobj.REALM);
subobj.HOSTNAME= strlower(subobj.HOSTNAME);
@@ -442,6 +443,10 @@
var rdns = split(",", subobj.DOMAINDN);
subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
+   subobj.SAM_LDB  = paths.samdb;
+   subobj.SECRETS_LDB  = paths.secrets;
+   subobj.SECRETS_KEYTAB   = paths.keytab;
+
return true;
 }
 
@@ -451,7 +456,7 @@
var sys = sys_init();
var info = new Object();
 
-   var ok = provision_fix_subobj(subobj, message);
+   var ok = provision_fix_subobj(subobj, message, paths);
assert(ok);
 
info.subobj = subobj;
@@ -491,7 +496,7 @@
var sys = sys_init();
var info = new Object();
 
-   var ok = provision_fix_subobj(subobj, message);
+   var ok = provision_fix_subobj(subobj, message, paths);
assert(ok);
 
if (subobj.DOMAINGUID != undefined) {

Modified: branches/SAMBA_4_0/source/setup/secrets.ldif
===
--- branches/SAMBA_4_0/source/setup/secrets.ldif2007-01-15 13:28:09 UTC 
(rev 20804)
+++ branches/SAMBA_4_0/source/setup/secrets.ldif2007-01-15 13:54:21 UTC 
(rev 20805)
@@ -36,7 +36,7 @@
 whenChanged: ${LDAPTIME}
 msDS-KeyVersionNumber: 1
 objectSid: ${DOMAINSID}
-privateKeytab: secrets.keytab
+privateKeytab: ${SECRETS_KEYTAB}
 
 # A hook from our credentials system into HDB, as we must be on a KDC,
 # we can look directly into the database.
@@ -51,5 +51,5 @@
 whenChanged: ${LDAPTIME}
 objectSid: ${DOMAINSID}
 servicePrincipalName: kadmin/changepw
-krb5Keytab: HDB:ldb:sam.ldb:
+krb5Keytab: HDB:ldb:${SAM_LDB}:
 #The trailing : here is a HACK, but it matches the Heimdal format.

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 13:28:09 + (Mon, 15 Jan 2007)
New Revision: 20804

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20804

Log:
work arround HPUX and Tru64 make which don't like $$startdir

we now call asn1_compile and compile_et via a wrapper script

metze
Added:
   branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh
   branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
Modified:
   branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
   branches/SAMBA_4_0/source/heimdal_build/et_deps.pl


Changeset:
Added: branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh
===
--- branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh 
2007-01-15 11:11:16 UTC (rev 20803)
+++ branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh 
2007-01-15 13:28:09 UTC (rev 20804)
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+
+SELF=$0
+SELFDIR=`dirname ${SELF}`
+
+SRCDIR=$1
+BUILDDIR=$2
+DESTDIR=$3
+
+CMD=$4
+FILE=$5
+NAME=$6
+shift 6
+OPTIONS="$@"
+
+test -z "${SRCDIR}" && {
+   echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${BUILDDIR}" && {
+   echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${DESTDIR}" && {
+   echo "${SELF}:DESTDIR: '${DESTDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${CMD}" && {
+   echo "${SELF}:CMD: '${CMD}'" >&2;
+   exit 1;
+}
+
+test -z "${FILE}" && {
+   echo "${SELF}:FILE: '${FILE}'" >&2;
+   exit 1;
+}
+
+test -z "${NAME}" && {
+   echo "${SELF}:NAME: '${NAME}'" >&2;
+   exit 1;
+}
+
+CURDIR=`pwd`
+
+cd ${SRCDIR} && {
+   ABS_SRCDIR=`pwd`
+   cd ${CURDIR}
+} || {
+   echo "${SELF}:cannot cd into '${SRCDIR}'" >&2;
+   exit 1;
+}
+
+cd ${BUILDDIR} && {
+   ABS_BUILDDIR=`pwd`
+   cd ${CURDIR}
+} || {
+   echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
+   exit 1;
+}
+
+cd ${DESTDIR} && {
+   ${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${ABS_SRCDIR}/${FILE} ${NAME} >&2 || 
exit 1;
+   cd ${CURDIR}
+} || {
+   echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
+   exit 1;
+}
+
+exit 0;


Property changes on: 
branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh
___
Name: svn:executable
   + *

Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
===
--- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-01-15 
11:11:16 UTC (rev 20803)
+++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-01-15 
13:28:09 UTC (rev 20804)
@@ -25,7 +25,7 @@
 
 print "$header: $file bin/asn1_compile\n";
 print "[EMAIL PROTECTED] \"Compiling ASN1 file $file\"\n";
-print "[EMAIL PROTECTED] && cd $dirname && " . ' $$startdir/bin/asn1_compile ' 
. " $options " . '$$startdir/' . "$file $prefix\n\n";
+print "[EMAIL PROTECTED](builddir)/heimdal_build/asn1_compile_wrapper.sh 
\$(srcdir) \$(builddir) $dirname bin/asn1_compile $file $prefix $options\n\n";
 
 open(IN,$file) or die("Can't open $file: $!");
 foreach() {
@@ -49,19 +49,19 @@
 print "CFLAGS = -Iheimdal_build -I$dirname\n";
 print "OBJ_FILES = ";
 foreach $o_file (@o_files) {
-print "\\\n\t$o_file ";
+print "\\\n\t$o_file";
 }
 print "\nPRIVATE_DEPENDENCIES = HEIMDAL_ASN1\n\n";
 
 print "clean:: \n";
-print "[EMAIL PROTECTED] \"Deleting ASN1 output files generated from $file\"";
-print "[EMAIL PROTECTED] -f $header";
+print "[EMAIL PROTECTED] \"Deleting ASN1 output files generated from 
$file\"\n";
+print "[EMAIL PROTECTED] -f $header\n";
 foreach $c_file (@c_files) {
-print "[EMAIL PROTECTED] -f $c_file";
+print "[EMAIL PROTECTED] -f $c_file\n";
 }
 foreach $x_file (@x_files) {
-print "[EMAIL PROTECTED] -f $x_file";
+print "[EMAIL PROTECTED] -f $x_file\n";
 }
-print "[EMAIL PROTECTED] -f $dirname/$prefix\_files";
-print "[EMAIL PROTECTED] -f $dirname/$prefix\.h";
-print "\n\n";
+print "[EMAIL PROTECTED] -f $dirname/$prefix\_files\n";
+print "[EMAIL PROTECTED] -f $dirname/$prefix\.h\n";
+print "\n";

Added: branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
===
--- branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh   
2007-01-15 11:11:16 UTC (rev 20803)
+++ branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh   
2007-01-15 13:28:09 UTC (rev 20804)
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+
+SELF=$0
+SELFDIR=`dirname ${SELF}`
+
+SRCDIR=$1
+BUILDDIR=$2
+DESTDIR=$3
+
+CMD=$4
+FILE=$5
+shift 5
+
+test -z "${SRCDIR}" && {
+   echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${BUILDDIR}" && {
+   echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${DESTDIR}" && {
+   echo "${SELF}:DESTDIR: '${DESTDIR}'" >&2;
+   exit 1;
+}
+
+test -z "${CMD}" && {
+   echo "

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 11:11:16 + (Mon, 15 Jan 2007)
New Revision: 20803

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20803

Log:
fix compiler warning about extra semicolon

metze
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.h2007-01-15 10:49:02 UTC 
(rev 20802)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h2007-01-15 11:11:16 UTC 
(rev 20803)
@@ -9,7 +9,7 @@
 #include "include/config.h"
 #include "lib/replace/replace.h"
 
-#define RCSID(msg)
+#define RCSID(msg) struct __rcsid { int __rcsdi; }
 #define KRB5
 
 /* This needs to be defined for roken too */

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

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 10:49:02 + (Mon, 15 Jan 2007)
New Revision: 20802

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20802

Log:
- don't add the same Makefile vars twice...
- this fixes a lot of warnings on Tru64

maybe this also fixes the build on Tru64 and HPUX...

metze
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   2007-01-15 
10:47:22 UTC (rev 20801)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2007-01-15 
10:49:02 UTC (rev 20802)
@@ -215,6 +215,7 @@
my ($self,$ctx) = @_;
 
my $init_obj = "";
+   my $has_static_lib = 0;

if ($ctx->{TYPE} eq "LIBRARY") {
push (@{$self->{shared_libs}}, 
"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
@@ -237,9 +238,13 @@
}
}
 
-   $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-   $self->_prepare_list($ctx, "OBJ_LIST");
-   $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+   $has_static_lib = 1 if grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}});
+
+   if (not $has_static_lib) {
+   $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = 
$ctx->{OUTPUT}\n");
+   $self->_prepare_list($ctx, "OBJ_LIST");
+   $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+   }
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");

svn commit: samba r20801 - in branches/SAMBA_4_0/source/libcli/security: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 10:47:22 + (Mon, 15 Jan 2007)
New Revision: 20801

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20801

Log:
try to always fix up the acl revision when we add or remove
an ace

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/security_descriptor.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/security_descriptor.c
===
--- branches/SAMBA_4_0/source/libcli/security/security_descriptor.c 
2007-01-15 10:39:17 UTC (rev 20800)
+++ branches/SAMBA_4_0/source/libcli/security/security_descriptor.c 
2007-01-15 10:47:22 UTC (rev 20801)
@@ -150,7 +150,7 @@
if (sd->dacl == NULL) {
return NT_STATUS_NO_MEMORY;
}
-   sd->dacl->revision = NT4_ACL_REVISION;
+   sd->dacl->revision = SECURITY_ACL_REVISION_NT4;
sd->dacl->size = 0;
sd->dacl->num_aces = 0;
sd->dacl->aces = NULL;
@@ -171,7 +171,18 @@
if (sd->dacl->aces[sd->dacl->num_aces].trustee.sub_auths == NULL) {
return NT_STATUS_NO_MEMORY;
}
-   
+
+   switch (sd->dacl->aces[sd->dacl->num_aces].type) {
+   case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+   case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+   sd->dacl->revision = SECURITY_ACL_REVISION_ADS;
+   break;
+   default:
+   break;
+   }
+
sd->dacl->num_aces++;
 
sd->type |= SEC_DESC_DACL_PRESENT;
@@ -187,11 +198,13 @@
  struct dom_sid *trustee)
 {
int i;
+   bool found = false;
 
if (sd->dacl == NULL) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
-   
+
+   /* there can be multiple ace's for one trustee */
for (i=0;idacl->num_aces;i++) {
if (dom_sid_equal(trustee, &sd->dacl->aces[i].trustee)) {
memmove(&sd->dacl->aces[i], &sd->dacl->aces[i+1],
@@ -200,10 +213,30 @@
if (sd->dacl->num_aces == 0) {
sd->dacl->aces = NULL;
}
+   found = true;
+   }
+   }
+
+   if (!found) {
+   return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+   }
+
+   sd->dacl->revision = SECURITY_ACL_REVISION_NT4;
+
+   for (i=0;idacl->num_aces;i++) {
+   switch (sd->dacl->aces[i].type) {
+   case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+   case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+   sd->dacl->revision = SECURITY_ACL_REVISION_ADS;
return NT_STATUS_OK;
+   default:
+   break; /* only for the switch statement */
}
}
-   return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+
+   return NT_STATUS_OK;
 }

svn commit: samba r20800 - in branches/SAMBA_4_0/source: libcli/security librpc/ndr

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 10:39:17 + (Mon, 15 Jan 2007)
New Revision: 20800

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20800

Log:
fix compiler warnings

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/sddl.c
   branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/sddl.c
===
--- branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 10:10:15 UTC 
(rev 20799)
+++ branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 10:39:17 UTC 
(rev 20800)
@@ -319,6 +319,8 @@
case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
acl->revision = SECURITY_ACL_REVISION_ADS;
break;
+   default:
+   break;
}
talloc_free(astr);
sddl += len+2;

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c   2007-01-15 
10:10:15 UTC (rev 20799)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c   2007-01-15 
10:39:17 UTC (rev 20800)
@@ -73,6 +73,8 @@
ret += 16; /* GUID 
ace->object.object.inherited_typeinherited_type */
}
break;
+   default:
+   break;
}
 
return ret;

svn commit: samba r20799 - in branches/SAMBA_4_0/source/libcli/security: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 10:10:15 + (Mon, 15 Jan 2007)
New Revision: 20799

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20799

Log:
if any ace has the optional sub object, the acl revision needs
to be SECURITY_ACL_REVISION_ADS (4)

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/sddl.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/sddl.c
===
--- branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 09:54:08 UTC 
(rev 20798)
+++ branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 10:10:15 UTC 
(rev 20799)
@@ -312,6 +312,14 @@
talloc_free(acl);
return NULL;
}
+   switch (acl->aces[acl->num_aces].type) {
+   case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+   case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+   acl->revision = SECURITY_ACL_REVISION_ADS;
+   break;
+   }
talloc_free(astr);
sddl += len+2;
acl->num_aces++;

svn commit: samba r20798 - in branches/SAMBA_4_0/source/librpc/ndr: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 09:54:08 + (Mon, 15 Jan 2007)
New Revision: 20798

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20798

Log:
fix ndr_size_security_ace() it should include the optional sub object
for ADS style ace's

metze
Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c   2007-01-15 
09:52:25 UTC (rev 20797)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_sec_helper.c   2007-01-15 
09:54:08 UTC (rev 20798)
@@ -54,11 +54,30 @@
 */
 size_t ndr_size_security_ace(const struct security_ace *ace, int flags)
 {
+   size_t ret;
+
if (!ace) return 0;
-   return 8 + ndr_size_dom_sid(&ace->trustee, flags);
+
+   ret = 8 + ndr_size_dom_sid(&ace->trustee, flags);
+
+   switch (ace->type) {
+   case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+   case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+   case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+   ret += 4; /* uint32 bitmap ace->object.object.flags */
+   if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+   ret += 16; /* GUID ace->object.object.type.type */
+   }
+   if (ace->object.object.flags & 
SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+   ret += 16; /* GUID 
ace->object.object.inherited_typeinherited_type */
+   }
+   break;
+   }
+
+   return ret;
 }
 
-
 /*
   return the wire size of a security_acl
 */

svn commit: samba r20797 - in branches/SAMBA_4_0/source/librpc/idl: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 09:52:25 + (Mon, 15 Jan 2007)
New Revision: 20797

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20797

Log:
make it more clear that this is a 32bit bitmap

metze
Modified:
   branches/SAMBA_4_0/source/librpc/idl/security.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/security.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/security.idl   2007-01-15 09:17:11 UTC 
(rev 20796)
+++ branches/SAMBA_4_0/source/librpc/idl/security.idl   2007-01-15 09:52:25 UTC 
(rev 20797)
@@ -240,7 +240,7 @@
SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT= 8
} security_ace_type;
 
-   typedef bitmap {
+   typedef [bitmap32bit] bitmap {
SEC_ACE_OBJECT_TYPE_PRESENT = 0x0001,
SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT   = 0x0002
} security_ace_object_flags;

svn commit: samba r20796 - in branches: SAMBA_3_0/source/printing SAMBA_3_0/source/smbd SAMBA_3_0_24/source/printing SAMBA_3_0_24/source/smbd

2007-01-15 Thread vlendec

Author: vlendec
Date: 2007-01-15 09:17:11 + (Mon, 15 Jan 2007)
New Revision: 20796

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20796

Log:
Fix the same problem Jeremy has fixed (improper handling of deferred opens)
for delete_driver_files. Proper fix pending... :-)

Jeremy, please check.

Volker

Modified:
   branches/SAMBA_3_0/source/printing/nt_printing.c
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0_24/source/printing/nt_printing.c
   branches/SAMBA_3_0_24/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===
--- branches/SAMBA_3_0/source/printing/nt_printing.c2007-01-15 09:02:58 UTC 
(rev 20795)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c2007-01-15 09:17:11 UTC 
(rev 20796)
@@ -4853,7 +4853,7 @@
pstrcpy( file, s );
driver_unix_convert(file, conn, NULL, &st);
DEBUG(10,("deleting driverfile [%s]\n", s));
-   unlink_internals(conn, 0, file, False);
+   unlink_internals(conn, 0, file, False, False);
}
}

@@ -4862,7 +4862,7 @@
pstrcpy( file, s );
driver_unix_convert(file, conn, NULL, &st);
DEBUG(10,("deleting configfile [%s]\n", s));
-   unlink_internals(conn, 0, file, False);
+   unlink_internals(conn, 0, file, False, False);
}
}

@@ -4871,7 +4871,7 @@
pstrcpy( file, s );
driver_unix_convert(file, conn, NULL, &st);
DEBUG(10,("deleting datafile [%s]\n", s));
-   unlink_internals(conn, 0, file, False);
+   unlink_internals(conn, 0, file, False, False);
}
}

@@ -4880,7 +4880,7 @@
pstrcpy( file, s );
driver_unix_convert(file, conn, NULL, &st);
DEBUG(10,("deleting helpfile [%s]\n", s));
-   unlink_internals(conn, 0, file, False);
+   unlink_internals(conn, 0, file, False, False);
}
}

@@ -4896,7 +4896,7 @@
pstrcpy( file, p );
driver_unix_convert(file, conn, NULL, &st);
DEBUG(10,("deleting dependent file [%s]\n", 
file));
-   unlink_internals(conn, 0, file, False);
+   unlink_internals(conn, 0, file, False, False);
}

i++;

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===
--- branches/SAMBA_3_0/source/smbd/reply.c  2007-01-15 09:02:58 UTC (rev 
20795)
+++ branches/SAMBA_3_0/source/smbd/reply.c  2007-01-15 09:17:11 UTC (rev 
20796)
@@ -1679,7 +1679,8 @@
  Check if a user is allowed to delete a file.
 /
 
-static NTSTATUS can_delete(connection_struct *conn, char *fname, uint32 
dirtype)
+static NTSTATUS can_delete(connection_struct *conn, char *fname,
+  uint32 dirtype, BOOL can_defer)
 {
SMB_STRUCT_STAT sbuf;
uint32 fattr;
@@ -1777,7 +1778,7 @@
FILE_OPEN,
0,
FILE_ATTRIBUTE_NORMAL,
-   0,
+   can_defer ? 0 : INTERNAL_OPEN_ONLY,
NULL, &fsp);
 
if (NT_STATUS_IS_OK(status)) {
@@ -1791,7 +1792,8 @@
  code.
 /
 
-NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype, char *name, 
BOOL has_wild)
+NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
+ char *name, BOOL has_wild, BOOL can_defer)
 {
pstring directory;
pstring mask;
@@ -1835,7 +1837,7 @@
if (dirtype == 0) {
dirtype = FILE_ATTRIBUTE_NORMAL;
}
-   status = can_delete(conn,directory,dirtype);
+   status = can_delete(conn,directory,dirtype,can_defer);
if (!NT_STATUS_IS_OK(status))
return status;
 
@@ -1885,7 +1887,8 @@
continue;

slprintf(fname,sizeof(fname)-1, 
"%s/%s",directory,dname);
-   status = can_delete(conn, fname, dirtype);
+   status = can_delete(conn, fname, dirtype,
+

svn commit: samba r20795 - in branches/SAMBA_4_0/source/libcli/security: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 09:02:58 + (Mon, 15 Jan 2007)
New Revision: 20795

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20795

Log:
dom_sid_parse_talloc() gets an null terminated string as input,
the SDDL string has the sid strings embedded, so we need to create
a null terminated string...

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/sddl.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/sddl.c
===
--- branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 08:17:15 UTC 
(rev 20794)
+++ branches/SAMBA_4_0/source/libcli/security/sddl.c2007-01-15 09:02:58 UTC 
(rev 20795)
@@ -100,9 +100,17 @@
 
/* see if its in the numeric format */
if (strncmp(sddl, "S-", 2) == 0) {
+   struct dom_sid *sid;
+   char *sid_str;
size_t len = strspn(sddl+2, "-0123456789");
+   sid_str = talloc_strndup(mem_ctx, sddl, len+2);
+   if (!sid_str) {
+   return NULL;
+   }
(*sddlp) += len+2;
-   return dom_sid_parse_talloc(mem_ctx, sddl);
+   sid = dom_sid_parse_talloc(mem_ctx, sid_str);
+   talloc_free(sid_str);
+   return sid;
}
 
/* now check for one of the special codes */

svn commit: samba r20794 - in branches/SAMBA_4_0/source/lib/events: .

2007-01-15 Thread metze

Author: metze
Date: 2007-01-15 08:17:15 + (Mon, 15 Jan 2007)
New Revision: 20794

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20794

Log:
hopefully fix the build on systems without native linux aio

metze
Modified:
   branches/SAMBA_4_0/source/lib/events/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/config.m4
===
--- branches/SAMBA_4_0/source/lib/events/config.m4  2007-01-15 07:53:45 UTC 
(rev 20793)
+++ branches/SAMBA_4_0/source/lib/events/config.m4  2007-01-15 08:17:15 UTC 
(rev 20794)
@@ -13,5 +13,5 @@
SMB_ENABLE(EVENTS_AIO,YES)
AC_DEFINE(HAVE_LINUX_AIO, 1, [Whether Linux AIO is available])
fi
-   SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS)
 fi
+SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS)

39 matches

Mail list logo