summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1997-03-19 19:18:45 +0000
committerTheodore Tso <tytso@mit.edu>1997-03-19 19:18:45 +0000
commit1ea486b9d447dbadec8891e8e66acdcab56114c2 (patch)
treec55b906a67414b337e1ad6e136ce2ecd79add3f5
parent78b51aea4f51c6fc8a79001144fa86a241f96def (diff)
Fix up name of the SAP Kerberos glue library to be platform dependent
(sapkrb16.dll, sapkrb32.dll). Fix makefile rules to work correctly after NT port. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10010 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/ChangeLog6
-rw-r--r--src/lib/Makefile.in11
-rw-r--r--src/lib/sapkrb5.def72
3 files changed, 14 insertions, 75 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index e9bb62f41..bdb46f80a 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 19 14:15:42 1997 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Fix up name of the SAP Kerberos glue library to be
+ platform dependent (sapkrb16.dll, sapkrb32.dll). Fix
+ makefile rules to work correctly after NT port.
+
Mon Mar 3 14:52:58 1997 Ezra Peisach <epeisach@mit.edu>
* Makefile.in (MAC_SUBDIRS): Change KRB5 to krb5 for Mac subdirs.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 865b605d8..9c281fd15 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -112,13 +112,18 @@ krb5.lib: $(KLIB)
gssapi.lib: $(GLIB)
sap_glue.obj: win_glue.c
- $(CC) $(CFLAGS) -DSAP_TIMEBOMB -I$(VERS_DIR) /c /Fo$@ win_glue.c
+ $(CC) $(CFLAGS) -DSAP_TIMEBOMB -DGSSAPI=1 /c /Fo$@ win_glue.c
-##WIN16##sapkrb5.dll: $(GLIBS) $(KLIB) sapkrb5.def sap_glue.obj
+##WIN16##krbsap16.dll: $(GLIBS) $(KLIB) $(CLIB) $(GDEF) $(GDEF) sap_glue.obj
##WIN16## link /co /seg:400 /noe /nod /nol \
##WIN16## sap_glue, $*.dll, $*.map, \
-##WIN16## $(GLIBS) $(KLIB) $(VERS_DIR)\vswin.lib $(WINLIBS), $(GDEF)
+##WIN16## $(GLIBS) $(KLIB) $(CLIB) $(WINLIBS), $(GDEF)
##WIN16## rc /nologo /p /k $*.dll
+##WIN16## implib /nologo $*.lib $*.dll
+
+##WIN32##krbsap32.dll: $(GLIBS) $(KLIB) $(CLIB) $(GDEF) $(GDEF) sap_glue.obj
+##WIN32## link $(WINDLLFLAGS) /def:$(GDEF) /out:$*.dll \
+##WIN32## sap_glue.obj $(GLIBS) $(KLIB) $(CLIB) $(WINLIBS)
all-windows::
diff --git a/src/lib/sapkrb5.def b/src/lib/sapkrb5.def
deleted file mode 100644
index 12394c319..000000000
--- a/src/lib/sapkrb5.def
+++ /dev/null
@@ -1,72 +0,0 @@
-;----------------------------------------------------
-; GSSAPI.DEF - GSSAPI.DLL module definition file
-;----------------------------------------------------
-
-LIBRARY SAPKRB5
-DESCRIPTION 'Base Generic Security Service API for SAP R/3'
-EXETYPE WINDOWS
-CODE PRELOAD MOVEABLE DISCARDABLE
-DATA PRELOAD MOVEABLE SINGLE
-HEAPSIZE 8192
-
-EXPORTS
- WEP @1001 RESIDENTNAME
- LIBMAIN @1002
- GSS_ACQUIRE_CRED @1
- GSS_RELEASE_CRED @2
- GSS_INIT_SEC_CONTEXT @3
- GSS_ACCEPT_SEC_CONTEXT @4
- GSS_PROCESS_CONTEXT_TOKEN @5
- GSS_DELETE_SEC_CONTEXT @6
- GSS_CONTEXT_TIME @7
- GSS_SIGN @8
- GSS_VERIFY @9
- GSS_SEAL @10
- GSS_UNSEAL @11
- GSS_DISPLAY_STATUS @12
- GSS_INDICATE_MECHS @13
- GSS_COMPARE_NAME @14
- GSS_DISPLAY_NAME @15
- GSS_IMPORT_NAME @16
- GSS_RELEASE_NAME @17
- GSS_RELEASE_BUFFER @18
- GSS_RELEASE_OID_SET @19
- GSS_INQUIRE_CRED @20
-
-; GSS-API v2 additional credential calls
-;
-; XXX we need to add the numbers to this!
-;
- GSS_ADD_CRED
- GSS_INQUIRE_CRED_BY_MECH
-
-; GSS-API v2 additional context-level calls
-;
- GSS_INQUIRE_CONTEXT
- GSS_WRAP_SIZE_LIMIT
- GSS_EXPORT_SEC_CONTEXT
- GSS_IMPORT_SEC_CONTEXT
-
-; GSS-API v2 additional calls for OID and OID_set operations
-;
- GSS_RELEASE_OID
- GSS_CREATE_EMPTY_OID_SET
- GSS_ADD_OID_SET_MEMBER
- GSS_TEST_OID_SET_MEMBER
- GSS_OID_TO_STR
- GSS_STR_TO_OID
-
-; GSS-API v2 renamed message protection calls
-;
- GSS_WRAP
- GSS_UNWRAP
- GSS_GET_MIC
- GSS_VERIFY_MIC
-
-; GSS-API v2 future extensions
-;
- GSS_INQUIRE_NAMES_FOR_MECH
-; GSS_INQUIRE_MECHS_FOR_NAME
-; GSS_CANONICALIZE_NAME
-; GSS_EXPORT_NAME
-