krb5.rc: Replaced Windows password dialog resource file (krb5/os/win-pwd.rc)

Makefile.in: Link in krb5.rc (win16/win32)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9975 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index caccd5323933ec3e9c6fb5259fe9c8fe47878acf..cb788cd7e43fd86777f809cc966db5ceae942188 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -35,6 +35,8 @@ K4LIBS = krb4\krb4.lib
 ##WIN32##CDEF = comerr32.def
 ##WIN16##KDEF = krb5_16.def
 ##WIN32##KDEF = krb5_32.def
+##WIN16##KRB5RC = krb5.rc
+##WIN32##KRB5RC = krb5.obj
 ##WIN16##GDEF = gssapi16.def
 ##WIN32##GDEF = gssapi32.def
 ##WIN16##K4DEF = krb4_16.def
@@ -57,14 +59,14 @@ $(CLIB): $(CLIBS) $(WLIB) $(CDEF) no_glue.obj
 ##WIN32##      link $(WINDLLFLAGS) /def:$(CDEF) /out:$*.dll \
 ##WIN32##         no_glue.obj $(CLIBS) $(WINLIBS)
 
-$(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj
+$(KLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC)
 ##WIN16##      link /co /seg:400 /noe /nod /nol \
 ##WIN16##         k5_glue, $*.dll, $*.map, \
 ##WIN16##         $(KLIBS) $(CLIB) $(WINLIBS), $(KDEF)
-##WIN16##      rc /nologo /p /k $*.dll
+##WIN16##      rc /nologo /p /k $(CPPFLAGS) $(KRB5RC) $*.dll
 ##WIN16##      implib /nologo $@ $*.dll
 ##WIN32##      link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \
-##WIN32##         k5_glue.obj $(KLIBS) $(CLIB) $(WINLIBS) gdi32.lib
+##WIN32##         k5_glue.obj $(KRB5RC) $(KLIBS) $(CLIB) $(WINLIBS) gdi32.lib
 
 $(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) gss_glue.obj
 ##WIN16##      link /co /seg:400 /noe /nod /nol \
@@ -93,6 +95,10 @@ gss_glue.obj: win_glue.c
 no_glue.obj: win_glue.c
        $(CC) $(CFLAGS) /c /Fo$@ $**
 
+##WIN32##.rc.obj:
+##WIN32##      $(RC) $(CPPFLAGS) /r $**
+##WIN32##      $(CVTRES) /nologo /out:$@ $*.res
+
 ##WIN16##$(WLIB):  winsock.def
 ##WIN16##      implib /nologo $@ winsock.def
 

diff --git a/src/lib/krb5.rc b/src/lib/krb5.rc
new file mode 100644 (file)
index 0000000..df2aeb2
--- /dev/null
+++ b/src/lib/krb5.rc
@@ -0,0 +1,39 @@
+/*
+ * lib/krb5/os/win-pwd.h
+ *
+ * Copyright 1997 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ *
+ */
+
+#include "win-mac.h"
+
+ID_READ_PWD_DIALOG DIALOG 60, 72, 200, 84
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+       DS_SETFONT
+CAPTION "Kerberos Password/Challenge"
+FONT 8, "Helv"
+{
+  LTEXT "", ID_READ_PWD_PROMPT, 10, 8, 180, 10
+  LTEXT "", ID_READ_PWD_PROMPT2, 10, 24, 180, 10
+  EDITTEXT ID_READ_PWD_PWD, 10, 42, 180, 12, ES_AUTOHSCROLL | ES_PASSWORD |
+       WS_BORDER | WS_TABSTOP
+  DEFPUSHBUTTON "&OK", IDOK, 55, 61, 40, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 107, 61, 40, 14
+}