From 095f64a7e9125a173a42d4ab95acba30ae21aa23 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 20 Mar 2006 17:29:52 +0000
Subject: [PATCH] windows-dafs-20060320

64-bit time_t pointer update

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

correct a type for consistency

====================

corrections to the dafs delta to allow compilation on Windows
---
 src/WINNT/afsd/smb.c  | 2 +-
 src/aklog/aklog.h     | 2 +-
 src/bozo/fsbnodeops.c | 2 +-
 src/tviced/NTMakefile | 5 +++--
 src/util/NTMakefile   | 2 ++
 src/vol/NTMakefile    | 8 ++++++--
 src/vol/vol-salvage.c | 6 ------
 src/vol/volume.c      | 2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 59c341d06..58bd190fc 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -795,7 +795,7 @@ void smb_SearchTimeFromUnixTime(afs_uint32 *searchTimep, time_t unixTime)
     struct tm localJunk;
     time_t t = unixTime;
 
-    ltp = localtime((time_t*) &t);
+    ltp = localtime(&t);
 
     /* if we fail, make up something */
     if (!ltp) {
diff --git a/src/aklog/aklog.h b/src/aklog/aklog.h
index 2984441f4..47acfc768 100644
--- a/src/aklog/aklog.h
+++ b/src/aklog/aklog.h
@@ -54,7 +54,7 @@ void aklog ARGS((int, char *[]));
 struct ktext {
     unsigned int length;
     unsigned char dat[MAX_KTXT_LEN];
-    u_int32_t mbz;
+    afs_uint32 mbz;
 };
 
 struct credentials {
diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c
index e38670e80..7e3a46772 100644
--- a/src/bozo/fsbnodeops.c
+++ b/src/bozo/fsbnodeops.c
@@ -130,7 +130,7 @@ static int dafs_getparm(struct fsbnode *abnode, afs_int32 aindex,
 			char *abuffer, afs_int32 alen);
 
 #ifdef AFS_NT40_ENV
-static void AppendExecutableExtension(char *cmd)
+static void AppendExecutableExtension(char *cmd);
 #else
 #define AppendExecutableExtension(x)
 #endif
diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile
index e58c5cc22..4fbc7e020 100644
--- a/src/tviced/NTMakefile
+++ b/src/tviced/NTMakefile
@@ -44,8 +44,9 @@ UTILOBJS = $(OUT)\assert.obj $(OUT)\uuid.obj $(OUT)\serverLog.obj $(OUT)\fileuti
 
 DIROBJS = $(OUT)\buffer.obj $(OUT)\dir.obj $(OUT)\salvage.obj
 
-VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.obj $(OUT)\fssync.obj $(OUT)\purge.obj \
-	  $(OUT)\clone.obj $(OUT)\common.obj $(OUT)\ihandle.obj $(OUT)\ntops.obj
+VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.obj \
+	  $(OUT)\clone.obj $(OUT)\common.obj $(OUT)\ihandle.obj $(OUT)\ntops.obj \
+	  $(OUT)\fssync-server.obj $(OUT)\fssync-client.obj $(OUT)\daemon_com.obj
 
 FSINTOBJS = $(OUT)\afsaux.obj $(OUT)\afscbint.cs.obj $(OUT)\afsint.ss.obj $(OUT)\afsint.xdr.obj
 
diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index b1578b1e0..f6baf9adc 100644
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -56,6 +56,8 @@ LIBOBJS = \
 	$(OUT)\winsock_nt.obj \
 	$(OUT)\errmap_nt.obj \
 	$(OUT)\dirpath.obj \
+	$(OUT)\strnlen.obj \
+	$(OUT)\strlcpy.obj \
 	$(OUT)\fileutil.obj \
 	$(OUT)\secutil_nt.obj
 
diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile
index 096026fe7..6396eaedc 100644
--- a/src/vol/NTMakefile
+++ b/src/vol/NTMakefile
@@ -25,7 +25,8 @@ INCFILES =\
 	$(INCFILEDIR)\afs\viceinode.h \
 	$(INCFILEDIR)\afs\vnode.h \
 	$(INCFILEDIR)\afs\volume.h \
-	$(INCFILEDIR)\afs\voldefs.h
+	$(INCFILEDIR)\afs\voldefs.h \
+	$(INCFILEDIR)\afs\daemon_com.h
 
 
 
@@ -37,7 +38,10 @@ LIBFILE = $(DESTDIR)\lib\afs\afsvol.lib
 LIBOBJS =\
 	$(OUT)\common.obj \
 	$(OUT)\clone.obj \
-	$(OUT)\fssync.obj \
+	$(OUT)\fssync-client.obj \
+	$(OUT)\fssync-server.obj \
+	$(OUT)\fssync-debug.obj \
+	$(OUT)\daemon_com.obj \
 	$(OUT)\ntops.obj \
 	$(OUT)\nuke.obj \
 	$(OUT)\partition.obj \
diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index eaaf6b96e..2dd5b2a51 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -287,12 +287,6 @@ int nVolumes;			/* Number of volumes (read-write and read-only)
 extern char * tmpdir = 0;
 
 
-#ifdef AFS_NT40_ENV
-/* Child job this process is running. */
-childJob_t myjob = { SALVAGER_MAGIC, NOT_CHILD, "" };
-#endif /* AFS_NT40_ENV */
-
-
 
 /* Forward declarations */
 /*@printflike@*/ void Log(const char *format, ...);
diff --git a/src/vol/volume.c b/src/vol/volume.c
index fae9f87b5..641ec2b7d 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -135,8 +135,8 @@ RCSID
 #include "afs/assert.h"
 #endif /* AFS_PTHREAD_ENV */
 #include "vutils.h"
-#include <dir/dir.h>
 #ifndef AFS_NT40_ENV
+#include <dir/dir.h>
 #include <unistd.h>
 #endif
 
-- 
2.39.5