X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fcmd%2Fkrb5_locl.h;h=150ce3090e266742c885098a81ba9a6cf611797f;hp=9b5b095bbdf1bb7d28437274334c10b61e6569eb;hb=7273c8b4ae123ce555dde3bee7b9878c59ad1805;hpb=cc06d00b215b4aebfdd05ad205c088e3dc1ba666

diff --git a/src/cmd/krb5_locl.h b/src/cmd/krb5_locl.h
index 9b5b095..150ce30 100644
--- a/src/cmd/krb5_locl.h
+++ b/src/cmd/krb5_locl.h
@@ -7,22 +7,15 @@
 #include <afsconfig.h>
 #include <afs/stds.h>
 
+#include <roken.h>
+
 #include <assert.h>
 #include <ctype.h>
-#include <errno.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <roken.h>
 
 #include "cmd.h"
 
+#define PACKAGE "openafs"
+
 #ifndef TRUE
 # define TRUE 1
 #endif
@@ -37,9 +30,6 @@
 
 #define KRB5_DEPRECATED_FUNCTION(x)
 
-/* This value shouldn't be hard coded */
-#define KRB5_CONFIG_BADFORMAT                    (-1765328248L)
-
 #define N_(X,Y) X
 
 typedef struct cmd_config_binding krb5_config_binding;
@@ -47,6 +37,7 @@ typedef struct cmd_config_binding krb5_config_section;
 
 #define krb5_config_list cmd_config_list
 #define krb5_config_string cmd_config_string
+#define _krb5_config_get_entry _cmd_config_get_entry
 
 struct krb5_context_data {
     krb5_config_section *cf;
@@ -57,6 +48,41 @@ typedef int krb5_error_code;
 typedef int krb5_boolean;
 typedef time_t krb5_deltat;
 
+static void krb5_set_error_message(krb5_context context, krb5_error_code ret,
+				   const char *fmt, ...) {
+    return;
+}
+
+#ifdef EXPAND_PATH_HEADER
+
+#include <shlobj.h>
+
+static int _krb5_expand_path_tokens(krb5_context, const char *, char**);
+
+int
+_cmd_ExpandPathTokens(krb5_context context, const char *in, char **out) {
+    return _krb5_expand_path_tokens(context, in, out);
+}
+
+HINSTANCE _krb5_hInstance = NULL;
+
+/* This bodge avoids the need for everything linking against cmd to also
+ * link against the shell library on Windows */
+#undef SHGetFolderPath
+#define SHGetFolderPath internal_getpath
+
+HRESULT internal_getpath(void *a, int b, void *c, DWORD d, LPTSTR out) {
+    return E_INVALIDARG;
+}
+
+#else
+
+#define KRB5_CONFIG_BADFORMAT                    CMD_BADFORMAT
+
+#define _krb5_expand_path_tokens _cmd_ExpandPathTokens
+
+extern int _cmd_ExpandPathTokens(krb5_context, const char *, char **);
+
 static const void *_krb5_config_vget(krb5_context,
 				     const krb5_config_section *, int,
 				     va_list);
@@ -93,10 +119,6 @@ KRB5_LIB_FUNCTION void krb5_clear_error_message(krb5_context context) {
     return;
 }
 
-static void krb5_set_error_message(krb5_context context, krb5_error_code ret,
-				   const char *fmt, ...) {
-    return;
-}
 
 static int _krb5_homedir_access(krb5_context context) {
     return 0;
@@ -116,6 +138,7 @@ krb5_abortx(krb5_context context, const char *fmt, ...)
 
 /* Wrappers */
 
+
 int
 cmd_RawConfigParseFileMulti(const char *fname, cmd_config_section **res) {
     return krb5_config_parse_file_multi(NULL, fname, res);
@@ -188,3 +211,4 @@ cmd_RawConfigGetList(const cmd_config_section *c, ...)
 
     return ret;
 }
+#endif