Attachment 7686 Details for Bug 9024 – samba-4.0.0_beta3-disable-ntdb.patch

[patch] samba-4.0.0_beta3-disable-ntdb.patch

samba-4.0.0_beta3-disable-ntdb.patch (text/plain), 4.22 KB, created by Torsten Kurbad on 2012-07-03 13:42:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torsten Kurbad

Created: 2012-07-03 13:42:45 UTC

Size: 4.22 KB

patch

obsolete

>diff -urN samba-4.0.0beta3.orig//lib/dbwrap/dbwrap_local_open.c samba-4.0.0beta3//lib/dbwrap/dbwrap_local_open.c
>--- samba-4.0.0beta3.orig//lib/dbwrap/dbwrap_local_open.c	2012-06-29 02:32:30.000000000 +0200
>+++ samba-4.0.0beta3//lib/dbwrap/dbwrap_local_open.c	2012-07-03 15:31:47.355907072 +0200
>@@ -22,7 +22,6 @@
> #include "dbwrap/dbwrap.h"
> #include "dbwrap/dbwrap_tdb.h"
> #include "tdb.h"
>-#include "lib/util/util_ntdb.h"
> #include "lib/param/param.h"
> #include "system/filesys.h"
> #include "ccan/str/str.h"
>diff -urN samba-4.0.0beta3.orig//lib/util/wscript_build samba-4.0.0beta3//lib/util/wscript_build
>--- samba-4.0.0beta3.orig//lib/util/wscript_build	2012-07-03 15:28:59.555899565 +0200
>+++ samba-4.0.0beta3//lib/util/wscript_build	2012-07-03 15:29:32.652567713 +0200
>@@ -1,34 +1,35 @@
> #!/usr/bin/env python
> 
> bld.SAMBA_LIBRARY('samba-util',
>-                  source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
>-                    util_file.c time.c rbtree.c rfc1738.c select.c
>-                    genrand.c fsusage.c blocking.c become_daemon.c
>-                    signal.c system.c params.c util.c util_id.c util_net.c
>-                    util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
>-                    util_str.c util_str_common.c substitute.c ms_fnmatch.c
>-                    server_id.c dprintf.c parmlist.c bitmap.c''',
>-                  deps='DYNCONFIG',
>-                  public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset util_setid',
>-                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
>-                  header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
>-                  local_include=False,
>-                  vnum='0.0.1',
>-                  pc_files='samba-util.pc'
>-                  )
>+	source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
>+		util_file.c time.c rbtree.c rfc1738.c select.c
>+		genrand.c fsusage.c blocking.c become_daemon.c
>+		signal.c system.c params.c util.c util_id.c util_net.c
>+		util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
>+		util_str.c util_str_common.c substitute.c ms_fnmatch.c
>+		server_id.c dprintf.c parmlist.c bitmap.c''',
>+	deps='DYNCONFIG',
>+	public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset util_setid',
>+	public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
>+	header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
>+	local_include=False,
>+	vnum='0.0.1',
>+	pc_files='samba-util.pc'
>+	)
> 
> bld.SAMBA_LIBRARY('samba-modules',
>-		  source='modules.c',
>-		  deps='errors samba-util',
>-		  local_include=False,
>-		  private_library=True)
>+	source='modules.c',
>+	deps='errors samba-util',
>+	local_include=False,
>+	private_library=True
>+	)
> 
> bld.SAMBA_LIBRARY('asn1util',
>-                  source='asn1.c',
>-                  deps='talloc samba-util',
>-                  private_library=True,
>-                  local_include=False)
>-
>+	source='asn1.c',
>+	deps='talloc samba-util',
>+	private_library=True,
>+	local_include=False
>+	)
> 
> bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
> 	source='unix_privs.c',
>@@ -37,7 +38,6 @@
> 	local_include=False,
> 	)
> 
>-
> bld.SAMBA_LIBRARY('util_tdb',
> 	source='util_tdb.c',
> 	local_include=False,
>@@ -45,12 +45,13 @@
> 	private_library=True
> 	)
> 
>-bld.SAMBA_LIBRARY('util_ntdb',
>-	source='util_ntdb.c',
>-	local_include=False,
>-	public_deps='ntdb talloc samba-util samba-hostconfig',
>-	private_library=True
>-	)
>+if not bld.env.disable_ntdb:
>+	bld.SAMBA_LIBRARY('util_ntdb',
>+		source='util_ntdb.c',
>+		local_include=False,
>+		public_deps='ntdb talloc samba-util samba-hostconfig',
>+		private_library=True
>+		)
> 
> bld.SAMBA_LIBRARY('tevent-util',
> 	source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
>@@ -69,11 +70,11 @@
> 	)
> 
> bld.SAMBA_SUBSYSTEM('util_ldb',
>-		    source='util_ldb.c',
>-		    local_include=False,
>-		    public_deps='ldb',
>-		    public_headers='util_ldb.h'
>-		    )
>+	source='util_ldb.c',
>+	local_include=False,
>+	public_deps='ldb',
>+	public_headers='util_ldb.h'
>+	)
> 
> 
> bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
>@@ -87,4 +88,3 @@
> 	local_include=False,
> 	public_deps='talloc'
> 	)
>-

Actions: View

Attachments on bug 9024: 7686 | 7688