mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 06:50:12 +00:00
rxk5-1557-20090521
LICENSE IPL10 FIXES n/a cm_ResetACLCache takes cell pointer ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== LICENSE IPL10 FIXES n/a Remove definitions now in auth.h. Don't export afskfw_krb524_init_ets or afskfw_krb524_convert_creds_kdc (or build them). ==================== LICENSE IPL10 FIXES n/a Find des/des.h. ==================== LICENSE IPL10 FIXES n/a AFSKFWDIR is now src\WINNT\afskfw ==================== LICENSE IPL10 FIXES n/a Find des\des.h
This commit is contained in:
parent
eea5959d74
commit
0ce54da45b
@ -2780,7 +2780,7 @@ cm_IoctlSetTokens2(cm_ioctl_t *ioctlp, cm_user_t *userp, struct smb_fid *fidp)
|
||||
if (a_token->flags & PIOCTL_LOGON) {
|
||||
ioctlp->flags |= CM_IOCTLFLAG_LOGON;
|
||||
}
|
||||
cm_ResetACLCache(userp);
|
||||
cm_ResetACLCache(cellp, userp);
|
||||
|
||||
code = 0;
|
||||
|
||||
|
@ -5,7 +5,10 @@
|
||||
# License. For details, see the LICENSE file in the top-level source
|
||||
# directory or online at http://www.openafs.org/dl/license10.html
|
||||
|
||||
AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I..\kfw\inc\loadfuncs -I..\kfw\inc\krb5 -I..\kfw\inc\leash -DSMB_UNICODE
|
||||
# rxk5 is added only to pick up rxk5_ntfixprotos.h, which is actually
|
||||
# about krb5 and not specific to rxk5 (will move)
|
||||
|
||||
AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I..\kfw\inc\loadfuncs -I..\kfw\inc\krb5 -I..\kfw\inc\leash -I..\..\rxk5 -DSMB_UNICODE
|
||||
|
||||
!INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
|
||||
!INCLUDE ..\..\config\NTMakefile.version
|
||||
|
@ -108,17 +108,6 @@ typedef BOOL (WINAPI *FP_CloseServiceHandle)(SC_HANDLE);
|
||||
#define KRB5_DEFAULT_LIFE 60*60*10 /* 10 hours */
|
||||
#define LSA_CCNAME "MSLSA:"
|
||||
|
||||
#ifndef KTC_ERROR
|
||||
#define KTC_ERROR 11862784L
|
||||
#define KTC_TOOBIG 11862785L
|
||||
#define KTC_INVAL 11862786L
|
||||
#define KTC_NOENT 11862787L
|
||||
#define KTC_PIOCTLFAIL 11862788L
|
||||
#define KTC_NOPIOCTL 11862789L
|
||||
#define KTC_NOCELL 11862790L
|
||||
#define KTC_NOCM 11862791L
|
||||
#endif
|
||||
|
||||
/* User Query data structures and functions */
|
||||
|
||||
struct textField {
|
||||
|
@ -90,8 +90,10 @@ int KFW_AFS_copy_system_file_to_default_cache(char *);
|
||||
#define KERB_ERR_NULL_KEY 10
|
||||
|
||||
/* From afs/krb.h */
|
||||
#ifndef RD_AP_TIME
|
||||
#define RD_AP_TIME 37 /* delta_t too big */
|
||||
#define INTK_BADPW 62 /* Incorrect password */
|
||||
#endif
|
||||
|
||||
#define PROBE_USERNAME "OPENAFS-KDC-PROBE"
|
||||
#define PROBE_PASSWORD_LEN 16
|
||||
|
@ -385,11 +385,13 @@ FUNC_INFO k4_fi[] = {
|
||||
};
|
||||
#endif
|
||||
|
||||
#if 0 /* XXXX */
|
||||
FUNC_INFO k524_fi[] = {
|
||||
MAKE_FUNC_INFO(krb524_init_ets),
|
||||
MAKE_FUNC_INFO(krb524_convert_creds_kdc),
|
||||
END_FUNC_INFO
|
||||
};
|
||||
#endif
|
||||
|
||||
FUNC_INFO profile_fi[] = {
|
||||
MAKE_FUNC_INFO(profile_init),
|
||||
@ -1424,6 +1426,7 @@ afskfw_encode_krb5_ticket
|
||||
|
||||
}
|
||||
|
||||
#if 0 /* XXXX */
|
||||
void afskfw_krb524_init_ets
|
||||
(krb5_context context)
|
||||
{
|
||||
@ -1440,6 +1443,8 @@ afskfw_krb524_convert_creds_kdc
|
||||
(context, v5creds, v4creds);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
int
|
||||
afskfw_krb_get_cred
|
||||
|
@ -72,7 +72,7 @@ EXPORTS
|
||||
afskfw_krb5_os_localaddr
|
||||
afskfw_krb5_parse_name
|
||||
afskfw_krb5_c_make_checksum
|
||||
afskfw_krb524_init_ets
|
||||
; afskfw_krb524_init_ets
|
||||
afskfw_krb5_cc_default
|
||||
afskfw_krb5_get_host_realm
|
||||
afskfw_krb5_copy_data
|
||||
@ -83,7 +83,7 @@ EXPORTS
|
||||
; afskfw_krb_get_tf_realm
|
||||
afskfw_krb5_cc_get_type
|
||||
afskfw_krb5_c_verify_checksum
|
||||
afskfw_krb524_convert_creds_kdc
|
||||
; afskfw_krb524_convert_creds_kdc
|
||||
afskfw_Leash_get_default_renew_min
|
||||
afskfw_krb5_kt_start_seq_get
|
||||
afskfw_krb5_cc_get_name
|
||||
|
@ -12,7 +12,7 @@ AFSDEV_AUXCDEFINES = -DAFS_AFSDB_ENV
|
||||
|
||||
!IF ("$(BUILD_RXK5)" == "TRUE")
|
||||
|
||||
afscflags = $(KRB5CFLAGS) -I.. $(afscflags) $(kfwincflags)
|
||||
afscflags = $(KRB5CFLAGS) -I.. $(afscflags) $(kfwincflags) -I..\WINNT\afsd
|
||||
|
||||
RXK5_INCFILES=\
|
||||
$(INCFILEDIR)\rxk5_tkt.h \
|
||||
@ -25,6 +25,10 @@ K5OBJS=\
|
||||
$(OUT)\rxk5_tkt.obj \
|
||||
$(OUT)\krb_util.obj
|
||||
|
||||
!ELSE
|
||||
|
||||
afscflags = -I.. $(afscflags) -I..\WINNT\afsd
|
||||
|
||||
!ENDIF
|
||||
|
||||
INCFILEDIR = $(DESTDIR)\include\afs
|
||||
|
@ -31,7 +31,7 @@ RCSID
|
||||
#include "afsincludes.h"
|
||||
#include "afs/stds.h"
|
||||
#include "afs/pthread_glock.h"
|
||||
#include "des/des.h"
|
||||
#include <des/des.h>
|
||||
#include "des/des_prototypes.h"
|
||||
#include "rx/rxkad.h"
|
||||
#include "rx/rx.h"
|
||||
|
@ -183,7 +183,7 @@ KRB5CFLAGS = -I$(AFSROOT)\src\WINNT\kfw\inc\krb5
|
||||
|
||||
KFWINCDIR = ..\WINNT\kfw\inc
|
||||
KFWLIBDIR = ..\WINNT\kfw\lib\$(CPU)
|
||||
AFSKFWDIR = ..\WINNT\afsd
|
||||
AFSKFWDIR = ..\WINNT\afskfw
|
||||
|
||||
kfwincflags = -I$(KFWINCDIR)\loadfuncs -I$(KFWINCDIR)\krb5 \
|
||||
-I$(KFWINCDIR)\leash -I$(AFSKFWDIR) -I$(KFWINCDIR)
|
||||
|
@ -191,7 +191,7 @@ KRB5CFLAGS = -I$(AFSROOT)\src\WINNT\kfw\inc\krb5
|
||||
|
||||
KFWINCDIR = ..\WINNT\kfw\inc
|
||||
KFWLIBDIR = ..\WINNT\kfw\lib\$(CPU)
|
||||
AFSKFWDIR = ..\WINNT\afsd
|
||||
AFSKFWDIR = ..\WINNT\afskfw
|
||||
|
||||
kfwincflags = -I$(KFWINCDIR)\loadfuncs -I$(KFWINCDIR)\krb5 \
|
||||
-I$(KFWINCDIR)\leash -I$(AFSKFWDIR) -I$(KFWINCDIR)
|
||||
|
@ -18,7 +18,7 @@ RELDIR=libafsauthent
|
||||
|
||||
AFS_TOKEN_RXK5_DEFINE = -DAFS_RXK5
|
||||
|
||||
afscflags = $(afscflags) $(kfwincflags)
|
||||
afscflags = $(afscflags) $(kfwincflags) -I..\WINNT\afsd
|
||||
|
||||
RXK5OBJS=\
|
||||
$(OUT)\rxk5_utilafs.obj \
|
||||
@ -30,6 +30,10 @@ RXK5LIBS=\
|
||||
$(DESTDIR)\lib\afs\afscom_err.lib \
|
||||
$(DESTDIR)\lib\afskfw_funcs.lib
|
||||
|
||||
!ELSE
|
||||
|
||||
afscflags = -I.. $(afscflags) -I..\WINNT\afsd
|
||||
|
||||
!ENDIF
|
||||
|
||||
AKLOG = ..\aklog
|
||||
|
Loading…
Reference in New Issue
Block a user