From 65bb6b35241a29a514fef3be547398c9cd3c2e09 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 9 Feb 2011 20:56:57 +0100
Subject: s3: move some stuff out of smb.h to better locations.

Guenther
---
 source3/include/passdb.h   | 2 ++
 source3/include/smb.h      | 6 ------
 source3/libsmb/clirap.c    | 2 ++
 source3/libsmb/namequery.c | 3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index b07c117853..ac6dd21ace 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -117,6 +117,8 @@ struct login_cache {
 #define SAMU_BUFFER_V4		4
 #define SAMU_BUFFER_LATEST	SAMU_BUFFER_V4
 
+#define MAX_HOURS_LEN 32
+
 struct samu {
 	struct pdb_methods *methods;
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 3e19eb2726..f99bf59979 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -143,9 +143,6 @@ typedef union unid_t {
 } unid_t;
 
 /* pipe string names */
-#define PIPE_LANMAN   "\\PIPE\\LANMAN"
-
-#define MAX_HOURS_LEN 32
 
 #ifndef MAXSUBAUTHS
 #define MAXSUBAUTHS 15 /* max sub authorities in a SID */
@@ -1785,9 +1782,6 @@ struct ip_service {
 	unsigned port;
 };
 
-/* Special name type used to cause a _kerberos DNS lookup. */
-#define KDC_NAME_TYPE 0xDCDC
-
 struct ea_struct {
 	uint8 flags;
 	char *name;
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 8541af4c7d..781dbe64af 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -25,6 +25,8 @@
 #include "../lib/crypto/arcfour.h"
 #include "async_smb.h"
 
+#define PIPE_LANMAN   "\\PIPE\\LANMAN"
+
 /****************************************************************************
  Call a remote api
 ****************************************************************************/
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 64452d53a2..0da495dbb9 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1815,6 +1815,9 @@ static NTSTATUS resolve_hosts(const char *name, int name_type,
  Resolve via "ADS" method.
 *********************************************************/
 
+/* Special name type used to cause a _kerberos DNS lookup. */
+#define KDC_NAME_TYPE 0xDCDC
+
 static NTSTATUS resolve_ads(const char *name,
 			    int name_type,
 			    const char *sitename,
-- 
cgit