[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  0e18a59 s3-build: fix the --with-profiling-data build on mac os x.
       via  6768b65 s3-waf: try to fix the non-ldap-but-krb5 build.
      from  53f50c2 s3: Fix bug 8066, wrong output in smbget

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


- Log -----------------------------------------------------------------
commit 0e18a59ed0aa48a8a9dee856faf05c1ad624e264
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 15 12:39:15 2011 +0200

    s3-build: fix the --with-profiling-data build on mac os x.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Apr 15 13:33:43 CEST 2011 on sn-devel-104

commit 6768b651232a9b65c9d090db7c445e3e9047f056
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 15 12:37:55 2011 +0200

    s3-waf: try to fix the non-ldap-but-krb5 build.
    
    Guenther

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

Summary of changes:
 source3/libads/kerberos_keytab.c |    4 ++++
 source3/profile/profile.c        |    1 +
 source3/utils/net_ads.c          |    2 +-
 source3/wscript_build            |    3 +--
 4 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 721a8c6..6e1b7c0 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -250,6 +250,8 @@ out:
 	return (int)ret;
 }
 
+#ifdef HAVE_ADS
+
 /**********************************************************************
  Adds a single service principal, i.e. 'host' to the system keytab
 ***********************************************************************/
@@ -724,6 +726,8 @@ done:
 	return ret;
 }
 
+#endif /* HAVE_ADS */
+
 /**********************************************************************
  List system keytab.
 ***********************************************************************/
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 6c47c98..0287860 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/shmem.h"
+#include "system/filesys.h"
 #include "messages.h"
 #include "smbprofile.h"
 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index ca5c1bf..4b4b0a8 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2862,4 +2862,4 @@ int net_ads(struct net_context *c, int argc, const char **argv)
 	return net_ads_noads();
 }
 
-#endif	/* WITH_ADS */
+#endif	/* HAVE_ADS */
diff --git a/source3/wscript_build b/source3/wscript_build
index 0b924ca..b409394 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -829,8 +829,7 @@ bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
                    deps='cli-ldap-common krb5 gssapi gssapi_krb5 ldap lber',
                    private_library=True,
-                   vars=locals(),
-                   enabled=bld.env.HAVE_ADS)
+                   vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,


-- 
Samba Shared Repository