Got rid of proto.h hunk.

diff --git a/daemon-glob.patch b/daemon-glob.patch
index a0f5b44..172a28c 100644 (file)
--- a/daemon-glob.patch
+++ b/daemon-glob.patch
@@ -1,4 +1,8 @@
-Index: clientserver.c
+After applying this patch and running configure, you MUST run this
+command before "make":
+
+    make proto
+

 --- clientserver.c     5 Jun 2004 19:59:03 -0000       1.123
 +++ clientserver.c     5 Jun 2004 20:38:15 -0000
 @@ -207,7 +207,8 @@ int start_inband_exchange(char *user, ch
 --- clientserver.c     5 Jun 2004 19:59:03 -0000       1.123
 +++ clientserver.c     5 Jun 2004 20:38:15 -0000
 @@ -207,7 +207,8 @@ int start_inband_exchange(char *user, ch


@@ -52,19 +56,6 @@ Index: clientserver.c
        }
  
        argp = argv;
        }
  
        argp = argv;

-Index: proto.h
---- proto.h    5 Jun 2004 20:28:09 -0000       1.195
-+++ proto.h    5 Jun 2004 20:38:15 -0000
-@@ -254,7 +254,7 @@ void kill_all(int sig);
- int name_to_uid(char *name, uid_t *uid);
- int name_to_gid(char *name, gid_t *gid);
- int lock_range(int fd, int offset, int len);
--void glob_expand(char *base1, char **argv, int *argc_ptr, int maxargs);
-+void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr);
- void strlower(char *s);
- size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2);
- size_t stringjoin(char *dest, size_t destsize, ...);
-Index: util.c

 --- util.c     5 Jun 2004 20:26:56 -0000       1.148
 +++ util.c     5 Jun 2004 20:38:16 -0000
 @@ -495,12 +495,20 @@ static int exclude_server_path(char *arg
 --- util.c     5 Jun 2004 20:26:56 -0000       1.148
 +++ util.c     5 Jun 2004 20:38:16 -0000
 @@ -495,12 +495,20 @@ static int exclude_server_path(char *arg