s3-libads: move spnego defines to their appropriate header file.

Guenther

diff --git a/libcli/auth/spnego.h b/libcli/auth/spnego.h
index 4b60f22d32d09291c00f54559659caf81e901202..6aed76549249cd355bc69d4741b151cd792c5670 100644 (file)
--- a/libcli/auth/spnego.h
+++ b/libcli/auth/spnego.h
@@ -33,6 +33,12 @@
 #define SPNEGO_CONF_FLAG     0x20
 #define SPNEGO_INTEG_FLAG    0x40
 
+#define TOK_ID_KRB_AP_REQ      ((const uint8_t *)"\x01\x00")
+#define TOK_ID_KRB_AP_REP      ((const uint8_t *)"\x02\x00")
+#define TOK_ID_KRB_ERROR       ((const uint8_t *)"\x03\x00")
+#define TOK_ID_GSS_GETMIC      ((const uint8_t *)"\x01\x01")
+#define TOK_ID_GSS_WRAP                ((const uint8_t *)"\x02\x01")
+
 enum spnego_negResult {
        SPNEGO_ACCEPT_COMPLETED = 0,
        SPNEGO_ACCEPT_INCOMPLETE = 1,

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 06a48f969110079a4b30b8910782af683d9c75cb..756612be3a843be8770eff5cfa9e7d5c09d3d452 100644 (file)
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,12 +6,6 @@
   basically this is a wrapper around ldap
 */
 
-#define TOK_ID_KRB_AP_REQ      ((const uint8_t *)"\x01\x00")
-#define TOK_ID_KRB_AP_REP      ((const uint8_t *)"\x02\x00")
-#define TOK_ID_KRB_ERROR       ((const uint8_t *)"\x03\x00")
-#define TOK_ID_GSS_GETMIC      ((const uint8_t *)"\x01\x01")
-#define TOK_ID_GSS_WRAP                ((const uint8_t *)"\x02\x01")
-
 enum wb_posix_mapping {
        WB_POSIX_MAP_UNKNOWN    = -1,
        WB_POSIX_MAP_TEMPLATE   = 0,