s3: move some stuff out of smb.h to better locations.

Guenther

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index b07c1178536dfc5d4ee11f57741ef5212b9e9d12..ac6dd21ace94a3c620b5f60399cbe911fdc34dbe 100644 (file)
--- 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 3e19eb272664fe32b5ceb654eae4012c804f22e7..f99bf5997921ee4012f2479c0f4bbd57eb756aa5 100644 (file)
--- 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 8541af4c7d3242904874262c8549120aa2a0867b..781dbe64afec857a49189a5f2584d291a96fb951 100644 (file)
--- 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 64452d53a2aa9beac05e83e42a6e61f60c2cfcee..0da495dbb976f89d8163dd0abb94d033506a924e 100644 (file)
--- 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,