[SCM] Samba Shared Repository - branch master updated -
9f178f5b6716e8a130717976646388f1a8018146
Jelmer Vernooij
jelmer at samba.org
Sun Sep 21 03:43:55 GMT 2008
The branch, master has been updated
via 9f178f5b6716e8a130717976646388f1a8018146 (commit)
via db6bd2a3d6311cf34a6af044ec37f31f7741c144 (commit)
via 442d31c7f699628a603ee3bef3831441b43afb69 (commit)
via f63c83deef52afcbe27c1664031a5eed009f3a44 (commit)
via 163292f325981f233b6884e9c4675bf8ded88e6b (commit)
via 3fbcc2149e6d6acee30be32f3bb1ff82155f76a1 (commit)
via 0c193b7a1041015b1e6254aedff805469ba0eab4 (commit)
via 53be14a19b0cecd5e2269c03ff4cab8f02b109e9 (commit)
via 87afa77eac72b84bccd292cba53ebec85dfd120c (commit)
via 714669f17239230e325cb90ce57ce34f75f9461f (commit)
via db0abee678f7b079b32d08334682fcee442e206b (commit)
via 21897a0539e31c81bb7105fc5da7829a7d58f41e (commit)
via 41c645bde26a66360f4427be752c9720d1adff7b (commit)
via deba4e8deda54f0c815d4bd2e3d73e0821b004b5 (commit)
via a48f19b6c2c954e743438e9f2814289247ba3fc6 (commit)
via acffa3ddbfe982ee0c2f8d1eb45993fd655db674 (commit)
via 729ffbae086309992d7433a296fca64f6800f8fa (commit)
via 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (commit)
via 1ba033a07079d86c7a9d023ad0c498f188923d2c (commit)
via f3a517a92eb6e9a4d6f315882706f0d8569abeda (commit)
via f594044d79346b0862336b9e23dc16736d16c9f7 (commit)
via 197870a731f18dd9759e9cc97dfd298fda773251 (commit)
from 0e2928f94651c53d653a3ad83bbda5608b4d4c24 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9f178f5b6716e8a130717976646388f1a8018146
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 05:21:56 2008 +0200
Fix last samba3sam.py test.
commit db6bd2a3d6311cf34a6af044ec37f31f7741c144
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 03:42:27 2008 +0200
Fix DNs - only one more samba3sam test failing now.
commit 442d31c7f699628a603ee3bef3831441b43afb69
Merge: f63c83deef52afcbe27c1664031a5eed009f3a44 0e2928f94651c53d653a3ad83bbda5608b4d4c24
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Sep 21 02:32:19 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
commit f63c83deef52afcbe27c1664031a5eed009f3a44
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Sep 20 14:35:21 2008 +0200
More code simplifications.
commit 163292f325981f233b6884e9c4675bf8ded88e6b
Merge: 3fbcc2149e6d6acee30be32f3bb1ff82155f76a1 acae07bc17d3e8dbafa5667711d25616f99a91a9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 16:26:00 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
commit 3fbcc2149e6d6acee30be32f3bb1ff82155f76a1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 12:44:00 2008 +0200
Fix formatting.
commit 0c193b7a1041015b1e6254aedff805469ba0eab4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 12:04:13 2008 +0200
Simplify code, remove print statements.
commit 53be14a19b0cecd5e2269c03ff4cab8f02b109e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 11:05:19 2008 +0200
Remove unused scripts.
commit 87afa77eac72b84bccd292cba53ebec85dfd120c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 11:04:18 2008 +0200
find_unused_makefilevars: Support parsing simple includes.
commit 714669f17239230e325cb90ce57ce34f75f9461f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 01:43:04 2008 +0200
Fix objectclass tests.
commit db0abee678f7b079b32d08334682fcee442e206b
Merge: 21897a0539e31c81bb7105fc5da7829a7d58f41e ba5fe7122586d8b382bf78f1e1cb5dbe4293c27b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Sep 19 00:06:14 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
commit 21897a0539e31c81bb7105fc5da7829a7d58f41e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 23:46:58 2008 +0200
Improve formatting.
commit 41c645bde26a66360f4427be752c9720d1adff7b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 22:56:58 2008 +0200
Fix tests, be less verbose.
commit deba4e8deda54f0c815d4bd2e3d73e0821b004b5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 21:53:08 2008 +0200
Fix some tests.
commit a48f19b6c2c954e743438e9f2814289247ba3fc6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 21:32:30 2008 +0200
Remove python extension, simplify some code.
commit acffa3ddbfe982ee0c2f8d1eb45993fd655db674
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 20:48:09 2008 +0200
Stop writing js include dir in selftest.
commit 729ffbae086309992d7433a296fca64f6800f8fa
Merge: 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 fc7050e54c69919d754ca0adf3f2f741a501fec4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 20:29:05 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
commit 88ad1a936ccd2451d6dbf542a0a746ad71a3e968
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 20:28:42 2008 +0200
Remove EJS tests.
commit 1ba033a07079d86c7a9d023ad0c498f188923d2c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Sep 18 16:57:44 2008 +0200
Remove jsdir.
commit f3a517a92eb6e9a4d6f315882706f0d8569abeda
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 18:13:56 2008 +0200
Remove minschema js tests.
commit f594044d79346b0862336b9e23dc16736d16c9f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 18:09:34 2008 +0200
Remove remaining JavaScript code.
commit 197870a731f18dd9759e9cc97dfd298fda773251
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Sep 16 18:05:53 2008 +0200
Remove remaining embedded JavaScript support.
-----------------------------------------------------------------------
Summary of changes:
pidl/pidl | 14 +-
source4/Makefile | 5 +-
source4/configure.ac | 1 -
source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | 493 ++-
source4/lib/appweb/README | 6 -
source4/lib/appweb/config.m4 | 1 -
source4/lib/appweb/config.mk | 25 -
source4/lib/appweb/ejs-2.0/.bashrc | 153 -
source4/lib/appweb/ejs-2.0/.exrc | 1 -
source4/lib/appweb/ejs-2.0/.ignore | 57 -
source4/lib/appweb/ejs-2.0/.loginrc | 218 -
source4/lib/appweb/ejs-2.0/ejs/.ignore | 2 -
source4/lib/appweb/ejs-2.0/ejs/Makefile | 61 -
source4/lib/appweb/ejs-2.0/ejs/classes/.ignore | 1 -
source4/lib/appweb/ejs-2.0/ejs/classes/Makefile | 21 -
source4/lib/appweb/ejs-2.0/ejs/classes/ejsArray.c | 167 -
source4/lib/appweb/ejs-2.0/ejs/classes/ejsDate.c | 197 -
source4/lib/appweb/ejs-2.0/ejs/classes/ejsError.c | 140 -
source4/lib/appweb/ejs-2.0/ejs/classes/ejsObject.c | 588 ---
.../appweb/ejs-2.0/ejs/classes/ejsStndClasses.c | 144 -
source4/lib/appweb/ejs-2.0/ejs/classes/ejsString.c | 381 --
source4/lib/appweb/ejs-2.0/ejs/classes/ejsXml.c | 1327 ------
source4/lib/appweb/ejs-2.0/ejs/ejs.c | 1378 ------
source4/lib/appweb/ejs-2.0/ejs/ejs.h | 849 ----
source4/lib/appweb/ejs-2.0/ejs/ejsClass.c | 273 --
source4/lib/appweb/ejs-2.0/ejs/ejsCmd.c | 468 --
source4/lib/appweb/ejs-2.0/ejs/ejsGarbage.c | 1214 ------
source4/lib/appweb/ejs-2.0/ejs/ejsLex.c | 1033 -----
source4/lib/appweb/ejs-2.0/ejs/ejsParser.c | 4514 --------------------
source4/lib/appweb/ejs-2.0/ejs/ejsVar.c | 4033 -----------------
source4/lib/appweb/ejs-2.0/ejs/ejsVar.h | 1091 -----
source4/lib/appweb/ejs-2.0/ejs/lib/event.js | 141 -
source4/lib/appweb/ejs-2.0/ejs/lib/global.js | 34 -
source4/lib/appweb/ejs-2.0/ejs/lib/startup.js | 15 -
source4/lib/appweb/ejs-2.0/ejs/lib/timer.js | 158 -
source4/lib/appweb/ejs-2.0/ejs/system/.ignore | 1 -
source4/lib/appweb/ejs-2.0/ejs/system/Makefile | 27 -
source4/lib/appweb/ejs-2.0/ejs/system/README.TXT | 63 -
source4/lib/appweb/ejs-2.0/ejs/system/UNIX/.ignore | 1 -
.../lib/appweb/ejs-2.0/ejs/system/UNIX/Makefile | 21 -
.../lib/appweb/ejs-2.0/ejs/system/UNIX/ejsFile.c | 98 -
.../appweb/ejs-2.0/ejs/system/UNIX/ejsFileSystem.c | 454 --
.../lib/appweb/ejs-2.0/ejs/system/UNIX/ejsHTTP.c | 488 ---
source4/lib/appweb/ejs-2.0/ejs/system/WIN/.ignore | 1 -
source4/lib/appweb/ejs-2.0/ejs/system/WIN/Makefile | 21 -
.../lib/appweb/ejs-2.0/ejs/system/WIN/ejsFile.c | 98 -
.../appweb/ejs-2.0/ejs/system/WIN/ejsFileSystem.c | 456 --
.../lib/appweb/ejs-2.0/ejs/system/WIN/ejsHTTP.c | 488 ---
source4/lib/appweb/ejs-2.0/ejs/system/ejsGC.c | 326 --
source4/lib/appweb/ejs-2.0/ejs/system/ejsGlobal.c | 785 ----
source4/lib/appweb/ejs-2.0/ejs/system/ejsSystem.c | 112 -
.../lib/appweb/ejs-2.0/ejs/system/ejsSystemApp.c | 49 -
.../lib/appweb/ejs-2.0/ejs/system/ejsSystemDebug.c | 60 -
.../lib/appweb/ejs-2.0/ejs/system/ejsSystemLog.c | 163 -
.../appweb/ejs-2.0/ejs/system/ejsSystemMemory.c | 174 -
source4/lib/appweb/ejs-2.0/exml/Makefile | 42 -
source4/lib/appweb/ejs-2.0/exml/exml.h | 94 -
source4/lib/appweb/ejs-2.0/exml/exmlParser.c | 752 ----
source4/lib/appweb/ejs-2.0/exml/files | 1 -
source4/lib/appweb/ejs-2.0/mpr/Makefile | 41 -
source4/lib/appweb/ejs-2.0/mpr/UNIX/Makefile | 16 -
source4/lib/appweb/ejs-2.0/mpr/UNIX/mprFile.c | 86 -
source4/lib/appweb/ejs-2.0/mpr/UNIX/mprPlatform.c | 218 -
source4/lib/appweb/ejs-2.0/mpr/UNIX/mprTime.c | 163 -
source4/lib/appweb/ejs-2.0/mpr/VXWORKS/Makefile | 16 -
source4/lib/appweb/ejs-2.0/mpr/VXWORKS/mprFile.c | 85 -
.../lib/appweb/ejs-2.0/mpr/VXWORKS/mprPlatform.c | 191 -
source4/lib/appweb/ejs-2.0/mpr/VXWORKS/mprTime.c | 163 -
source4/lib/appweb/ejs-2.0/mpr/WIN/Makefile | 16 -
source4/lib/appweb/ejs-2.0/mpr/WIN/mprFile.c | 123 -
source4/lib/appweb/ejs-2.0/mpr/WIN/mprPlatform.c | 378 --
source4/lib/appweb/ejs-2.0/mpr/WIN/mprTime.c | 192 -
source4/lib/appweb/ejs-2.0/mpr/files | 14 -
source4/lib/appweb/ejs-2.0/mpr/mpr.c | 340 --
source4/lib/appweb/ejs-2.0/mpr/mpr.h | 1027 -----
source4/lib/appweb/ejs-2.0/mpr/mprAlloc.c | 1775 --------
source4/lib/appweb/ejs-2.0/mpr/mprArray.c | 385 --
source4/lib/appweb/ejs-2.0/mpr/mprBuf.c | 535 ---
source4/lib/appweb/ejs-2.0/mpr/mprGenFile.c | 336 --
source4/lib/appweb/ejs-2.0/mpr/mprGenTime.c | 195 -
source4/lib/appweb/ejs-2.0/mpr/mprLock.c | 266 --
source4/lib/appweb/ejs-2.0/mpr/mprLog.c | 602 ---
source4/lib/appweb/ejs-2.0/mpr/mprOs.h | 707 ---
source4/lib/appweb/ejs-2.0/mpr/mprPrintf.c | 924 ----
source4/lib/appweb/ejs-2.0/mpr/mprString.c | 733 ----
source4/lib/appweb/ejs-2.0/mpr/mprSymbol.c | 279 --
source4/lib/appweb/ejs-2.0/mpr/mprUnix.h | 105 -
source4/lib/appweb/ejs/config.h | 141 -
source4/lib/appweb/ejs/ejs.h | 136 -
source4/lib/appweb/ejs/ejsInternal.h | 295 --
source4/lib/appweb/ejs/ejsLex.c | 923 ----
source4/lib/appweb/ejs/ejsLib.c | 1090 -----
source4/lib/appweb/ejs/ejsParser.c | 2436 -----------
source4/lib/appweb/ejs/ejsProcs.c | 704 ---
source4/lib/appweb/esp/esp.c | 1042 -----
source4/lib/appweb/esp/esp.h | 277 --
source4/lib/appweb/esp/espEnv.h | 128 -
source4/lib/appweb/esp/espProcs.c | 249 --
source4/lib/appweb/mpr/miniMpr.c | 522 ---
source4/lib/appweb/mpr/miniMpr.h | 301 --
source4/lib/appweb/mpr/var.c | 2215 ----------
source4/lib/appweb/mpr/var.h | 487 ---
source4/librpc/config.mk | 1 -
source4/main.mk | 2 -
source4/param/loadparm.c | 5 -
source4/samba4-skip | 1 -
source4/script/find_unused_makefilevars.pl | 27 +-
source4/script/installmodules.sh | 33 -
source4/script/installscripts.sh | 47 -
source4/script/uninstallmodules.sh | 37 -
source4/script/uninstallscripts.sh | 36 -
source4/scripting/bin/autoidl | 161 +
source4/scripting/bin/autoidl.py | 161 -
source4/scripting/bin/epdump | 24 +
source4/scripting/bin/epdump.py | 24 -
source4/scripting/bin/minschema | 585 +++
source4/scripting/bin/minschema.py | 585 ---
source4/scripting/bin/smbstatus | 6 +-
source4/scripting/ejs/config.mk | 63 -
source4/scripting/ejs/mprutil.c | 494 ---
source4/scripting/ejs/smbcalls.c | 220 -
source4/scripting/ejs/smbcalls.h | 42 -
source4/scripting/ejs/smbcalls_auth.c | 243 --
source4/scripting/ejs/smbcalls_config.c | 228 -
source4/scripting/ejs/smbcalls_creds.c | 275 --
source4/scripting/ejs/smbcalls_ldb.c | 772 ----
source4/scripting/ejs/smbcalls_options.c | 193 -
source4/scripting/ejs/smbcalls_string.c | 529 ---
source4/scripting/ejs/smbcalls_sys.c | 494 ---
source4/scripting/ejs/smbscript.c | 129 -
source4/scripting/libjs/base.js | 50 -
source4/scripting/python/misc_wrap.c | 46 +-
source4/selftest/samba4_tests.sh | 8 -
source4/selftest/selftest.pl | 1 -
source4/selftest/target/Samba4.pm | 1 -
source4/web_server/config.mk | 1 +
testprogs/ejs/bugs.js | 155 -
testprogs/ejs/ldb.js | 385 --
testprogs/ejs/minschema.js | 804 ----
testprogs/ejs/sprintf.js | 31 -
140 files changed, 1087 insertions(+), 50648 deletions(-)
delete mode 100644 source4/lib/appweb/README
delete mode 100644 source4/lib/appweb/config.m4
delete mode 100644 source4/lib/appweb/config.mk
delete mode 100644 source4/lib/appweb/ejs-2.0/.bashrc
delete mode 100644 source4/lib/appweb/ejs-2.0/.exrc
delete mode 100644 source4/lib/appweb/ejs-2.0/.ignore
delete mode 100644 source4/lib/appweb/ejs-2.0/.loginrc
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/.ignore
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/.ignore
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/ejsArray.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/classes/ejsDate.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/classes/ejsError.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/ejsObject.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/ejsStndClasses.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/ejsString.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/classes/ejsXml.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejs.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejs.h
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsClass.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsCmd.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/ejsGarbage.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsLex.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsParser.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsVar.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/ejsVar.h
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/lib/event.js
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/lib/global.js
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/lib/startup.js
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/lib/timer.js
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/.ignore
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/README.TXT
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/UNIX/.ignore
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/UNIX/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/UNIX/ejsFile.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/UNIX/ejsFileSystem.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/UNIX/ejsHTTP.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/WIN/.ignore
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/WIN/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/WIN/ejsFile.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/WIN/ejsFileSystem.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/WIN/ejsHTTP.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/ejsGC.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/ejsGlobal.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/ejsSystem.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/ejsSystemApp.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/ejsSystemDebug.c
delete mode 100644 source4/lib/appweb/ejs-2.0/ejs/system/ejsSystemLog.c
delete mode 100755 source4/lib/appweb/ejs-2.0/ejs/system/ejsSystemMemory.c
delete mode 100644 source4/lib/appweb/ejs-2.0/exml/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/exml/exml.h
delete mode 100644 source4/lib/appweb/ejs-2.0/exml/exmlParser.c
delete mode 100644 source4/lib/appweb/ejs-2.0/exml/files
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/UNIX/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/UNIX/mprFile.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/UNIX/mprPlatform.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/UNIX/mprTime.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/VXWORKS/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/VXWORKS/mprFile.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/VXWORKS/mprPlatform.c
delete mode 100755 source4/lib/appweb/ejs-2.0/mpr/VXWORKS/mprTime.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/WIN/Makefile
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/WIN/mprFile.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/WIN/mprPlatform.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/WIN/mprTime.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/files
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mpr.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mpr.h
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprAlloc.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprArray.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprBuf.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprGenFile.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprGenTime.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprLock.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprLog.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprOs.h
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprPrintf.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprString.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprSymbol.c
delete mode 100644 source4/lib/appweb/ejs-2.0/mpr/mprUnix.h
delete mode 100644 source4/lib/appweb/ejs/config.h
delete mode 100644 source4/lib/appweb/ejs/ejs.h
delete mode 100644 source4/lib/appweb/ejs/ejsInternal.h
delete mode 100644 source4/lib/appweb/ejs/ejsLex.c
delete mode 100644 source4/lib/appweb/ejs/ejsLib.c
delete mode 100644 source4/lib/appweb/ejs/ejsParser.c
delete mode 100644 source4/lib/appweb/ejs/ejsProcs.c
delete mode 100644 source4/lib/appweb/esp/esp.c
delete mode 100644 source4/lib/appweb/esp/esp.h
delete mode 100644 source4/lib/appweb/esp/espEnv.h
delete mode 100644 source4/lib/appweb/esp/espProcs.c
delete mode 100644 source4/lib/appweb/mpr/miniMpr.c
delete mode 100644 source4/lib/appweb/mpr/miniMpr.h
delete mode 100644 source4/lib/appweb/mpr/var.c
delete mode 100644 source4/lib/appweb/mpr/var.h
delete mode 100755 source4/script/installmodules.sh
delete mode 100755 source4/script/installscripts.sh
delete mode 100755 source4/script/uninstallmodules.sh
delete mode 100755 source4/script/uninstallscripts.sh
create mode 100755 source4/scripting/bin/autoidl
delete mode 100755 source4/scripting/bin/autoidl.py
create mode 100755 source4/scripting/bin/epdump
delete mode 100644 source4/scripting/bin/epdump.py
create mode 100755 source4/scripting/bin/minschema
delete mode 100755 source4/scripting/bin/minschema.py
delete mode 100644 source4/scripting/ejs/config.mk
delete mode 100644 source4/scripting/ejs/mprutil.c
delete mode 100644 source4/scripting/ejs/smbcalls.c
delete mode 100644 source4/scripting/ejs/smbcalls.h
delete mode 100644 source4/scripting/ejs/smbcalls_auth.c
delete mode 100644 source4/scripting/ejs/smbcalls_config.c
delete mode 100644 source4/scripting/ejs/smbcalls_creds.c
delete mode 100644 source4/scripting/ejs/smbcalls_ldb.c
delete mode 100644 source4/scripting/ejs/smbcalls_options.c
delete mode 100644 source4/scripting/ejs/smbcalls_string.c
delete mode 100644 source4/scripting/ejs/smbcalls_sys.c
delete mode 100644 source4/scripting/ejs/smbscript.c
delete mode 100644 source4/scripting/libjs/base.js
delete mode 100644 testprogs/ejs/bugs.js
delete mode 100755 testprogs/ejs/ldb.js
delete mode 100755 testprogs/ejs/minschema.js
delete mode 100755 testprogs/ejs/sprintf.js
Changeset truncated at 500 lines:
diff --git a/pidl/pidl b/pidl/pidl
index e58442b..577db0a 100755
--- a/pidl/pidl
+++ b/pidl/pidl
@@ -17,7 +17,7 @@ pidl - An IDL compiler written in Perl
pidl --help
-pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--python[=OUTPUT]] [--swig[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]...
+pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--python[=OUTPUT]] [--swig[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]...
=head1 DESCRIPTION
@@ -478,7 +478,6 @@ my($opt_ndr_parser);
my($opt_tdr_parser);
my($opt_ws_parser);
my($opt_swig);
-my($opt_ejs);
my($opt_python);
my($opt_quiet) = 0;
my($opt_outputdir) = '.';
@@ -521,7 +520,6 @@ Samba 4 output:
--ndr-parser[=OUTFILE] create a C NDR parser [ndr_BASENAME.c]
--client[=OUTFILE] create a C NDR client [ndr_BASENAME_c.c]
--tdr-parser[=OUTFILE] create a C TDR parser [tdr_BASENAME.c]
- --ejs[=OUTFILE] create ejs wrapper file [BASENAME_ejs.c]
--python[=OUTFILE] create python wrapper file [py_BASENAME.c]
--swig[=OUTFILE] create swig wrapper file [BASENAME.i]
--server[=OUTFILE] create server boilerplate [ndr_BASENAME_s.c]
@@ -567,7 +565,6 @@ my $result = GetOptions (
'ndr-parser:s' => \$opt_ndr_parser,
'client:s' => \$opt_client,
'ws-parser:s' => \$opt_ws_parser,
- 'ejs' => \$opt_ejs,
'python' => \$opt_python,
'diff' => \$opt_diff,
'swig:s' => \$opt_swig,
@@ -664,7 +661,6 @@ sub process_file($)
defined($opt_server) or
defined($opt_header) or
defined($opt_ndr_parser) or
- defined($opt_ejs) or
defined($opt_python) or
defined($opt_dump_ndr_tree) or
defined($opt_samba3_header) or
@@ -709,14 +705,6 @@ sub process_file($)
FileSave($filename, $code);
}
- if (defined($opt_ejs)) {
- require Parse::Pidl::Samba4::EJS;
- my $generator = new Parse::Pidl::Samba4::EJS();
- my ($hdr,$prsr) = $generator->Parse($ndr, $h_filename);
- FileSave("$outputdir/ndr_$basename\_ejs.c", $prsr);
- FileSave("$outputdir/ndr_$basename\_ejs.h", $hdr);
- }
-
if (defined($opt_python)) {
require Parse::Pidl::Samba4::Python;
my $generator = new Parse::Pidl::Samba4::Python();
diff --git a/source4/Makefile b/source4/Makefile
index 7a5ec4c..bc47074 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -13,7 +13,6 @@ pidldir := $(srcdir)/../pidl
BASEDIR = $(prefix)
TORTUREDIR = $(libdir)/torture
SWATDIR = $(datadir)/swat
-JSDIR = $(datadir)/js
SETUPDIR = $(datadir)/setup
NCALRPCDIR = $(localstatedir)/ncalrpc
@@ -98,7 +97,6 @@ ntvfssrcdir := ntvfs
ntptrsrcdir := ntptr
librpcsrcdir := librpc
libclisrcdir := libcli
-ejsscriptsrcdir := scripting/ejs
pyscriptsrcdir := $(srcdir)/scripting/python
kdcsrcdir := kdc
ntp_signdsrcdir := ntp_signd
@@ -164,7 +162,6 @@ showlayout::
@echo ' lockdir: $(lockdir)'
@echo ' logfilebase: $(logfilebase)'
@echo ' setupdir: $(SETUPDIR)'
- @echo ' jsdir: $(JSDIR)'
@echo ' swatdir: $(SWATDIR)'
@echo ' mandir: $(mandir)'
@echo ' torturedir: $(TORTUREDIR)'
@@ -234,7 +231,7 @@ installman:: manpages installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
installmisc:: installdirs
- @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
+ @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
installpc:: installdirs
@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
diff --git a/source4/configure.ac b/source4/configure.ac
index a445dc6..fa2d8d9 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -104,7 +104,6 @@ m4_include(../lib/nss_wrapper/config.m4)
m4_include(auth/config.m4)
m4_include(kdc/config.m4)
m4_include(ntvfs/sysdep/config.m4)
-m4_include(lib/appweb/config.m4)
m4_include(nsswitch/config.m4)
#################################################
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
index 428e6b4..2ca5b80 100644
--- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2005-2007
+# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2005-2008
# Copyright (C) Martin Kuehl <mkhl at samba.org> 2006
#
# This is a Python port of the original in testprogs/ejs/samba3sam.js
@@ -23,19 +23,23 @@
"""Tests for the samba3sam LDB module, which maps Samba3 LDAP to AD LDAP."""
import os
-import sys
-import samba
import ldb
from ldb import SCOPE_DEFAULT, SCOPE_BASE, SCOPE_SUBTREE
from samba import Ldb, substitute_var
from samba.tests import LdbTestCase, TestCaseInTempDir
-datadir = os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
+datadir = os.path.join(os.path.dirname(__file__),
+ "../../../../../testdata/samba3")
+
+def read_datafile(filename):
+ return open(os.path.join(datadir, filename), 'r').read()
+
+def ldb_debug(l, text):
+ print text
+
class MapBaseTestCase(TestCaseInTempDir):
- def setup_data(self, obj, ldif):
- self.assertTrue(ldif is not None)
- obj.db.add_ldif(substitute_var(ldif, obj.substvars))
+ """Base test case for mapping tests."""
def setup_modules(self, ldb, s3, s4):
ldb.add({"dn": "@MAP=samba3sam",
@@ -46,26 +50,27 @@ class MapBaseTestCase(TestCaseInTempDir):
"@LIST": "rootdse,paged_results,server_sort,extended_dn,asq,samldb,password_hash,operational,objectguid,rdn_name,samba3sam,partition"})
ldb.add({"dn": "@PARTITION",
- "partition": [s4.basedn + ":" + s4.url, s3.basedn + ":" + s3.url],
+ "partition": ["%s:%s" % (s4.basedn, s4.url),
+ "%s:%s" % (s3.basedn, s3.url)],
"replicateEntries": ["@ATTRIBUTES", "@INDEXLIST"]})
def setUp(self):
super(MapBaseTestCase, self).setUp()
def make_dn(basedn, rdn):
- return rdn + ",sambaDomainName=TESTS," + basedn
+ return "%s,sambaDomainName=TESTS,%s" % (rdn, basedn)
def make_s4dn(basedn, rdn):
- return rdn + "," + basedn
+ return "%s,%s" % (rdn, basedn)
self.ldbfile = os.path.join(self.tempdir, "test.ldb")
self.ldburl = "tdb://" + self.ldbfile
tempdir = self.tempdir
- print tempdir
class Target:
- """Simple helper class that contains data for a specific SAM connection."""
+ """Simple helper class that contains data for a specific SAM
+ connection."""
def __init__(self, file, basedn, dn):
self.file = os.path.join(tempdir, file)
self.url = "tdb://" + self.file
@@ -75,11 +80,23 @@ class MapBaseTestCase(TestCaseInTempDir):
self._dn = dn
def dn(self, rdn):
- return self._dn(rdn, self.basedn)
+ return self._dn(self.basedn, rdn)
def connect(self):
return self.db.connect(self.url)
+ def setup_data(self, path):
+ self.add_ldif(read_datafile(path))
+
+ def subst(self, text):
+ return substitute_var(text, self.substvars)
+
+ def add_ldif(self, ldif):
+ self.db.add_ldif(self.subst(ldif))
+
+ def modify_ldif(self, ldif):
+ self.db.modify_ldif(self.subst(ldif))
+
self.samba4 = Target("samba4.ldb", "dc=vernstok,dc=nl", make_s4dn)
self.samba3 = Target("samba3.ldb", "cn=Samba3Sam", make_dn)
self.templates = Target("templates.ldb", "cn=templates", None)
@@ -97,54 +114,58 @@ class MapBaseTestCase(TestCaseInTempDir):
class Samba3SamTestCase(MapBaseTestCase):
+
def setUp(self):
super(Samba3SamTestCase, self).setUp()
ldb = Ldb(self.ldburl)
- self.setup_data(self.samba3, open(os.path.join(datadir, "samba3.ldif"), 'r').read())
- self.setup_data(self.templates, open(os.path.join(datadir, "provision_samba3sam_templates.ldif"), 'r').read())
- ldif = open(os.path.join(datadir, "provision_samba3sam.ldif"), 'r').read()
- ldb.add_ldif(substitute_var(ldif, self.samba4.substvars))
+ self.samba3.setup_data("samba3.ldif")
+ self.templates.setup_data("provision_samba3sam_templates.ldif")
+ ldif = read_datafile("provision_samba3sam.ldif")
+ ldb.add_ldif(self.samba4.subst(ldif))
self.setup_modules(ldb, self.samba3, self.samba4)
+ del ldb
self.ldb = Ldb(self.ldburl)
- def test_s3sam_search(self):
- print "Looking up by non-mapped attribute"
+ def test_search_non_mapped(self):
+ """Looking up by non-mapped attribute"""
msg = self.ldb.search(expression="(cn=Administrator)")
self.assertEquals(len(msg), 1)
self.assertEquals(msg[0]["cn"], "Administrator")
- print "Looking up by mapped attribute"
+ def test_search_non_mapped(self):
+ """Looking up by mapped attribute"""
msg = self.ldb.search(expression="(name=Backup Operators)")
self.assertEquals(len(msg), 1)
self.assertEquals(msg[0]["name"], "Backup Operators")
- print "Looking up by old name of renamed attribute"
+ def test_old_name_of_renamed(self):
+ """Looking up by old name of renamed attribute"""
msg = self.ldb.search(expression="(displayName=Backup Operators)")
self.assertEquals(len(msg), 0)
- print "Looking up mapped entry containing SID"
+ def test_mapped_containing_sid(self):
+ """Looking up mapped entry containing SID"""
msg = self.ldb.search(expression="(cn=Replicator)")
self.assertEquals(len(msg), 1)
- print msg[0].dn
- self.assertEquals(str(msg[0].dn), "cn=Replicator,ou=Groups,dc=vernstok,dc=nl")
- self.assertEquals(msg[0]["objectSid"], "S-1-5-21-4231626423-2410014848-2360679739-552")
-
- print "Checking mapping of objectClass"
+ self.assertEquals(str(msg[0].dn),
+ "cn=Replicator,ou=Groups,dc=vernstok,dc=nl")
+ self.assertTrue("objectSid" in msg[0])
+ # FIXME: NDR unpack msg[0]["objectSid"] before comparing:
+ # self.assertEquals(msg[0]["objectSid"],
+ # "S-1-5-21-4231626423-2410014848-2360679739-552")
+ # Check mapping of objectClass
oc = set(msg[0]["objectClass"])
- self.assertTrue(oc is not None)
- for i in oc:
- self.assertEquals(oc[i] == "posixGroup" or oc[i], "group")
+ self.assertEquals(oc, set(["group"]))
- print "Looking up by objectClass"
+ def test_search_by_objclass(self):
+ """Looking up by objectClass"""
msg = self.ldb.search(expression="(|(objectClass=user)(cn=Administrator))")
- self.assertEquals(len(msg), 2)
- for i in range(len(msg)):
- self.assertEquals((str(msg[i].dn), "unixName=Administrator,ou=Users,dc=vernstok,dc=nl") or
- (str(msg[i].dn) == "unixName=nobody,ou=Users,dc=vernstok,dc=nl"))
-
+ self.assertEquals(set([str(m.dn) for m in msg]),
+ set(["unixName=Administrator,ou=Users,dc=vernstok,dc=nl",
+ "unixName=nobody,ou=Users,dc=vernstok,dc=nl"]))
def test_s3sam_modify(self):
- print "Adding a record that will be fallbacked"
+ # Adding a record that will be fallbacked
self.ldb.add({"dn": "cn=Foo",
"foo": "bar",
"blah": "Blie",
@@ -152,33 +173,36 @@ class Samba3SamTestCase(MapBaseTestCase):
"showInAdvancedViewOnly": "TRUE"}
)
- print "Checking for existence of record (local)"
- # TODO: This record must be searched in the local database, which is currently only supported for base searches
+ # Checking for existence of record (local)
+ # TODO: This record must be searched in the local database, which is
+ # currently only supported for base searches
# msg = ldb.search(expression="(cn=Foo)", ['foo','blah','cn','showInAdvancedViewOnly')]
# TODO: Actually, this version should work as well but doesn't...
#
#
- msg = self.ldb.search(expression="(cn=Foo)", base="cn=Foo", scope=SCOPE_BASE, attrs=['foo','blah','cn','showInAdvancedViewOnly'])
+ msg = self.ldb.search(expression="(cn=Foo)", base="cn=Foo",
+ scope=SCOPE_BASE,
+ attrs=['foo','blah','cn','showInAdvancedViewOnly'])
self.assertEquals(len(msg), 1)
self.assertEquals(msg[0]["showInAdvancedViewOnly"], "TRUE")
self.assertEquals(msg[0]["foo"], "bar")
self.assertEquals(msg[0]["blah"], "Blie")
- print "Adding record that will be mapped"
+ # Adding record that will be mapped
self.ldb.add({"dn": "cn=Niemand,cn=Users,dc=vernstok,dc=nl",
"objectClass": "user",
"unixName": "bin",
"sambaUnicodePwd": "geheim",
"cn": "Niemand"})
- print "Checking for existence of record (remote)"
+ # Checking for existence of record (remote)
msg = self.ldb.search(expression="(unixName=bin)",
attrs=['unixName','cn','dn', 'sambaUnicodePwd'])
self.assertEquals(len(msg), 1)
self.assertEquals(msg[0]["cn"], "Niemand")
self.assertEquals(msg[0]["sambaUnicodePwd"], "geheim")
- print "Checking for existence of record (local && remote)"
+ # Checking for existence of record (local && remote)
msg = self.ldb.search(expression="(&(unixName=bin)(sambaUnicodePwd=geheim))",
attrs=['unixName','cn','dn', 'sambaUnicodePwd'])
self.assertEquals(len(msg), 1) # TODO: should check with more records
@@ -186,21 +210,23 @@ class Samba3SamTestCase(MapBaseTestCase):
self.assertEquals(msg[0]["unixName"], "bin")
self.assertEquals(msg[0]["sambaUnicodePwd"], "geheim")
- print "Checking for existence of record (local || remote)"
+ # Checking for existence of record (local || remote)
msg = self.ldb.search(expression="(|(unixName=bin)(sambaUnicodePwd=geheim))",
attrs=['unixName','cn','dn', 'sambaUnicodePwd'])
- print "got " + len(msg) + " replies"
+ #print "got %d replies" % len(msg)
self.assertEquals(len(msg), 1) # TODO: should check with more records
self.assertEquals(msg[0]["cn"], "Niemand")
- self.assertEquals(msg[0]["unixName"] == "bin" or msg[0]["sambaUnicodePwd"], "geheim")
+ self.assertEquals(msg[0]["unixName"], "bin")
+ self.assertEquals(msg[0]["sambaUnicodePwd"], "geheim")
- print "Checking for data in destination database"
- msg = s3.db.search("(cn=Niemand)")
+ # Checking for data in destination database
+ msg = self.samba3.db.search(expression="(cn=Niemand)")
self.assertTrue(len(msg) >= 1)
- self.assertEquals(msg[0]["sambaSID"], "S-1-5-21-4231626423-2410014848-2360679739-2001")
+ self.assertEquals(msg[0]["sambaSID"],
+ "S-1-5-21-4231626423-2410014848-2360679739-2001")
self.assertEquals(msg[0]["displayName"], "Niemand")
- print "Adding attribute..."
+ # Adding attribute...
self.ldb.modify_ldif("""
dn: cn=Niemand,cn=Users,dc=vernstok,dc=nl
changetype: modify
@@ -208,13 +234,13 @@ add: description
description: Blah
""")
- print "Checking whether changes are still there..."
+ # Checking whether changes are still there...
msg = self.ldb.search(expression="(cn=Niemand)")
self.assertTrue(len(msg) >= 1)
self.assertEquals(msg[0]["cn"], "Niemand")
self.assertEquals(msg[0]["description"], "Blah")
- print "Modifying attribute..."
+ # Modifying attribute...
self.ldb.modify_ldif("""
dn: cn=Niemand,cn=Users,dc=vernstok,dc=nl
changetype: modify
@@ -222,64 +248,66 @@ replace: description
description: Blie
""")
- print "Checking whether changes are still there..."
+ # Checking whether changes are still there...
msg = self.ldb.search(expression="(cn=Niemand)")
self.assertTrue(len(msg) >= 1)
self.assertEquals(msg[0]["description"], "Blie")
- print "Deleting attribute..."
+ # Deleting attribute...
self.ldb.modify_ldif("""
dn: cn=Niemand,cn=Users,dc=vernstok,dc=nl
changetype: modify
delete: description
""")
- print "Checking whether changes are no longer there..."
+ # Checking whether changes are no longer there...
msg = self.ldb.search(expression="(cn=Niemand)")
self.assertTrue(len(msg) >= 1)
- self.assertTrue(not "description" in res[0])
+ self.assertTrue(not "description" in msg[0])
- print "Renaming record..."
- self.ldb.rename("cn=Niemand,cn=Users,dc=vernstok,dc=nl", "cn=Niemand2,cn=Users,dc=vernstok,dc=nl")
+ # Renaming record...
+ self.ldb.rename("cn=Niemand,cn=Users,dc=vernstok,dc=nl",
+ "cn=Niemand2,cn=Users,dc=vernstok,dc=nl")
- print "Checking whether DN has changed..."
+ # Checking whether DN has changed...
msg = self.ldb.search(expression="(cn=Niemand2)")
self.assertEquals(len(msg), 1)
- self.assertEquals(str(msg[0].dn), "cn=Niemand2,cn=Users,dc=vernstok,dc=nl")
+ self.assertEquals(str(msg[0].dn),
+ "cn=Niemand2,cn=Users,dc=vernstok,dc=nl")
- print "Deleting record..."
+ # Deleting record...
self.ldb.delete("cn=Niemand2,cn=Users,dc=vernstok,dc=nl")
- print "Checking whether record is gone..."
+ # Checking whether record is gone...
msg = self.ldb.search(expression="(cn=Niemand2)")
self.assertEquals(len(msg), 0)
-
class MapTestCase(MapBaseTestCase):
+
def setUp(self):
super(MapTestCase, self).setUp()
ldb = Ldb(self.ldburl)
- self.setup_data(self.templates, open(os.path.join(datadir, "provision_samba3sam_templates.ldif"), 'r').read())
- ldif = open(os.path.join(datadir, "provision_samba3sam.ldif"), 'r').read()
- ldb.add_ldif(substitute_var(ldif, self.samba4.substvars))
+ self.templates.setup_data("provision_samba3sam_templates.ldif")
+ ldif = read_datafile("provision_samba3sam.ldif")
+ ldb.add_ldif(self.samba4.subst(ldif))
self.setup_modules(ldb, self.samba3, self.samba4)
+ del ldb
self.ldb = Ldb(self.ldburl)
def test_map_search(self):
- print "Running search tests on mapped data"
- ldif = """
-dn: """ + "sambaDomainName=TESTS,""" + self.samba3.basedn + """
-objectclass: sambaDomain
-objectclass: top
-sambaSID: S-1-5-21-4231626423-2410014848-2360679739
-sambaNextRid: 2000
-sambaDomainName: TESTS"""
- self.samba3.db.add_ldif(substitute_var(ldif, self.samba3.substvars))
-
- print "Add a set of split records"
- ldif = """
-dn: """ + self.samba4.dn("cn=X") + """
+ """Running search tests on mapped data."""
+ self.samba3.db.add({
+ "dn": "sambaDomainName=TESTS," + self.samba3.basedn,
+ "objectclass": ["sambaDomain", "top"],
+ "sambaSID": "S-1-5-21-4231626423-2410014848-2360679739",
+ "sambaNextRid": "2000",
+ "sambaDomainName": "TESTS"
+ })
+
+ # Add a set of split records
+ self.ldb.add_ldif("""
+dn: """+ self.samba4.dn("cn=X") + """
objectClass: user
cn: X
codePage: x
@@ -291,127 +319,128 @@ description: x
objectSid: S-1-5-21-4231626423-2410014848-2360679739-552
primaryGroupID: 1-5-21-4231626423-2410014848-2360679739-512
-dn: """ + self.samba4.dn("cn=Y") + """
-objectClass: top
-cn: Y
-codePage: x
-revision: x
-dnsHostName: y
-nextRid: y
-lastLogon: y
-description: x
-
-dn: """ + self.samba4.dn("cn=Z") + """
-objectClass: top
-cn: Z
-codePage: x
-revision: y
-dnsHostName: z
-nextRid: y
-lastLogon: z
-description: y
--
Samba Shared Repository
More information about the samba-cvs
mailing list