--- samba-3.6.22/source3/libads/dns.c	2012-04-27 18:25:33.000000000 +0000
+++ samba-3.6.22-mint/source3/libads/dns.c	2012-05-18 14:54:23.000000000 +0000
@@ -54,7 +54,9 @@
 #endif
 #endif
 
+#if !defined(T_SRV)
 #  define T_SRV 	ns_t_srv
+#endif
 #if !defined(T_NS)	/* AIX 5.3 already defines T_NS */
 #  define T_NS 		ns_t_ns
 #endif
--- samba-3.6.22/source3/smbd/signing.c	2012-04-27 18:25:33.000000000 +0000
+++ samba-3.6.22-mint/source3/smbd/signing.c	2012-05-20 21:32:39.000000000 +0000
@@ -101,7 +101,9 @@
 
 static int smbd_shm_signing_destructor(struct smbd_shm_signing *s)
 {
+#if HAVE_MMAP
 	anonymous_shared_free(s->shm_pointer);
+#endif
 	return 0;
 }
 
@@ -181,8 +183,10 @@
 			return false;
 		}
 		s->shm_size = 4096;
+#if HAVE_MMAP
 		s->shm_pointer =
 			(uint8_t *)anonymous_shared_allocate(s->shm_size);
+#endif
 		if (s->shm_pointer == NULL) {
 			talloc_free(s);
 			return false;
--- samba-3.6.22/lib/crypto/hmacsha256.c	2012-04-27 18:25:33.000000000 +0000
+++ samba-3.6.22-mint/lib/crypto/hmacsha256.c	2012-05-21 07:32:28.000000000 +0000
@@ -42,9 +42,9 @@
 	{
                 SHA256_CTX tctx;
 
-                SHA256_Init(&tctx);
-                SHA256_Update(&tctx, key, key_len);
-                SHA256_Final(tk, &tctx);
+                pSHA256_Init(&tctx);
+                pSHA256_Update(&tctx, key, key_len);
+                pSHA256_Final(tk, &tctx);
 
                 key = tk;
                 key_len = SHA256_DIGEST_LENGTH;
@@ -63,8 +63,8 @@
                 ctx->k_opad[i] ^= 0x5c;
         }
 
-        SHA256_Init(&ctx->ctx);
-        SHA256_Update(&ctx->ctx, ctx->k_ipad, 64);  
+        pSHA256_Init(&ctx->ctx);
+        pSHA256_Update(&ctx->ctx, ctx->k_ipad, 64);  
 }
 
 /***********************************************************************
@@ -72,7 +72,7 @@
 ***********************************************************************/
 _PUBLIC_ void hmac_sha256_update(const uint8_t *data, size_t data_len, struct HMACSHA256Context *ctx)
 {
-        SHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
+        pSHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
 }
 
 /***********************************************************************
@@ -82,10 +82,10 @@
 {
         SHA256_CTX ctx_o;
 
-        SHA256_Final(digest, &ctx->ctx);
+        pSHA256_Final(digest, &ctx->ctx);
 
-        SHA256_Init(&ctx_o);
-        SHA256_Update(&ctx_o, ctx->k_opad, 64);
-        SHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
-        SHA256_Final(digest, &ctx_o);
+        pSHA256_Init(&ctx_o);
+        pSHA256_Update(&ctx_o, ctx->k_opad, 64);
+        pSHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
+        pSHA256_Final(digest, &ctx_o);
 }
--- samba-3.6.22/lib/crypto/sha256.c	2012-04-27 18:25:33.000000000 +0000
+++ samba-3.6.22-mint/lib/crypto/sha256.c	2012-05-21 07:47:25.000000000 +0000
@@ -80,7 +80,7 @@
 };
 
 void
-SHA256_Init (SHA256_CTX *m)
+pSHA256_Init (SHA256_CTX *m)
 {
     m->sz[0] = 0;
     m->sz[1] = 0;
@@ -187,7 +187,7 @@
 };
 
 void
-SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
+pSHA256_Update (SHA256_CTX *m, const void *v, size_t len)
 {
     const unsigned char *p = (const unsigned char *)v;
     size_t old_sz = m->sz[0];
@@ -222,7 +222,7 @@
 }
 
 void
-SHA256_Final (void *res, SHA256_CTX *m)
+pSHA256_Final (void *res, SHA256_CTX *m)
 {
     unsigned char zeros[72];
     unsigned offset = (m->sz[0] / 8) % 64;
@@ -238,7 +238,7 @@
     zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
     zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
     zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;
-    SHA256_Update (m, zeros, dstart + 8);
+    pSHA256_Update (m, zeros, dstart + 8);
     {
 	int i;
 	unsigned char *r = (unsigned char*)res;
--- samba-3.6.22/source3/modules/vfs_acl_common.c	2013-12-13 08:30:45.000000000 +0000
+++ samba-3.6.22-mint/source3/modules/vfs_acl_common.c	2013-12-13 08:31:15.000000000 +0000
@@ -61,9 +61,9 @@
 		return status;
 	}
 
-	SHA256_Init(&tctx);
-	SHA256_Update(&tctx, blob.data, blob.length);
-	SHA256_Final(hash, &tctx);
+	pSHA256_Init(&tctx);
+	pSHA256_Update(&tctx, blob.data, blob.length);
+	pSHA256_Final(hash, &tctx);
 
 	return NT_STATUS_OK;
 }
--- samba-3.6.22/lib/util/util.c	2012-04-27 18:25:33.000000000 +0000
+++ samba-3.6.22-mint/lib/util/util.c	2012-05-18 08:48:28.000000000 +0000
@@ -982,6 +982,7 @@
 	return true;
 }
 
+#if HAVE_MMAP
 struct anonymous_shared_header {
 	union {
 		size_t length;
@@ -1049,6 +1050,7 @@
 
 	munmap(hdr, hdr->u.length);
 }
+#endif
 
 #ifdef DEVELOPER
 /* used when you want a debugger started at a particular point in the
--- samba-3.6.22/source3/configure.in	2013-11-29 13:43:05.000000000 +0000
+++ samba-3.6.22-mint/source3/configure.in	2013-11-29 13:43:41.000000000 +0000
@@ -1838,7 +1838,7 @@
 	DSO_EXPORTS=\$\(DSO_EXPORTS_CMD\)
 fi
 
-if test x"$BLDSHARED" = x"true" ; then
+if test x"$BLDSHARED" = x"false" ; then
 	LDFLAGS="$LDFLAGS -L./bin"
 fi
 
--- samba-3.6.5/source3/configure.old	2013-11-29 13:43:50.000000000 +0000
+++ samba-3.6.5-mint/source3/configure	2013-11-29 13:44:27.000000000 +0000
@@ -19541,7 +19541,7 @@
 	DSO_EXPORTS=\$\(DSO_EXPORTS_CMD\)
 fi
 
-if test x"$BLDSHARED" = x"true" ; then
+if test x"$BLDSHARED" = x"false" ; then
 	LDFLAGS="$LDFLAGS -L./bin"
 fi