Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-14583 llapi: handle symlinks in llapi_file_get_stripe()
[fs/lustre-release.git]
/
lustre
/
utils
/
gss
/
context_mit.c
diff --git
a/lustre/utils/gss/context_mit.c
b/lustre/utils/gss/context_mit.c
index
43fc81d
..
f6d0d24
100644
(file)
--- a/
lustre/utils/gss/context_mit.c
+++ b/
lustre/utils/gss/context_mit.c
@@
-39,9
+39,15
@@
#include <errno.h>
#include <gssapi/gssapi.h>
#include <rpc/rpc.h>
#include <errno.h>
#include <gssapi/gssapi.h>
#include <rpc/rpc.h>
-#include "gss_util.h"
-#include "gss_oids.h"
-#include "err_util.h"
+
+#ifdef _NEW_BUILD_
+# include "lgss_utils.h"
+# include "write_bytes.h"
+#else
+# include "gss_util.h"
+# include "gss_oids.h"
+# include "err_util.h"
+#endif
#include "context.h"
#include <krb5.h>
#include "context.h"
#include <krb5.h>
@@
-171,8
+177,10
@@
enum seal_alg {
#define KEY_USAGE_SEED_CHECKSUM 0x99
#define K5CLENGTH 5
#define KEY_USAGE_SEED_CHECKSUM 0x99
#define K5CLENGTH 5
+#ifdef HAVE_DES3_SUPPORT
extern void krb5_enc_des3;
extern void krb5int_enc_des3;
extern void krb5_enc_des3;
extern void krb5int_enc_des3;
+#endif
extern void krb5int_enc_arcfour;
extern void krb5int_enc_aes128;
extern void krb5int_enc_aes256;
extern void krb5int_enc_arcfour;
extern void krb5int_enc_aes128;
extern void krb5int_enc_aes256;
@@
-203,7
+211,7
@@
derive_key(const krb5_keyblock *in, krb5_keyblock *out, int usage, char extra)
void *enc;
switch (in->enctype) {
void *enc;
switch (in->enctype) {
-#if
def ENCTYPE_DES3_CBC_RAW
+#if
defined ENCTYPE_DES3_CBC_RAW && defined HAVE_DES3_SUPPORT
case ENCTYPE_DES3_CBC_RAW:
keylength = 24;
/* Extra hack, the structure was renamed as rc4 was added... */
case ENCTYPE_DES3_CBC_RAW:
keylength = 24;
/* Extra hack, the structure was renamed as rc4 was added... */