1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00

198 Commits

Author SHA1 Message Date
Stefan Metzmacher
69d074af81 gsskrb5: always return an acceptor subkey
For non cfx keys it's the same as the intiator subkey.
This matches windows behavior.

metze
(This used to be commit 6a8b07c39558f240b89e833ecba15d8b9fc020e8)
2008-08-14 13:13:52 +02:00
Stefan Metzmacher
5569132f45 gsskrb5: try to be compatible with windows for gss_wrap* and cfx
The good thing is that windows and heimdal both use EC=0
in the non DCE_STYLE case, so we need the windows compat hack
only in DCE_STYLE mode.

metze
(This used to be commit 0fa41a94e466d5e11bcf362ccd8ff41b72733d1a)
2008-08-08 15:29:17 +02:00
Stefan Metzmacher
610b1ada15 krb5: always generate the acceptor subkey as the same enctype as the used service key
With this patch samba4 can use gsskrb5_get_subkey() to get the session key.

metze
(This used to be commit dbb94133e0313cae933d261af0bf1210807a6d11)
2008-08-08 15:29:16 +02:00
Stefan Metzmacher
4ad02f5185 gsskrb5: add support for DCE_STYLE and des and des3 keys
Only the des keys are tested as windows doesn't support des3

metze
(This used to be commit 86848dd0f217774faed81af8fbf68618013e20a1)
2008-08-08 12:52:14 +02:00
Stefan Metzmacher
86c9db8d4a heimdal: add missing files
metze
(This used to be commit b395cd7acdb3ca5b25368fbbad0606efe4699d04)
2008-08-01 17:49:45 +02:00
Stefan Metzmacher
9f5325ce39 heimdal: add missing file heimdal/lib/gssapi/mech/gss_pseudo_random.c
metze
(This used to be commit 3bd7e68a5cfe80733782367e327b570d04b21586)
2008-08-01 17:27:18 +02:00
Stefan Metzmacher
a925f039ee heimdal: update to lorikeet-heimdal rev 801
metze
(This used to be commit d6c54a66fb23c784ef221a3c1cf766b72bdb5a0b)
2008-08-01 16:11:00 +02:00
Stefan Metzmacher
3678411037 gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given
metze
(This used to be commit f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349)
2008-06-27 12:43:04 +02:00
Stefan Metzmacher
eb192abd3a gsskrb5: fix gss_krb5_cred_no_ci_flags_x_oid_desc variable name
metze
(This used to be commit d88be1a1cb543b4e2cc5d15262da786558aa276d)
2008-06-27 12:43:04 +02:00
Stefan Metzmacher
b3ec55b984 krb5_init_sec_context: skip the token header when GSS_C_DCE_STYLE is specified
Windows (and heimdal) accepts packets with token header
in the server, but it doesn't match the windows client.
We now match the windows client and that fixes
also the display in wireshark.

metze
(This used to be commit 58f66184f0f732a78e86bbb0f3c29e920f086d08)
2008-06-02 16:58:04 +02:00
Andrew Bartlett
aaf62085dd Merge branch 'v4-0-logon' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 8252b51850f108aa8f43ec25c752a411c32f9764)
2008-03-19 11:04:42 +11:00
Andrew Bartlett
9e6b0c2871 Merge lorikeet-heimdal -r 787 into Samba4 tree.
Andrew Bartlett
(This used to be commit d88b530522d3cef67c24422bd5182fb875d87ee2)
2008-03-19 10:17:42 +11:00
Andrew Kroeger
a550317253 heimdal: Add parameter to windc_plugin to allow extended return codes.
These changes add a krb5_data parameter named e_data to the windc_plugin to
allow the samba KDC to return extended error information in addition to the
standard KRB5KDC_ERR_* codes.  Windows uses the extended information to provide
detailed information in user dialogs (e.g. account disabled, logon hours
restriction, must change password, etc.).

This particular commit modifies only heimdal code.  Hopefully this can be
submitted and accepted into the upstream heimdal codebase.
(This used to be commit f542362be25e7182a0836de7a0163f6b9fce9408)
2008-03-13 01:16:49 -05:00
Jelmer Vernooij
236a780baa idl: Use typedef rather than declare.
(This used to be commit 3fd750bd54f150ff62fd8165406bd26d03d624cf)
2008-01-12 01:18:53 +01:00
Jelmer Vernooij
0500b87092 r26540: Revert my previous commit after concerns raised by Andrew.
(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)
2007-12-21 05:52:06 +01:00
Jelmer Vernooij
3e75f222bc r26539: Remove unnecessary statics.
(This used to be commit e53e79eebef3ece6978f0a2b4a1ee0a0814bb5d2)
2007-12-21 05:52:05 +01:00
Jelmer Vernooij
d378cf4c15 r26310: Remove more uses of global_loadparm.
(This used to be commit 9d806da113b5f0688b6193dfdee9b8765e18b38f)
2007-12-21 05:48:22 +01:00
Stefan Metzmacher
9fe133ffc6 r25738: always include config.h first.
this needs merging to heimdal and lorikeet-heimdal

metze
(This used to be commit c2c2c991c7f568af833f10d8cf0946d90b097fab)
2007-12-21 05:43:36 +01:00
Stefan Metzmacher
5d482b634d r25734: regenerate yacc output (parse.[ch] files)
metze
(This used to be commit cb3aec0d22e87086d8f922b7d8f0a2530842053f)
2007-12-21 05:43:34 +01:00
Stefan Metzmacher
12215fadf8 r25732: import updated parse.y files from lorikeet-heimdal
I wonder why they're not updated as the parse.[ch]
are generated from the new versions already...

metze
(This used to be commit 9735715a0f2c8ea0c6ff5ba5adde6b6a6fb43aed)
2007-12-21 05:43:32 +01:00
Stefan Metzmacher
733591c079 r25298: regenerate lex.c files with config.h as first include
this should help on aix 5.3.

metze
(This used to be commit bfd8c275bb90b2709753ef3177c8ab24f91c75c0)
2007-10-10 15:07:08 -05:00
Andrew Bartlett
b39330c487 r24614: Merge with current lorikeet-heimdal. This brings us one step closer
to an alpha release.

Andrew Bartlett
(This used to be commit 30e02747d511630659c59eafec8d28f58605943b)
2007-10-10 15:02:25 -05:00
Stefan Metzmacher
c1010f666c r23895: reapply rev 23493:
regenerate lex.c files with flex 2.5.33
this makes sure we include config.h as first header

hopefully fixes the build on SerNet-aix

abartlet: please don't revert that again with your next
          heimdal merge...:-)

metze
(This used to be commit 8da4e9a9ac0fb09a7b84de87e1671a8689e20fcb)
2007-10-10 15:01:08 -05:00
Andrew Tridgell
e1c15c74af r23799: updated old Franklin Street FSF addresses to new URL
(This used to be commit db92b76a0034899f5f0dc2d012ee7709ff9a6132)
2007-10-10 14:59:16 -05:00
Andrew Bartlett
ec0035c9b8 r23678: Update to current lorikeet-heimdal (-r 767), which should fix the
panics on hosts without /dev/random.

Andrew Bartlett
(This used to be commit 14a4ddb131993fec72316f7e8e371638749e6f1f)
2007-10-10 14:58:59 -05:00
Stefan Metzmacher
f5c2f26e84 r23493: regenerate lex.c files with flex 2.5.33
this makes sure we include config.h as first header

hopefully fixes the build on SerNet-aix

metze
(This used to be commit 0149226ece306af4a65c27ce3fff2988232f4523)
2007-10-10 14:53:22 -05:00
Andrew Bartlett
91adebe749 r23456: Update Samba4 to current lorikeet-heimdal.
Andrew Bartlett
(This used to be commit ae0f81ab235c72cceb120bcdeb051a483cf3cc4f)
2007-10-10 14:53:18 -05:00
Stefan Metzmacher
4690d5c553 r23209: import getnameinfo.c, inet_ntop.c and inet_pton.c from
loikeet-heimdal

metze
(This used to be commit 48eb20199e7a01f4ab7f5194a5256ad7dd03ad86)
2007-10-10 14:53:04 -05:00
Andrew Tridgell
1a55a36401 r23060: use #include <roken.h> consistently. Using "roken.h" in this directory
breaks Samba builds on some systems as they find the wrong roken.h
(This used to be commit 59cd26b664af5edebc979d2bc746bf9621333130)
2007-10-10 14:52:46 -05:00
Andrew Bartlett
cc275f011e r22191: Add a samba4kinit binary to the build, so I can test using an existing
ccache, as well as PKINIT.

Andrew Bartlett
(This used to be commit 440b8d9e4b09d5e8c943504ade85c17f752fe705)
2007-10-10 14:50:02 -05:00
Andrew Bartlett
548ffe7cf6 r21746: We don't link in this file any more.
(This used to be commit 123ae858c77c2507bdac6a93be1e2932a3fd7375)
2007-10-10 14:49:23 -05:00
Andrew Tridgell
3bdf3aa144 r21620: commit updated versions (with correct paths)
(This used to be commit 2694bfb143eeb78a9a0b121dbc6a3e0a908ca06c)
2007-10-10 14:49:03 -05:00
Stefan Metzmacher
3db368ad76 r21448: return the same error codes as a windows KDC
metze
(This used to be commit e4d69b83dcee2f50e95690d84f95d9e69acf858e)
2007-10-10 14:48:37 -05:00
Stefan Metzmacher
544e17896e r21447: make handling of replying e_data more generic
love: please merge this

metze
(This used to be commit 3e4ff2de9c57170d275adf54ffa00ac81253a714)
2007-10-10 14:48:37 -05:00
Stefan Metzmacher
f280849a6f r21439: fix compiler warnings
metze
(This used to be commit ac347d7aa588574f6a18229083569608327874d8)
2007-10-10 14:48:35 -05:00
Stefan Metzmacher
837f283f81 r21438: create the PAC element in the same order as w2k3,
maybe there's some broken code in windows which relies
on this...

love: can you merge this to heimdal?

metze
(This used to be commit b64abf9113a939308dc9e92ff7ddaad7be6ab551)
2007-10-10 14:48:35 -05:00
Stefan Metzmacher
5cd79db03e r21436: Choose the TGT session key enctype also by checking what enctypes
the krbtgt hdb entry provides.

We need to make sure other KDC's with the same hdb backend data
can accept the TGT. (w2k and w2k3 don't support aes256-cts-hmac-sha1-96 (18)
session keys.)

Love: I'm not sure if this is the correct way of doing it...

metze
(This used to be commit 5840f50d8954e95a7071a90a1c4dcce9ae05d77c)
2007-10-10 14:48:34 -05:00
Andrew Bartlett
d5bbd817fe r20988: Call out to Heimdal's krb5.conf processing to configure many aspects
of KDC behaviour.  This should allow PKINIT to be turned on and
managed with reasonable sanity.

This also means that the krb5.conf in the same directory as the
smb.conf will always have priority in Samba4, which I think will be
useful.

Andrew Bartlett
(This used to be commit a50bbde81b010bc5d06e3fc3417ade44627eb771)
2007-10-10 14:44:18 -05:00
Jelmer Vernooij
c448896c7e r20786: Fix the build.
(This used to be commit 42bb335bd50a5070ee59c9d9748db8a9e9d6a9b0)
2007-10-10 14:40:55 -05:00
Andrew Tridgell
1c211a2e43 r20650: revert a bunch of code I didn't mean to commit yet
(This used to be commit b3e2d4908781781a487eaeb683d22eb967e5597d)
2007-10-10 14:37:26 -05:00
Andrew Bartlett
2ffd009a74 r20648: Closer to a build... Add missing header file.
(This used to be commit a4051a2d6537a536266ce7562cd6b833528dd263)
2007-10-10 14:37:24 -05:00
Andrew Tridgell
f6274959ba r20647: add cluster code
(This used to be commit 5870830b99a8d76bda1ff5af3fcf8dda9aba50ec)
2007-10-10 14:37:24 -05:00
Andrew Bartlett
2309c52444 r20643: Remove generated files accidentilly committed.
Andrew Bartlett
(This used to be commit 12953ee765de1beeab547cb30ab292b77501d9c9)
2007-10-10 14:37:23 -05:00
Andrew Bartlett
126b48e5ab r20642: This bit of autoconf causes us pain. Revert back to how we had things
before the last merge.

Andrew Bartlett
(This used to be commit 9e7124cc85ec9ed8291769689aa38ab14b3754d8)
2007-10-10 14:37:22 -05:00
Andrew Bartlett
f7242f6437 r20640: Commit part 2/2
Update Heimdal to match current lorikeet-heimdal.  This includes
integrated PAC hooks, so Samba doesn't have to handle this any more.

This also brings in the PKINIT code, hence so many new files.

Andrew Bartlett
(This used to be commit 351f7040f7bb73b9a60b22b564686f7c2f98a729)
2007-10-10 14:37:20 -05:00
Stefan Metzmacher
f2784a8bb0 r20139: only add GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG if the caller requested it!
this is needed to create plain, singed or sealed LDAP connections.

this should go into lorikeet and main heimdal...

metze
(This used to be commit 75c037cae21714e394a63f2506387e1049eb4406)
2007-10-10 14:29:13 -05:00
Andrew Bartlett
5a6288f458 r19681: Update to current lorikeet-heimdal. I'm looking at using the realm
lookup plugin, the new PAC validation code as well as Heimdal's SPNEGO
implementation.

Andrew Bartlett
(This used to be commit 05421f45ed7811697ea491e26c9d991a7faa1a64)
2007-10-10 14:25:31 -05:00
Stefan Metzmacher
d822b963f9 r19663: merge changes from lorikeet heimdal:
support for netbios domain based realms

metze
(This used to be commit dcec6eebf1b474ae3055449efebf491b1106a458)
2007-10-10 14:25:26 -05:00
Andrew Bartlett
e5974a1b5f r19650: Allow Samba to use Heimdal's SPNEGO code. Currently this can only
negotiate krb5, but if this works, I'll add NTLM as a GSSAPI backend
by some means or other.

Andrew Bartlett
(This used to be commit 476452e143f61a3878a3646864729daaddccdf68)
2007-10-10 14:25:25 -05:00
Andrew Bartlett
ed77e4e57b r19644: Merge up to current lorikeet-heimdal, incling adding
gsskrb5_set_default_realm(), which should fix mimir's issues.

Andrew Bartlett
(This used to be commit 8117e76d2adee163925a29df872015ff5021a1d3)
2007-10-10 14:25:24 -05:00