[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1902-gf451dd4

[Günther Deschner]

The branch, master has been updated
       via  f451dd482d1220cb520bbf2cc210c458c25dca26 (commit)
      from  3d9e1f605ce6c9fe7240d21a4913459af18ed211 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f451dd482d1220cb520bbf2cc210c458c25dca26
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 29 19:22:43 2009 +0200

    s4-smbtorture: fix the build w/o libnetapi.
    
    This is surely the wrong fix, but I could not figure out why the samba4 build
    system adds the init function although the m4 macro had switched off the torture
    libnetapi subsystem when the headers and libs were not found.
    
    Can one of the samba4 build gurus please have a look ?
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/torture.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index de4fd59..d80acff 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -45,6 +45,12 @@ bool torture_register_suite(struct torture_suite *suite)
 	return torture_suite_add_suite(torture_root, suite);
 }
 
+#ifndef HAVE_NETAPI_H
+NTSTATUS torture_libnetapi_init(void)
+{
+	return NT_STATUS_OK;
+}
+#endif
 
 _PUBLIC_ int torture_init(void)
 {
@@ -57,7 +63,9 @@ _PUBLIC_ int torture_init(void)
 	extern NTSTATUS torture_rpc_init(void);
 	extern NTSTATUS torture_smb2_init(void);
 	extern NTSTATUS torture_net_init(void);
+#ifdef HAVE_NETAPI_H
 	extern NTSTATUS torture_libnetapi_init(void);
+#endif
 	extern NTSTATUS torture_raw_init(void);
 	extern NTSTATUS torture_unix_init(void);
 	extern NTSTATUS torture_winbind_init(void);


-- 
Samba Shared Repository