Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
	librpc/ndr.pc.in

7 files changed, 21 insertions, 3 deletions

diff --git a/source4/heimdal/lib/hcrypto/camellia-ntt.c b/source4/heimdal/lib/hcrypto/camellia-ntt.c
index 70b0268833..358221162f 100644
--- a/source4/heimdal/lib/hcrypto/camellia-ntt.c
+++ b/source4/heimdal/lib/hcrypto/camellia-ntt.c
@@ -23,6 +23,11 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <roken.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/camellia.c b/source4/heimdal/lib/hcrypto/camellia.c
index 00635c9fed..d78bbd4c0e 100644
--- a/source4/heimdal/lib/hcrypto/camellia.c
+++ b/source4/heimdal/lib/hcrypto/camellia.c
@@ -37,6 +37,8 @@
 RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
 #endif
 
+#include <roken.h>
+
 #ifdef KRB5
 #include <krb5-types.h>
 #endif
diff --git a/source4/heimdal/lib/hdb/hdb.c b/source4/heimdal/lib/hdb/hdb.c
index 15a1024267..ad2c35a43a 100644
--- a/source4/heimdal/lib/hdb/hdb.c
+++ b/source4/heimdal/lib/hdb/hdb.c
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "krb5.h"
 #include "krb5_locl.h"
 #include "hdb_locl.h"
diff --git a/source4/heimdal/lib/krb5/error_string.c b/source4/heimdal/lib/krb5/error_string.c
index db2df4798c..6374fa17ae 100644
--- a/source4/heimdal/lib/krb5/error_string.c
+++ b/source4/heimdal/lib/krb5/error_string.c
@@ -271,7 +271,7 @@ void KRB5_LIB_FUNCTION
 krb5_clear_error_string(krb5_context context)
      __attribute__((deprecated))
 {
-    return krb5_clear_error_message(context);
+    krb5_clear_error_message(context);
 }
 
 #endif /* !HEIMDAL_SMALLER */
diff --git a/source4/heimdal/lib/krb5/get_addrs.c b/source4/heimdal/lib/krb5/get_addrs.c
index fb45d08d29..ce16785319 100644
--- a/source4/heimdal/lib/krb5/get_addrs.c
+++ b/source4/heimdal/lib/krb5/get_addrs.c
@@ -43,7 +43,9 @@ struct mbuf;
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_IFADDR_H
 #include <ifaddrs.h>
+#endif
 
 static krb5_error_code
 gethostname_fallback (krb5_context context, krb5_addresses *res)
diff --git a/source4/heimdal/lib/roken/getarg.c b/source4/heimdal/lib/roken/getarg.c
index 3884fa83d6..3168ccc53d 100644
--- a/source4/heimdal/lib/roken/getarg.c
+++ b/source4/heimdal/lib/roken/getarg.c
@@ -216,8 +216,8 @@ arg_printusage (struct getargs *args,
 		const char *progname,
 		const char *extra_string)
 {
-    return arg_printusage_i18n(args, num_args, "Usage",
-			       progname, extra_string, builtin_i18n);
+    arg_printusage_i18n(args, num_args, "Usage",
+			progname, extra_string, builtin_i18n);
 }
 
 void ROKEN_LIB_FUNCTION
@@ -478,6 +478,9 @@ arg_match_long(struct getargs *args, size_t num_args,
     default:
 	abort ();
     }
+
+    /* not reached */
+    return ARG_ERR_NO_MATCH;
 }
 
 static int
diff --git a/source4/heimdal/lib/roken/vis.hin b/source4/heimdal/lib/roken/vis.hin
index 64274526e4..06a250c6d8 100644
--- a/source4/heimdal/lib/roken/vis.hin
+++ b/source4/heimdal/lib/roken/vis.hin
@@ -80,7 +80,9 @@
  */
 #define	UNVIS_END	1	/* no more characters */
 
+#ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
+#endif
 
 __BEGIN_DECLS
 char * ROKEN_LIB_FUNCTION