Changeset 740 for vendor/current/source4/heimdal/lib/krb5/krb5_locl.h

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/heimdal/lib/krb5/krb5_locl.h (modified) (14 diffs)

vendor/current/source4/heimdal/lib/krb5/krb5_locl.h ¶

@@ -3 +3 @@
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
+ *
+ * Portions Copyright (c) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46 +48 @@
 #include <limits.h>
 
+#include <krb5-types.h>
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -114 +118 @@
 #include <sys/file.h>
 #endif
+
+#include <com_err.h>
+
+#include <heimbase.h>
 
 #define HEIMDAL_TEXTDOMAIN "heimdal_krb5"
@@ -152 +160 @@
 
 /* XXX glue for pkinit */
+struct hx509_certs_data;
 struct krb5_pk_identity;
 struct krb5_pk_cert;
@@ -170 +179 @@
 #include <hx509.h>
 #endif
+
+#include "crypto.h"
+
 #include <krb5-private.h>
 
@@ -176 +188 @@
 #define ALLOC(X, N) (X) = calloc((N), sizeof(*(X)))
 #define ALLOC_SEQ(X, N) do { (X)->len = (N); ALLOC((X)->val, (N)); } while(0)
+
+#ifndef PATH_SEP
+#define PATH_SEP ":"
+#endif
 
 /* should this be public? */
@@ -181 +197 @@
 #define KEYTAB_DEFAULT_MODIFY "FILE:" SYSCONFDIR "/krb5.keytab"
 
+
 #define MODULI_FILE SYSCONFDIR "/krb5.moduli"
 
@@ -196 +213 @@
 
 
-#define KRB5_BUFSIZ 1024
+#define KRB5_BUFSIZ 2048
 
 typedef enum {
@@ -217 +234 @@
 #define KRB5_INIT_CREDS_CANONICALIZE            1
 #define KRB5_INIT_CREDS_NO_C_CANON_CHECK        2
+#define KRB5_INIT_CREDS_NO_C_NO_EKU_CHECK       4
     struct {
         krb5_gic_process_last_req func;
@@ -235 +253 @@
     struct et_list *et_list;
     struct krb5_log_facility *warn_dest;
-    krb5_cc_ops *cc_ops;
+    struct krb5_log_facility *debug_dest;
+    const krb5_cc_ops **cc_ops;
     int num_cc_ops;
     const char *http_proxy;
@@ -264 +283 @@
 #define KRB5_CTX_F_CHECK_PAC                    2
 #define KRB5_CTX_F_HOMEDIR_ACCESS               4
+#define KRB5_CTX_F_SOCKETS_INITIALIZED          8
+#define KRB5_CTX_F_RD_REQ_IGNORE                16
     struct send_to_kdc *send_to_kdc;
+#ifdef PKINIT
+    hx509_context hx509ctx;
+#endif
 } krb5_context_data;
 
+#ifndef KRB5_USE_PATH_TOKENS
 #define KRB5_DEFAULT_CCNAME_FILE "FILE:/tmp/krb5cc_%{uid}"
+#else
+#define KRB5_DEFAULT_CCNAME_FILE "FILE:%{TEMP}/krb5cc_%{uid}"
+#endif
 #define KRB5_DEFAULT_CCNAME_API "API:"
-#define KRB5_DEFAULT_CCNAME_KCM "KCM:%{uid}"
+#define KRB5_DEFAULT_CCNAME_KCM_KCM "KCM:%{uid}"
+#define KRB5_DEFAULT_CCNAME_KCM_API "API:%{uid}"
 
 #define EXTRACT_TICKET_ALLOW_CNAME_MISMATCH             1
@@ -275 +304 @@
 #define EXTRACT_TICKET_MATCH_REALM                      4
 #define EXTRACT_TICKET_AS_REQ                           8
+#define EXTRACT_TICKET_TIMESYNC                         16
 
 /*
@@ -292 +322 @@
 #endif
 
+#ifndef KRB5_FORWARDABLE_DEFAULT
+#define KRB5_FORWARDABLE_DEFAULT TRUE
+#endif
+
 #ifdef PKINIT
 
 struct krb5_pk_identity {
-    hx509_context hx509ctx;
     hx509_verify_ctx verify_ctx;
     hx509_certs certs;
@@ -302 +335 @@
     hx509_certs certpool;
     hx509_revoke_ctx revokectx;
+    int flags;
+#define PKINIT_BTMM 1
 };