sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libreplace: include <krb5.h> and <com_err.h> and no heimdal specific headers

Browse Source 
metze
(This used to be commit cffed8e19e)
This commit is contained in:
Stefan Metzmacher 2008-08-01 19:30:16 +02:00
parent d0f0d5e691
commit 5fd1c5445b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/kdc/kpasswdd.c
View File

@ -38,9 +38,11 @@
#include "param/param.h"
#include "kdc/kdc.h"
/* TODO: remove this */
#include "heimdal/lib/krb5/krb5_locl.h"
/* TODO: remove all SAMBA4_INTERNAL_HEIMDAL stuff from this file */
#ifdef SAMBA4_INTERNAL_HEIMDAL
#include "heimdal/lib/hcrypto/aes.h"
#include "heimdal/lib/krb5/krb5-private.h"
#endif
/* hold information about one kdc socket */
struct kpasswd_socket {
@ -285,6 +287,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
reply);
}
if (chpw.targname && chpw.targrealm) {
#ifdef SAMBA4_INTERNAL_HEIMDAL
if (_krb5_principalname2krb5_principal(kdc->smb_krb5_context->krb5_context,
&principal, *chpw.targname,
*chpw.targrealm) != 0) {
@ -295,6 +298,12 @@ static bool kpasswd_process_request(struct kdc_server *kdc,
reply);
}
#else /* SAMBA4_INTERNAL_HEIMDAL */
return kpasswdd_make_error_reply(kdc, mem_ctx,
KRB5_KPASSWD_BAD_VERSION,
"Operation Not Implemented",
reply);
#endif /* SAMBA4_INTERNAL_HEIMDAL */
} else {
free_ChangePasswdDataMS(&chpw);
return kpasswdd_change_password(kdc, mem_ctx, session_info,

5
source4/lib/replace/system/kerberos.h
View File

@ -129,8 +129,9 @@
/* Whether krb5_princ_realm returns krb5_realm or krb5_data */
#define KRB5_PRINC_REALM_RETURNS_REALM 1
#include "heimdal/lib/krb5/krb5.h"
#include "heimdal/lib/com_err/com_err.h"
#include <krb5.h>
#include <com_err.h>
#endif
#endif