Changeset 740 for vendor/current/source3/include/ads.h

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/include/ads.h (modified) (8 diffs)

vendor/current/source3/include/ads.h

@@ -7 +7 @@
 */
 
-#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")
-#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, 
-        WB_POSIX_MAP_SFU        = 1, 
-        WB_POSIX_MAP_SFU20      = 2, 
-        WB_POSIX_MAP_RFC2307    = 3,
-        WB_POSIX_MAP_UNIXINFO   = 4
-};
-
-/* there are 5 possible types of errors the ads subsystem can produce */
-enum ads_error_type {ENUM_ADS_ERROR_KRB5, ENUM_ADS_ERROR_GSS, 
-                     ENUM_ADS_ERROR_LDAP, ENUM_ADS_ERROR_SYSTEM, ENUM_ADS_ERROR_NT};
-
-typedef struct {
-        enum ads_error_type error_type;
-        union err_state{                
-                int rc;
-                NTSTATUS nt_status;
-        } err;
-        /* For error_type = ENUM_ADS_ERROR_GSS minor_status describe GSS API error */
-        /* Where rc represents major_status of GSS API error */
-        int minor_status;
-} ADS_STATUS;
+#include "libads/ads_status.h"
+#include "smb_ldap.h"
 
 struct ads_struct;
@@ -116 +69 @@
                 LDAP *ld;
                 struct sockaddr_storage ss; /* the ip of the active connection, if any */
-                time_t last_attempt; /* last attempt to reconnect */
+                time_t last_attempt; /* last attempt to reconnect, monotonic clock */
                 int port;
 
@@ -150 +103 @@
 } ADS_STRUCT;
 
-/* used to remember the names of the posix attributes in AD */
-/* see the rfc2307 & sfu nss backends */
-
-struct posix_schema {
-        char *posix_homedir_attr;
-        char *posix_shell_attr;
-        char *posix_uidnumber_attr;
-        char *posix_gidnumber_attr;
-        char *posix_gecos_attr;
-        char *posix_uid_attr;
-};
-
-
-
 #ifdef HAVE_ADS
 typedef LDAPMod **ADS_MODLIST;
@@ -169 +108 @@
 typedef void **ADS_MODLIST;
 #endif
-
-/* macros to simplify error returning */
-#define ADS_ERROR(rc) ADS_ERROR_LDAP(rc)
-#define ADS_ERROR_LDAP(rc) ads_build_error(ENUM_ADS_ERROR_LDAP, rc, 0)
-#define ADS_ERROR_SYSTEM(rc) ads_build_error(ENUM_ADS_ERROR_SYSTEM, rc?rc:EINVAL, 0)
-#define ADS_ERROR_KRB5(rc) ads_build_error(ENUM_ADS_ERROR_KRB5, rc, 0)
-#define ADS_ERROR_GSS(rc, minor) ads_build_error(ENUM_ADS_ERROR_GSS, rc, minor)
-#define ADS_ERROR_NT(rc) ads_build_nt_error(ENUM_ADS_ERROR_NT,rc)
-
-#define ADS_ERR_OK(status) ((status.error_type == ENUM_ADS_ERROR_NT) ? NT_STATUS_IS_OK(status.err.nt_status):(status.err.rc == 0))
-#define ADS_SUCCESS ADS_ERROR(0)
-
-#define ADS_ERROR_HAVE_NO_MEMORY(x) do { \
-        if (!(x)) {\
-                return ADS_ERROR(LDAP_NO_MEMORY);\
-        }\
-} while (0)
-
 
 /* time between reconnect attempts */
@@ -200 +121 @@
 #define ADS_SD_FLAGS_OID        "1.2.840.113556.1.4.801"
 
-/* ldap attribute oids (Services for Unix 3.0, 3.5) */
-#define ADS_ATTR_SFU_UIDNUMBER_OID      "1.2.840.113556.1.6.18.1.310"
-#define ADS_ATTR_SFU_GIDNUMBER_OID      "1.2.840.113556.1.6.18.1.311"
-#define ADS_ATTR_SFU_HOMEDIR_OID        "1.2.840.113556.1.6.18.1.344"
-#define ADS_ATTR_SFU_SHELL_OID          "1.2.840.113556.1.6.18.1.312"
-#define ADS_ATTR_SFU_GECOS_OID          "1.2.840.113556.1.6.18.1.337"
-#define ADS_ATTR_SFU_UID_OID            "1.2.840.113556.1.6.18.1.309"
-
-/* ldap attribute oids (Services for Unix 2.0) */
-#define ADS_ATTR_SFU20_UIDNUMBER_OID    "1.2.840.113556.1.4.7000.187.70"
-#define ADS_ATTR_SFU20_GIDNUMBER_OID    "1.2.840.113556.1.4.7000.187.71"
-#define ADS_ATTR_SFU20_HOMEDIR_OID      "1.2.840.113556.1.4.7000.187.106"
-#define ADS_ATTR_SFU20_SHELL_OID        "1.2.840.113556.1.4.7000.187.72"
-#define ADS_ATTR_SFU20_GECOS_OID        "1.2.840.113556.1.4.7000.187.97"
-#define ADS_ATTR_SFU20_UID_OID          "1.2.840.113556.1.4.7000.187.102"
-
-
-/* ldap attribute oids (RFC2307) */
-#define ADS_ATTR_RFC2307_UIDNUMBER_OID  "1.3.6.1.1.1.1.0"
-#define ADS_ATTR_RFC2307_GIDNUMBER_OID  "1.3.6.1.1.1.1.1"
-#define ADS_ATTR_RFC2307_HOMEDIR_OID    "1.3.6.1.1.1.1.3"
-#define ADS_ATTR_RFC2307_SHELL_OID      "1.3.6.1.1.1.1.4"
-#define ADS_ATTR_RFC2307_GECOS_OID      "1.3.6.1.1.1.1.2"
-#define ADS_ATTR_RFC2307_UID_OID        "0.9.2342.19200300.100.1.1"
-
 /* ldap bitwise searches */
 #define ADS_LDAP_MATCHING_RULE_BIT_AND  "1.2.840.113556.1.4.803"
@@ -230 +126 @@
 
 #define ADS_PINGS          0x0000FFFF  /* Ping response */
-#define ADS_DNS_CONTROLLER 0x20000000  /* DomainControllerName is a DNS name*/
-#define ADS_DNS_DOMAIN     0x40000000  /* DomainName is a DNS name */
-#define ADS_DNS_FOREST     0x80000000  /* DnsForestName is a DNS name */
 
 /* ads auth control flags */
@@ -244 +137 @@
 #define ADS_AUTH_SASL_FORCE       0x0080
 #define ADS_AUTH_USER_CREDS       0x0100
-
-/* Kerberos environment variable names */
-#define KRB5_ENV_CCNAME "KRB5CCNAME"
-
-#define WELL_KNOWN_GUID_COMPUTERS       "AA312825768811D1ADED00C04FD8D5CD" 
-#define WELL_KNOWN_GUID_USERS           "A9D1CA15768811D1ADED00C04FD8D5CD"
 
 enum ads_extended_dn_flags {
@@ -265 +152 @@
 } ads_control;
 
-#define ADS_IGNORE_PRINCIPAL "not_defined_in_RFC4178@please_ignore"
+#include "libads/ads_proto.h"
+
+#ifdef HAVE_LDAP
+#include "libads/ads_ldap_protos.h"
+#endif
+
+#include "libads/kerberos_proto.h"
 
 #endif  /* _INCLUDE_ADS_H_ */