diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-30 23:20:22 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-07-01 23:20:40 +0200 |
| commit | 6d810eff81f6a0abb371b2661cb0711e46e1bf1d (patch) | |
| tree | ac4f30631d31f3042ec9c688a3ea142405a2529d | |
| parent | 56538be6af9d4d76bffe5f142ba6a62e978561da (diff) | |
| download | samba-6d810eff81f6a0abb371b2661cb0711e46e1bf1d.tar.gz samba-6d810eff81f6a0abb371b2661cb0711e46e1bf1d.tar.bz2 samba-6d810eff81f6a0abb371b2661cb0711e46e1bf1d.zip | |
s3-libads: move keytab macros out of ads.h.
Guenther
| -rw-r--r-- | source3/include/ads.h | 18 | ||||
| -rw-r--r-- | source3/include/smb.h | 12 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 9 |
3 files changed, 21 insertions, 18 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index e48e0a2650..784af848fa 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -8,24 +8,6 @@ #include "../libds/common/flags.h" -/* - * This should be under the HAVE_KRB5 flag but since they're used - * in lp_kerberos_method(), they ned to be always available - */ -#define KERBEROS_VERIFY_SECRETS 0 -#define KERBEROS_VERIFY_SYSTEM_KEYTAB 1 -#define KERBEROS_VERIFY_DEDICATED_KEYTAB 2 -#define KERBEROS_VERIFY_SECRETS_AND_KEYTAB 3 - -/* - * If you add any entries to the above, please modify the below expressions - * so they remain accurate. - */ -#define USE_KERBEROS_KEYTAB (KERBEROS_VERIFY_SECRETS != lp_kerberos_method()) -#define USE_SYSTEM_KEYTAB \ - ((KERBEROS_VERIFY_SECRETS_AND_KEYTAB == lp_kerberos_method()) || \ - (KERBEROS_VERIFY_SYSTEM_KEYTAB == lp_kerberos_method())) - #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") diff --git a/source3/include/smb.h b/source3/include/smb.h index defecd7c88..b042de927c 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1551,6 +1551,18 @@ enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS}; /* LDAP PASSWD SYNC methods */ enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PASSWD_SYNC_ONLY}; +/* + * This should be under the HAVE_KRB5 flag but since they're used + * in lp_kerberos_method(), they ned to be always available + * If you add any entries to KERBEROS_VERIFY defines, please modify USE.*KEYTAB macros + * so they remain accurate. + */ + +#define KERBEROS_VERIFY_SECRETS 0 +#define KERBEROS_VERIFY_SYSTEM_KEYTAB 1 +#define KERBEROS_VERIFY_DEDICATED_KEYTAB 2 +#define KERBEROS_VERIFY_SECRETS_AND_KEYTAB 3 + /* Remote architectures we know about. */ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA, diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 20283e7177..e5af20bac3 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -204,6 +204,15 @@ copy an IP address from one buffer to another #define IS_DC (lp_server_role()==ROLE_DOMAIN_PDC || lp_server_role()==ROLE_DOMAIN_BDC) +/* + * If you add any entries to KERBEROS_VERIFY defines, please modify the below expressions + * so they remain accurate. + */ +#define USE_KERBEROS_KEYTAB (KERBEROS_VERIFY_SECRETS != lp_kerberos_method()) +#define USE_SYSTEM_KEYTAB \ + ((KERBEROS_VERIFY_SECRETS_AND_KEYTAB == lp_kerberos_method()) || \ + (KERBEROS_VERIFY_SYSTEM_KEYTAB == lp_kerberos_method())) + /***************************************************************************** Safe allocation macros. *****************************************************************************/ |