diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-10-21 00:11:22 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-10-21 00:11:22 +0000 |
| commit | cbe31055f8deb5844b34e8f1b32e27c830d134ed (patch) | |
| tree | 8a9af94d6ce35e9145256f0b7d094e7f540ed94e | |
| parent | b7331220c65747c6d7de2b05372839c20f712439 (diff) | |
| download | samba-cbe31055f8deb5844b34e8f1b32e27c830d134ed.tar.gz samba-cbe31055f8deb5844b34e8f1b32e27c830d134ed.tar.bz2 samba-cbe31055f8deb5844b34e8f1b32e27c830d134ed.zip | |
support both old and new kerberos OIDs
(This used to be commit eac164c7e650a8f855e7b662b126a5dfc5516927)
| -rw-r--r-- | source3/libsmb/cliconnect.c | 3 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 4fba54900d..e24f081c69 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -528,7 +528,8 @@ static BOOL cli_session_setup_spnego(struct cli_state *cli, char *user, /* make sure the server understands kerberos */ for (i=0;OIDs[i];i++) { DEBUG(3,("got OID=%s\n", OIDs[i])); - if (strcmp(OIDs[i], OID_KERBEROS5_OLD) == 0) { + if (strcmp(OIDs[i], OID_KERBEROS5_OLD) == 0 || + strcmp(OIDs[i], OID_KERBEROS5) == 0) { got_kerberos_mechanism = True; } free(OIDs[i]); diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 2eea6fa281..6926e50402 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -164,7 +164,7 @@ static int negprot_spnego(char *p, uint8 cryptkey[8]) extern pstring global_myname; uint8 guid[16]; const char *OIDs[] = {OID_NTLMSSP, - OID_KERBEROS5_OLD, + OID_KERBEROS5, NULL}; char *principle; int len; |