[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  263642b dynconfig: Add extern to header, try to unbreak imini buildfarm host.
       via  564830e talloc: Typo fix for api docs
       via  640028d nsswitch Add talloc depencency for nsstest
       via  0a47587 s4-heimdal_build Remove talloc dep for krb5-glue.c
       via  184098d s4-heimdal_build Remove talloc dependency from hdb-glue.c
      from  ddbbc7b s3:net_rpc_vampire_keytab: don't return -1 on success (bug #7899)

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


- Log -----------------------------------------------------------------
commit 263642b536ee25af89f9ed836e2bad6b92d3bed0
Author: Brad Hards <bradh at frogmouth.net>
Date:   Tue Jan 4 09:14:46 2011 +1100

    dynconfig: Add extern to header, try to unbreak imini buildfarm host.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Tue Jan  4 05:39:57 CET 2011 on sn-devel-104

commit 564830ef909b62be064590b865bde5d41a7ceac3
Author: Brad Hards <bradh at frogmouth.net>
Date:   Tue Jan 4 08:42:20 2011 +1100

    talloc: Typo fix for api docs

commit 640028d158583825ea5ffd1266f099cf8776db5d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jan 4 14:41:38 2011 +1100

    nsswitch Add talloc depencency for nsstest
    
    nsstest does not use talloc, but it includes talloc.h via includes.h,
    and so without this it cannot find the right internal header.
    
    This wasn't noticed before, as most linux developer boxes have a talloc.h.
    
    The issue was reported by Adam Tauno Williams <awilliam at whitemice.org>
    
    Andrew Bartlett

commit 0a4758770c4cc7670ef19f876ae06b84710fd724
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jan 4 14:40:21 2011 +1100

    s4-heimdal_build Remove talloc dep for krb5-glue.c
    
    This glue does not require any internal Samba functionality, just the
    same heimdal headers as the files it is providing a stub replacement for.
    
    Andrew Bartlett

commit 184098d4848e55f56262be0b5a0dc4d4f413f5f1
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jan 4 14:34:27 2011 +1100

    s4-heimdal_build Remove talloc dependency from hdb-glue.c
    
    This file can compile with just heimdal headers.
    
    Andrew Bartlett

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

Summary of changes:
 lib/talloc/talloc.h               |    2 +-
 nsswitch/wscript_build            |    2 +-
 source4/dynconfig/dynconfig.h     |    2 +-
 source4/heimdal_build/hdb-glue.c  |    6 ------
 source4/heimdal_build/krb5-glue.c |    6 ------
 5 files changed, 3 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index bc5b0fa..5710861 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -1085,7 +1085,7 @@ void *talloc_reparent(const void *old_parent, const void *new_parent, const void
  * @endcode
  *
  * @see talloc()
- * @see talloc_array_zero()
+ * @see talloc_zero_array()
  */
 void *talloc_array(const void *ctx, #type, unsigned count);
 #else
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index a9881bd..d40e143 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('winbind-client',
 
 bld.SAMBA_BINARY('nsstest',
 	source='nsstest.c',
-	deps='replace'
+	deps='replace talloc'
 	)
 
 
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 43a373d..d353efe 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -25,7 +25,7 @@
  **/
 
 #define DEFINE_DYN_CONFIG_PROTO(name)			\
-const char *dyn_##name;		 			\
+extern const char *dyn_##name;		 			\
 const char *get_dyn_##name(void);			\
 const char *set_dyn_##name(const char *newpath);	\
 bool is_default_dyn_##name(void);
diff --git a/source4/heimdal_build/hdb-glue.c b/source4/heimdal_build/hdb-glue.c
index c25a2f9..0a5289b 100644
--- a/source4/heimdal_build/hdb-glue.c
+++ b/source4/heimdal_build/hdb-glue.c
@@ -19,12 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "system/network.h"
-#include "system/kerberos.h"
-#include "lib/socket/netif.h"
-#include "param/param.h"
-
 #include "heimdal/lib/hdb/hdb_locl.h"
 
 krb5_error_code
diff --git a/source4/heimdal_build/krb5-glue.c b/source4/heimdal_build/krb5-glue.c
index 8a09a91..66320dc 100644
--- a/source4/heimdal_build/krb5-glue.c
+++ b/source4/heimdal_build/krb5-glue.c
@@ -19,12 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "system/network.h"
-#include "system/kerberos.h"
-#include "lib/socket/netif.h"
-#include "param/param.h"
-
 #include "heimdal/lib/krb5/krb5_locl.h"
 
 const krb5_cc_ops krb5_scc_ops = {


-- 
Samba Shared Repository