s3-passdb: move some passdb defines to passdb.h

Guenther

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index cae599bdf8c4d1cf2a24385f5d9844637593bb52..855d25308667f209cc023e293fe957703e537650 100644 (file)
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -40,6 +40,35 @@
 #define USER_RID_TYPE          0
 #define GROUP_RID_TYPE                 1
 
+/*
+ * Flags for local user manipulation.
+ */
+
+#define LOCAL_ADD_USER 0x1
+#define LOCAL_DELETE_USER 0x2
+#define LOCAL_DISABLE_USER 0x4
+#define LOCAL_ENABLE_USER 0x8
+#define LOCAL_TRUST_ACCOUNT 0x10
+#define LOCAL_SET_NO_PASSWORD 0x20
+#define LOCAL_SET_PASSWORD 0x40
+#define LOCAL_SET_LDAP_ADMIN_PW 0x80
+#define LOCAL_INTERDOM_ACCOUNT 0x100
+#define LOCAL_AM_ROOT 0x200  /* Act as root */
+
+/*
+ * Size of new password account encoding string.  This is enough space to
+ * hold 11 ACB characters, plus the surrounding [] and a terminating null.
+ * Do not change unless you are adding new ACB bits!
+ */
+
+#define NEW_PW_FORMAT_SPACE_PADDED_LEN 14
+
+/* Password history contants. */
+#define PW_HISTORY_SALT_LEN 16
+#define SALTED_MD5_HASH_LEN 16
+#define PW_HISTORY_ENTRY_LEN (PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN)
+#define MAX_PW_HISTORY_LEN 24
+
 /*
  * bit flags representing initialized fields in struct samu
  */

diff --git a/source3/include/smb.h b/source3/include/smb.h
index b7fe64984bb2ce9f8d633937bec9504ad2b25e4d..94274354833af1a11c91cbc63648aca629a78fb2 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -731,27 +731,6 @@ struct pipe_open_rec {
 #define NT_HASH_LEN 16
 #define LM_HASH_LEN 16
 
-/* Password history contants. */
-#define PW_HISTORY_SALT_LEN 16
-#define SALTED_MD5_HASH_LEN 16
-#define PW_HISTORY_ENTRY_LEN (PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN)
-#define MAX_PW_HISTORY_LEN 24
-
-/*
- * Flags for local user manipulation.
- */
-
-#define LOCAL_ADD_USER 0x1
-#define LOCAL_DELETE_USER 0x2
-#define LOCAL_DISABLE_USER 0x4
-#define LOCAL_ENABLE_USER 0x8
-#define LOCAL_TRUST_ACCOUNT 0x10
-#define LOCAL_SET_NO_PASSWORD 0x20
-#define LOCAL_SET_PASSWORD 0x40
-#define LOCAL_SET_LDAP_ADMIN_PW 0x80
-#define LOCAL_INTERDOM_ACCOUNT 0x100
-#define LOCAL_AM_ROOT 0x200  /* Act as root */
-
 /* key and data in the connections database - used in smbstatus and smbd */
 struct connections_key {
        struct server_id pid;
@@ -1651,14 +1630,6 @@ struct unix_error_map {
        NTSTATUS nt_error;
 };
 
-/*
- * Size of new password account encoding string.  This is enough space to
- * hold 11 ACB characters, plus the surrounding [] and a terminating null.
- * Do not change unless you are adding new ACB bits!
- */
-
-#define NEW_PW_FORMAT_SPACE_PADDED_LEN 14
-
 /*
    Do you want session setups at user level security with a invalid
    password to be rejected or allowed in as guest? WinNT rejects them