Moved Windows specific include files to src/windows/include

Updated Windows specific Makefiles to search for header files in src/windows/include

Signed-off-by: Alexey Melnikov <aamelnikov@gmail.com>

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

4 files changed, 1 insertions, 233 deletions

diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in
index 418a0a0f87..717c36ca56 100644
--- a/src/windows/leashdll/Makefile.in
+++ b/src/windows/leashdll/Makefile.in
@@ -47,7 +47,7 @@ RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DLEASHDLL_LIB
 
 # Set NODEBUG if building release instead of debug
 
-LOCALINCLUDES = -I$(BUILDTOP)\include -I.\include -I.\include\krb4 $(AFS_INCLUDES)
+LOCALINCLUDES = -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include -I.\include -I.\include\krb4 $(AFS_INCLUDES)
 
 WINLIBS = kernel32.lib advapi32.lib user32.lib gdi32.lib Version.lib \
 	  ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\$(CCLIB).lib $(AFS_LIBS)
diff --git a/src/windows/leashdll/include/leasherr.h b/src/windows/leashdll/include/leasherr.h
deleted file mode 100644
index 834765fbb8..0000000000
--- a/src/windows/leashdll/include/leasherr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * leasherr.h
- * This file is the #include file for leasherr.et.
- * Please do not edit it as it is automatically generated.
- */
-
-#define LSH_ONLYONEME                            (40591872L)
-#define LSH_INVPRINCIPAL                         (40591873L)
-#define LSH_FAILEDREALM                          (40591874L)
-#define LSH_INVINSTANCE                          (40591875L)
-#define LSH_INVREALM                             (40591876L)
-#define LSH_EOF                                  (40591877L)
-#define LSH_EXPIRESOON                           (40591878L)
-#define LSH_NOMATCH                              (40591879L)
-#define LSH_BADCHARS                             (40591880L)
-#define LSH_FATAL_ERROR                          (40591881L)
-#define LSH_BADWINSOCK                           (40591882L)
-#define LSH_BADTIMESERV                          (40591883L)
-#define LSH_NOSOCKET                             (40591884L)
-#define LSH_NOCONNECT                            (40591885L)
-#define LSH_TIMEFAILED                           (40591886L)
-#define LSH_GETTIMEOFDAY                         (40591887L)
-#define LSH_SETTIMEOFDAY                         (40591888L)
-#define LSH_RECVTIME                             (40591889L)
-#define LSH_RECVBYTES                            (40591890L)
-#define LSH_ALREADY_SETTIME                      (40591891L)
-extern void initialize_lsh_error_table(struct et_list **);
-#define ERROR_TABLE_BASE_lsh (40591872L)
-
-/* for compatibility with older versions... */
-#define init_lsh_err_tbl() initialize_lsh_error_table(&_et_list)
-#define lsh_err_base ERROR_TABLE_BASE_lsh
diff --git a/src/windows/leashdll/include/leashinfo.h b/src/windows/leashdll/include/leashinfo.h
deleted file mode 100644
index 7365aa1b54..0000000000
--- a/src/windows/leashdll/include/leashinfo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LSH_TIME_HOST 1970
-#define LSH_DEFAULT_TICKET_LIFE 1971
diff --git a/src/windows/leashdll/include/leashwin.h b/src/windows/leashdll/include/leashwin.h
deleted file mode 100644
index 6a26c43f93..0000000000
--- a/src/windows/leashdll/include/leashwin.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef __LEASHWIN__
-#define __LEASHWIN__
-
-////Is this sufficient?
-#ifndef NO_KRB4
-#include <krb.h>
-#else
-#define ANAME_SZ	        40
-#define	REALM_SZ	        40
-#define	SNAME_SZ	        40
-#define	INST_SZ		        40
-/* include space for '.' and '@' */
-#define	MAX_K_NAME_SZ	    (ANAME_SZ + INST_SZ + REALM_SZ + 2)
-#endif
-
-#define DLGTYPE_PASSWD   0
-#define DLGTYPE_CHPASSWD 1
-typedef struct {
-    int dlgtype;
-    // Tells whether dialog box is in change pwd more or init ticket mode???
-    // (verify this):
-    int dlgstatemax; // What is this???
-    // The title on the Dialog box - for Renewing or Initializing:
-    LPSTR title;
-    LPSTR principal;
-} LSH_DLGINFO, FAR *LPLSH_DLGINFO;
-
-#define LEASH_USERNAME_SZ        64
-#define LEASH_REALM_SZ          192
-#define LEASH_TITLE_SZ          128
-#define LEASH_CCACHE_NAME_SZ 	264
-
-typedef struct {
-    DWORD size;
-    int dlgtype;
-    // Tells whether dialog box is in change pwd mode or init ticket mode
-    LPSTR title;		// in v3, set to in.title
-    LPSTR username;		// in v3, set to in.username
-    LPSTR realm;		// in v3, set to in.realm
-    int   use_defaults;
-    int   forwardable;
-    int   noaddresses;
-    int   lifetime;
-    int   renew_till;
-    int   proxiable;
-    int   publicip;
-    // Version 1 of this structure ends here
-    struct {
-        char username[LEASH_USERNAME_SZ];
-        char realm[LEASH_REALM_SZ];
-	// Version 2 of this structure ends here
-	char ccache[LEASH_CCACHE_NAME_SZ];
-    } out;
-    struct {
-	char title[LEASH_TITLE_SZ];
-	char username[LEASH_USERNAME_SZ];
-	char realm[LEASH_REALM_SZ];
-	char ccache[LEASH_CCACHE_NAME_SZ];
-    } in;
-} LSH_DLGINFO_EX, *LPLSH_DLGINFO_EX;
-
-#define LSH_DLGINFO_EX_V1_SZ (sizeof(DWORD) + 3 * sizeof(LPSTR) + 8 * sizeof(int))
-#define LSH_DLGINFO_EX_V2_SZ (LSH_DLGINFO_EX_V1_SZ + LEASH_USERNAME_SZ + LEASH_REALM_SZ)
-#define LSH_DLGINFO_EX_V3_SZ (LSH_DLGINFO_EX_V2_SZ + LEASH_TITLE_SZ + LEASH_USERNAME_SZ + LEASH_REALM_SZ + 2 * LEASH_CCACHE_NAME_SZ)
-
-#ifndef NETIDMGR
-#define NETID_USERNAME_SZ       128
-#define NETID_REALM_SZ          192
-#define NETID_TITLE_SZ          256
-#define NETID_CCACHE_NAME_SZ 	264
-
-#define NETID_DLGTYPE_TGT      0
-#define NETID_DLGTYPE_CHPASSWD 1
-typedef struct {
-    DWORD size;
-    DWORD dlgtype;
-    // Tells whether dialog box is in change pwd mode or init ticket mode
-    struct {
-	WCHAR title[NETID_TITLE_SZ];
-	WCHAR username[NETID_USERNAME_SZ];
-	WCHAR realm[NETID_REALM_SZ];
-	WCHAR ccache[NETID_CCACHE_NAME_SZ];
-	DWORD use_defaults;
-	DWORD forwardable;
-	DWORD noaddresses;
-	DWORD lifetime;
-	DWORD renew_till;
-	DWORD proxiable;
-	DWORD publicip;
-	DWORD must_use_specified_principal;
-    } in;
-    struct {
-        WCHAR username[NETID_USERNAME_SZ];
-        WCHAR realm[NETID_REALM_SZ];
-	WCHAR ccache[NETID_CCACHE_NAME_SZ];
-    } out;
-    // Version 1 of this structure ends here
-} NETID_DLGINFO, *LPNETID_DLGINFO;
-
-#define NETID_DLGINFO_V1_SZ (10 * sizeof(DWORD) \
-        + sizeof(WCHAR) * (NETID_TITLE_SZ + \
-        2 * NETID_USERNAME_SZ + 2 * NETID_REALM_SZ + \
-        2 * NETID_CCACHE_NAME_SZ))
-#endif /* NETIDMGR */
-
-typedef struct {
-    char    principal[MAX_K_NAME_SZ]; /* Principal name/instance/realm */
-    int     btickets;                 /* Do we have tickets? */
-    long    lifetime;                 /* Lifetime -- needs to have
-                                         room for 255 5-minute
-                                         periods * 5 * 60 */
-    long    issue_date;               /* The issue time */
-    long    renew_till;               /* The Renew time (k5 only) */
-} TICKETINFO;
-
-int FAR Leash_kinit_dlg(HWND hParent, LPLSH_DLGINFO lpdlginfo);
-int FAR Leash_kinit_dlg_ex(HWND hParent, LPLSH_DLGINFO_EX lpdlginfoex);
-int FAR Leash_changepwd_dlg(HWND hParent, LPLSH_DLGINFO lpdlginfo);
-int FAR Leash_changepwd_dlg_ex(HWND hParent, LPLSH_DLGINFO_EX lpdlginfo);
-
-long FAR Leash_checkpwd(char *principal, char *password);
-long FAR Leash_changepwd(char *principal, char *password, char *newpassword, char** result_string);
-long FAR Leash_kinit(char *principal, char *password, int lifetime);
-long FAR Leash_kinit_ex(char * principal, char * password, int lifetime,
-						int forwardable, int proxiable, int renew_life,
-						int addressless, unsigned long publicIP);
-
-long FAR Leash_klist(HWND hlist, TICKETINFO FAR *ticketinfo);
-long FAR Leash_kdestroy(void);
-long FAR Leash_get_lsh_errno( LONG FAR *err_val);
-
-long FAR Leash_renew(void);
-long FAR Leash_importable(void);
-long FAR Leash_import(void);
-
-BOOL Leash_set_help_file( char FAR *szHelpFile );
-LPSTR Leash_get_help_file(void);
-
-void Leash_reset_defaults(void);
-
-#define NO_TICKETS 0
-#define EXPD_TICKETS 2
-#define GOOD_TICKETS 1
-
-/* Leash Configuration functions - alters Current User Registry */
-DWORD Leash_get_default_lifetime();
-DWORD Leash_set_default_lifetime(DWORD minutes);
-DWORD Leash_reset_default_lifetime();
-DWORD Leash_get_default_renew_till();
-DWORD Leash_set_default_renew_till(DWORD minutes);
-DWORD Leash_reset_default_renew_till();
-DWORD Leash_get_default_renewable();
-DWORD Leash_set_default_renewable(DWORD onoff);
-DWORD Leash_reset_default_renewable();
-DWORD Leash_get_default_forwardable();
-DWORD Leash_set_default_forwardable(DWORD onoff);
-DWORD Leash_reset_default_forwardable();
-DWORD Leash_get_default_noaddresses();
-DWORD Leash_set_default_noaddresses(DWORD onoff);
-DWORD Leash_reset_default_noaddresses();
-DWORD Leash_get_default_proxiable();
-DWORD Leash_set_default_proxiable(DWORD onoff);
-DWORD Leash_reset_default_proxiable();
-DWORD Leash_get_default_publicip();
-DWORD Leash_set_default_publicip(DWORD ipv4addr);
-DWORD Leash_reset_default_publicip();
-DWORD Leash_get_default_use_krb4();
-DWORD Leash_set_default_use_krb4(DWORD onoff);
-DWORD Leash_reset_default_use_krb4();
-DWORD Leash_get_hide_kinit_options();
-DWORD Leash_set_hide_kinit_options(DWORD onoff);
-DWORD Leash_reset_hide_kinit_options();
-DWORD Leash_get_default_life_min();
-DWORD Leash_set_default_life_min(DWORD minutes);
-DWORD Leash_reset_default_life_min();
-DWORD Leash_get_default_life_max();
-DWORD Leash_set_default_life_max(DWORD minutes);
-DWORD Leash_reset_default_life_max();
-DWORD Leash_get_default_renew_min();
-DWORD Leash_set_default_renew_min(DWORD minutes);
-DWORD Leash_reset_default_renew_min();
-DWORD Leash_get_default_renew_max();
-DWORD Leash_set_default_renew_max(DWORD minutes);
-DWORD Leash_reset_default_renew_max();
-DWORD Leash_get_lock_file_locations();
-DWORD Leash_set_lock_file_locations(DWORD onoff);
-DWORD Leash_reset_lock_file_locations();
-DWORD Leash_get_default_uppercaserealm();
-DWORD Leash_set_default_uppercaserealm(DWORD onoff);
-DWORD Leash_reset_default_uppercaserealm();
-DWORD Leash_get_default_mslsa_import();
-DWORD Leash_set_default_mslsa_import(DWORD onoffmatch);
-DWORD Leash_reset_default_mslsa_import();
-DWORD Leash_get_default_preserve_kinit_settings();
-DWORD Leash_set_default_preserve_kinit_settings(DWORD onoff);
-DWORD Leash_reset_default_preserve_kinit_settings();
-
-#endif /* LEASHWIN */