author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
Tue, 22 Dec 2015 04:53:40 -0800 | |
changeset 5222 | 8298df727253 |
parent 4433 | components/samba/samba/patches/MITkrb5-Solaris.patch@d35242d8330c |
child 6096 | d24ce417bac1 |
permissions | -rw-r--r-- |
4433
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
1 |
Source: Home brewed |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
2 |
Fixes issues with differences of Solaris krb5 and MIT krb5 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
3 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
4 |
--- a/wscript_configure_system_mitkrb5 2013-06-13 09:21:03.000000000 +0000 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
5 |
+++ samba-4.1.12/wscript_configure_system_mitkrb5 2015-01-09 00:06:46.004441833 +0000 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
6 |
@@ -30,6 +30,8 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
7 |
krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI']) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
8 |
if 'gssapi_krb5' in conf.env['LIB_GSSAPI']: |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
9 |
krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI']) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
10 |
+ if 'gss' in conf.env['LIB_GSSAPI']: |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
11 |
+ krb5_define_syslib(conf, "gss", conf.env['LIB_GSSAPI']) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
12 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
13 |
vendor = conf.cmd_and_log("%(path)s --vendor" % dict(path=conf.env.KRB5_CONFIG), dict()) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
14 |
conf.env.KRB5_VENDOR = vendor.strip().lower() |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
15 |
@@ -52,10 +53,10 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
16 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
17 |
conf.check_cfg(args="--cflags --libs", package="com_err", uselib_store="com_err") |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
18 |
conf.CHECK_FUNCS_IN('_et_list', 'com_err') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
19 |
-conf.CHECK_HEADERS('com_err.h', lib='com_err') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
20 |
+conf.CHECK_HEADERS('com_err.h', lib='com_err krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
21 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
22 |
conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
23 |
-conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h', lib='gssapi') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
24 |
+conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h', lib='gssapi krb5') |
264
84a67a54e8fd
7044174 Move samba(s) and its dependencies to Userland.
Jiri Sasek <jurasek@opensolaris.org>
parents:
diff
changeset
|
25 |
|
4433
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
26 |
conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
27 |
conf.CHECK_FUNCS_IN('des_set_key','crypto') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
28 |
@@ -80,7 +81,7 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
29 |
gsskrb5_extract_authz_data_from_sec_context |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
30 |
gss_krb5_export_lucid_sec_context |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
31 |
gss_import_cred gss_export_cred |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
32 |
- ''', 'gssapi gssapi_krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
33 |
+ ''', 'gssapi gssapi_krb5 krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
34 |
conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
35 |
conf.CHECK_FUNCS(''' |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
36 |
krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
37 |
@@ -108,25 +109,25 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
38 |
conf.CHECK_DECLS('''krb5_get_credentials_for_user |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
39 |
krb5_auth_con_set_req_cksumtype''', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
40 |
headers='krb5.h', always=True) |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
41 |
-conf.CHECK_VARIABLE('AP_OPTS_USE_SUBKEY', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
42 |
-conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
43 |
-conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
44 |
-conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
45 |
-conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
46 |
-conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
47 |
+conf.CHECK_VARIABLE('AP_OPTS_USE_SUBKEY', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
48 |
+conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
49 |
+conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
50 |
+conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
51 |
+conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
52 |
+conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
53 |
conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
54 |
-conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
55 |
+conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h', lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
56 |
define='HAVE_KRB5_KEYTAB_ENTRY_KEY') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
57 |
-conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
58 |
+conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h', lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
59 |
define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
60 |
-conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
61 |
+conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h', lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
62 |
define='HAVE_MAGIC_IN_KRB5_ADDRESS') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
63 |
-conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
64 |
+conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h', lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
65 |
define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
66 |
-conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
67 |
+conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h', lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
68 |
define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ') |
628
c3c0c8f3f696
7119845 Samba 3.5.10 can not use the system kerberos keytab.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
264
diff
changeset
|
69 |
|
4433
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
70 |
-conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
71 |
+conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h', lib='krb5') |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
72 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
73 |
conf.CHECK_CODE(''' |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
74 |
krb5_context ctx; |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
75 |
@@ -134,7 +135,7 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
76 |
krb5_get_init_creds_opt_free(ctx, opt); |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
77 |
''', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
78 |
'KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
79 |
- headers='krb5.h', link=False, |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
80 |
+ headers='krb5.h', lib='krb5', link=False, |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
81 |
msg="Checking whether krb5_get_init_creds_opt_free takes a context argument") |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
82 |
conf.CHECK_CODE(''' |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
83 |
const krb5_data *pkdata; |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
84 |
@@ -245,7 +246,7 @@ |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
85 |
conf.CHECK_CODE('''#define KRB5_DEPRECATED 1 |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
86 |
#include <krb5.h>''', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
87 |
'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False, |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
88 |
- link=False, |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
89 |
+ link=False, lib='krb5', |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
90 |
msg="Checking for KRB5_DEPRECATED define taking an identifier") |
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
91 |
|
d35242d8330c
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
4377
diff
changeset
|
92 |
conf.CHECK_CODE(''' |