diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-15 21:33:43 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-15 21:33:43 +0000 |
| commit | b1731e9e3329ba0f5b0d23980b0c84d7064c2e85 (patch) | |
| tree | 6b66c3e3972ce57c86a7714b0b1b27619bd6cd40 /src | |
| parent | de79d5d13da6f31bded09cd11d72e8b498967d27 (diff) | |
Need to link with $(CLIB) - comerr library (win32)
Removed winsock code from kinit.c (now handled by krb5 lib)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9873 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/clients/kinit/ChangeLog | 5 | ||||
| -rw-r--r-- | src/clients/kinit/Makefile.in | 5 | ||||
| -rw-r--r-- | src/clients/kinit/kinit.c | 26 |
3 files changed, 8 insertions, 28 deletions
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index e2d0abc1b..cf3e5d924 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 15 12:24:32 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: Link in ComErr library $(CLIB) + * kinit.c: Winsock initialization/teardown is now done by krb5 lib + Thu Feb 13 14:27:41 1997 Richard Basch <basch@lehman.com> * Makefile.in: diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index 14f8be84a..b9799120a 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -16,9 +16,8 @@ kinit: kinit.o $(KRB5_BASE_DEPLIBS) ##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) ##WIN32##all-windows:: kinit.exe -##WIN32##kinit.exe: kinit.obj -##WIN32## link /nologo /out:$@ $*.obj \ -##WIN32## $(BUILDTOP)\util\windows\getopt.obj $(KLIB) wsock32.lib +##WIN32##kinit.exe: kinit.obj $(BUILDTOP)\util\windows\getopt.obj $(KLIB) $(CLIB) +##WIN32## link /nologo /out:$@ $** clean-unix:: diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c index fe4ae3266..f5ca42683 100644 --- a/src/clients/kinit/kinit.c +++ b/src/clients/kinit/kinit.c @@ -91,26 +91,6 @@ main(argc, argv) int pwsize; char password[255], *client_name, prompt[255]; -#ifdef _WIN32 - { - WORD version = 0x0101; - WSADATA wsadata; - int rc; - - rc = WSAStartup(version, &wsadata); - if (rc) { - fprintf(stderr, "%s: Couldn't initialize Winsock library\n", - argv[0]); - exit(1); - } - if (version != wsadata.wVersion) { - fprintf(stderr, "%s: Winsock version 1.1 not available\n", - argv[0]); - exit(1); - } - } -#endif - code = krb5_init_context(&kcontext); if (code) { com_err(argv[0], code, "while initializing krb5"); @@ -400,11 +380,7 @@ main(argc, argv) krb5_free_principal(kcontext, server); krb5_free_context(kcontext); - -#ifdef _WIN32 - WSACleanup(); -#endif - + exit(0); } |