Ignore:
Timestamp:
Jan 15, 2010, 8:23:30 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

Update Samba 3.3 to 3.3.10 (source)

Location:
branches/samba-3.3.x/source/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/samba-3.3.x/source/include/ads.h

    r206 r370  
    340340#define KRB5_ENV_CCNAME "KRB5CCNAME"
    341341
    342 /* Heimdal uses a slightly different name */
    343 #if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
    344 #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
    345 #endif
    346 
    347 /* The older versions of heimdal that don't have this
    348    define don't seem to use it anyway.  I'm told they
    349    always use a subkey */
    350 #ifndef HAVE_AP_OPTS_USE_SUBKEY
    351 #define AP_OPTS_USE_SUBKEY 0
    352 #endif
    353 
    354342#define WELL_KNOWN_GUID_COMPUTERS       "AA312825768811D1ADED00C04FD8D5CD"
    355343#define WELL_KNOWN_GUID_USERS           "A9D1CA15768811D1ADED00C04FD8D5CD"
    356 
    357 #ifndef KRB5_ADDR_NETBIOS
    358 #define KRB5_ADDR_NETBIOS 0x14
    359 #endif
    360 
    361 #ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG
    362 #define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L)
    363 #endif
    364 
    365 #ifdef HAVE_KRB5
    366 typedef struct {
    367         NTSTATUS ntstatus;
    368         uint32 unknown1;
    369         uint32 unknown2; /* 0x00000001 */
    370 } KRB5_EDATA_NTSTATUS;
    371 
    372 typedef struct {
    373 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
    374         krb5_address **addrs;
    375 #elif defined(HAVE_KRB5_ADDRESSES) /* Heimdal */
    376         krb5_addresses *addrs;
    377 #else
    378 #error UNKNOWN_KRB5_ADDRESS_TYPE
    379 #endif /* defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) */
    380 } smb_krb5_addresses;
    381 
    382 #ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */
    383 #define KRB5_KEY_TYPE(k)        ((k)->keytype)
    384 #define KRB5_KEY_LENGTH(k)      ((k)->keyvalue.length)
    385 #define KRB5_KEY_DATA(k)        ((k)->keyvalue.data)
    386 #define KRB5_KEY_DATA_CAST      void
    387 #else /* MIT */
    388 #define KRB5_KEY_TYPE(k)        ((k)->enctype)
    389 #define KRB5_KEY_LENGTH(k)      ((k)->length)
    390 #define KRB5_KEY_DATA(k)        ((k)->contents)
    391 #define KRB5_KEY_DATA_CAST      krb5_octet
    392 #endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
    393 
    394 #ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY               /* MIT */
    395 #define KRB5_KT_KEY(k)          (&(k)->key)
    396 #elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK          /* Heimdal */
    397 #define KRB5_KT_KEY(k)          (&(k)->keyblock)
    398 #else
    399 #error krb5_keytab_entry has no key or keyblock member
    400 #endif /* HAVE_KRB5_KEYTAB_ENTRY_KEY */
    401 
    402 #endif /* HAVE_KRB5 */
    403344
    404345enum ads_extended_dn_flags {

  • branches/samba-3.3.x/source/include/config.h.in

    r274 r370  
    345345#undef HAVE_DECL_ASPRINTF
    346346
     347/* Define to 1 if you have the declaration of
     348   `krb5_auth_con_set_req_cksumtype', and to 0 if you don't. */
     349#undef HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
     350
    347351/* Define to 1 if you have the declaration of `rl_event_hook', and to 0 if you
    348352   don't. */
    … …  
    731735#undef HAVE_GLOB_H
    732736
    733 /* Whether GPFS GPL libs are available */
     737/* Whether GPFS GPL headers are available */
    734738#undef HAVE_GPFS
     739
     740/* Define to 1 if you have the <gpfs_gpl.h> header file. */
     741#undef HAVE_GPFS_GPL_H
    735742
    736743/* Define to 1 if you have the `grantpt' function. */
    … …  
    889896/* Define to 1 if you have the `krb5_decode_ap_req' function. */
    890897#undef HAVE_KRB5_DECODE_AP_REQ
     898
     899/* Whether to use deprecated krb5 interfaces */
     900#undef HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER
    891901
    892902/* Whether the type krb5_encrypt_block exists */

  • branches/samba-3.3.x/source/include/includes.h

    r223 r370  
    2121*/
    2222
    23 /* work around broken krb5.h on sles9 */
    24 #ifdef SIZEOF_LONG
    25 #undef SIZEOF_LONG
    26 #endif
    27 
    2823#include "lib/replace/replace.h"
    2924
    … …  
    164159#endif /* HAVE_NETGROUP */
    165160
    166 #if HAVE_KRB5_H
    167 #include <krb5.h>
    168 #else
     161#ifndef HAVE_KRB5_H
    169162#undef HAVE_KRB5
    170163#endif
    … …  
    687680#include "rpc_secdes.h"
    688681#include "gpo.h"
    689 #include "authdata.h"
    690682#include "msdfs.h"
    691683#include "rap.h"
    … …  
    11451137#endif
    11461138
    1147 #if defined(HAVE_KRB5)
    1148 
    1149 krb5_error_code smb_krb5_parse_name(krb5_context context,
    1150                                 const char *name, /* in unix charset */
    1151                                 krb5_principal *principal);
    1152 
    1153 krb5_error_code smb_krb5_unparse_name(krb5_context context,
    1154                                 krb5_const_principal principal,
    1155                                 char **unix_name);
    1156 
    1157 #ifndef HAVE_KRB5_SET_REAL_TIME
    1158 krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);
    1159 #endif
    1160 
    1161 krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
    1162 
    1163 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
    1164 krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock);
    1165 #endif
    1166 
    1167 #ifndef HAVE_KRB5_FREE_UNPARSED_NAME
    1168 void krb5_free_unparsed_name(krb5_context ctx, char *val);
    1169 #endif
    1170 
    1171 /* Stub out initialize_krb5_error_table since it is not present in all
    1172  * Kerberos implementations. If it's not present, it's not necessary to
    1173  * call it.
    1174  */
    1175 #ifndef HAVE_INITIALIZE_KRB5_ERROR_TABLE
    1176 #define initialize_krb5_error_table()
    1177 #endif
    1178 
    1179 /* Samba wrapper function for krb5 functionality. */
    1180 bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
    1181 int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt);
    1182 bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
    1183 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
    1184 krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
    1185 #if defined(HAVE_KRB5_LOCATE_KDC)
    1186 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
    1187 #endif
    1188 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
    1189 bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote);
    1190 krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
    1191 krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype);
    1192 void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
    1193 bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2);
    1194 void kerberos_free_data_contents(krb5_context context, krb5_data *pdata);
    1195 NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
    1196                          DATA_BLOB *pac_data_blob,
    1197                          krb5_context context,
    1198                          krb5_keyblock *service_keyblock,
    1199                          krb5_const_principal client_principal,
    1200                          time_t tgs_authtime,
    1201                          struct PAC_DATA **pac_data_out);
    1202 void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum,
    1203                                     struct PAC_SIGNATURE_DATA *sig);
    1204 krb5_error_code smb_krb5_verify_checksum(krb5_context context,
    1205                                          const krb5_keyblock *keyblock,
    1206                                          krb5_keyusage usage,
    1207                                          krb5_checksum *cksum,
    1208                                          uint8 *data,
    1209                                          size_t length);
    1210 time_t get_authtime_from_tkt(krb5_ticket *tkt);
    1211 void smb_krb5_free_ap_req(krb5_context context,
    1212                           krb5_ap_req *ap_req);
    1213 krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context,
    1214                                                  const krb5_data *inbuf,
    1215                                                  krb5_kvno *kvno,
    1216                                                  krb5_enctype *enctype);
    1217 krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context,
    1218                                                         krb5_auth_context *auth_context,
    1219                                                         const krb5_data *inbuf,
    1220                                                         krb5_const_principal server,
    1221                                                         krb5_keytab keytab,
    1222                                                         krb5_flags *ap_req_options,
    1223                                                         krb5_ticket **ticket,
    1224                                                         krb5_keyblock **keyblock);
    1225 krb5_error_code smb_krb5_parse_name_norealm(krb5_context context,
    1226                                             const char *name,
    1227                                             krb5_principal *principal);
    1228 bool smb_krb5_principal_compare_any_realm(krb5_context context,
    1229                                           krb5_const_principal princ1,
    1230                                           krb5_const_principal princ2);
    1231 int cli_krb5_get_ticket(const char *principal, time_t time_offset,
    1232                         DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire);
    1233 krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
    1234 krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
    1235 krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
    1236 krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
    1237 NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
    1238 krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
    1239 void smb_krb5_free_error(krb5_context context, krb5_error *krberror);
    1240 krb5_error_code handle_krberror_packet(krb5_context context,
    1241                                          krb5_data *packet);
    1242 
    1243 void smb_krb5_get_init_creds_opt_free(krb5_context context,
    1244                                     krb5_get_init_creds_opt *opt);
    1245 krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
    1246                                     krb5_get_init_creds_opt **opt);
    1247 krb5_error_code smb_krb5_mk_error(krb5_context context,
    1248                                         krb5_error_code error_code,
    1249                                         const krb5_principal server,
    1250                                         krb5_data *reply);
    1251 krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
    1252 krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
    1253                                             krb5_enctype enctype,
    1254                                             char **etype_s);
    1255 krb5_error_code smb_krb5_open_keytab(krb5_context context,
    1256                                       const char *keytab_name,
    1257                                       bool write_access,
    1258                                       krb5_keytab *keytab);
    1259 krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
    1260                                      krb5_context context,
    1261                                      krb5_keytab keytab,
    1262                                      const char **keytab_name);
    1263 int smb_krb5_kt_add_entry_ext(krb5_context context,
    1264                               krb5_keytab keytab,
    1265                               krb5_kvno kvno,
    1266                               const char *princ_s,
    1267                               krb5_enctype *enctypes,
    1268                               krb5_data password,
    1269                               bool no_salt,
    1270                               bool keep_old_entries);
    1271 
    1272 #endif /* HAVE_KRB5 */
    1273 
    1274 
    12751139#ifdef HAVE_LDAP
    12761140

  • branches/samba-3.3.x/source/include/smbldap.h

    r274 r370  
    213213                                       const char *attribute,
    214214                                       TALLOC_CTX *mem_ctx);
     215char * smbldap_talloc_first_attribute(LDAP *ldap_struct, LDAPMessage *entry,
     216                                      const char *attribute,
     217                                      TALLOC_CTX *mem_ctx);
    215218char * smbldap_talloc_smallest_attribute(LDAP *ldap_struct, LDAPMessage *entry,
    216219                                         const char *attribute,

  • branches/samba-3.3.x/source/include/version.h

    r353 r370  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 3
    4 #define SAMBA_VERSION_RELEASE 9
    5 #define SAMBA_VERSION_OFFICIAL_STRING "3.3.9"
    6 #define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.1beta4"
     4#define SAMBA_VERSION_RELEASE 10
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.3.10"
    76#define SAMBA_VERSION_STRING samba_version_string()
Note: See TracChangeset for help on using the changeset viewer.