brcm-2.4: potential fix for pptp nat

[openwrt.git] / target / linux / generic-2.4 / patches / 107-cifs.patch

diff --git a/target/linux/generic-2.4/patches/107-cifs.patch b/target/linux/generic-2.4/patches/107-cifs.patch
index bdccf4d..3ca3fb5 100644 (file)
--- a/target/linux/generic-2.4/patches/107-cifs.patch
+++ b/target/linux/generic-2.4/patches/107-cifs.patch
@@ -1,7 +1,6 @@
-diff -urN linux-2.4.29.old/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help
---- linux-2.4.29.old/Documentation/Configure.help      2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/Documentation/Configure.help  2005-03-21 19:36:51.000000000 +0100
-@@ -17943,6 +17943,34 @@
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
+@@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL
  
    If you don't know what all this is about, say N.
  
@@ -36,10 +35,9 @@ diff -urN linux-2.4.29.old/Documentation/Configure.help linux-2.4.29/Documentati
  SMB file system support (to mount Windows shares etc.)
  CONFIG_SMB_FS
    SMB (Server Message Block) is the protocol Windows for Workgroups
-diff -urN linux-2.4.29.old/Documentation/filesystems/00-INDEX linux-2.4.29/Documentation/filesystems/00-INDEX
---- linux-2.4.29.old/Documentation/filesystems/00-INDEX        2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.29/Documentation/filesystems/00-INDEX    2005-03-21 19:36:51.000000000 +0100
-@@ -10,6 +10,8 @@
+--- a/Documentation/filesystems/00-INDEX
++++ b/Documentation/filesystems/00-INDEX
+@@ -10,6 +10,8 @@ befs.txt
        - info for the BeOS file system (BFS)
  bfs.txt
        - info for the SCO UnixWare Boot Filesystem (BFS).
@@ -48,9 +46,8 @@ diff -urN linux-2.4.29.old/Documentation/filesystems/00-INDEX linux-2.4.29/Docum
  coda.txt
        - description of the CODA filesystem.
  cramfs.txt
-diff -urN linux-2.4.29.old/Documentation/filesystems/cifs.txt linux-2.4.29/Documentation/filesystems/cifs.txt
---- linux-2.4.29.old/Documentation/filesystems/cifs.txt        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/Documentation/filesystems/cifs.txt    2005-03-21 19:36:51.000000000 +0100
+--- /dev/null
++++ b/Documentation/filesystems/cifs.txt
 @@ -0,0 +1,51 @@
 +  This is the client VFS module for the Common Internet File System
 +  (CIFS) protocol which is the successor to the Server Message Block 
@@ -103,9 +100,8 @@ diff -urN linux-2.4.29.old/Documentation/filesystems/cifs.txt linux-2.4.29/Docum
 +  or the Samba site:
 +     
 +      http://www.samba.org
-diff -urN linux-2.4.29.old/fs/cifs/asn1.c linux-2.4.29/fs/cifs/asn1.c
---- linux-2.4.29.old/fs/cifs/asn1.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/asn1.c        2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/asn1.c
 @@ -0,0 +1,614 @@
 +/* 
 + * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in
@@ -721,9 +717,8 @@ diff -urN linux-2.4.29.old/fs/cifs/asn1.c linux-2.4.29/fs/cifs/asn1.c
 +
 +      return 1;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/AUTHORS linux-2.4.29/fs/cifs/AUTHORS
---- linux-2.4.29.old/fs/cifs/AUTHORS   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/AUTHORS       2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/AUTHORS
 @@ -0,0 +1,37 @@
 +Original Author
 +===============
@@ -762,9 +757,8 @@ diff -urN linux-2.4.29.old/fs/cifs/AUTHORS linux-2.4.29/fs/cifs/AUTHORS
 +
 +And thanks to the IBM LTC and Power test teams and SuSE testers for
 +finding multiple bugs during excellent stress test runs.
-diff -urN linux-2.4.29.old/fs/cifs/CHANGES linux-2.4.29/fs/cifs/CHANGES
---- linux-2.4.29.old/fs/cifs/CHANGES   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/CHANGES       2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/CHANGES
 @@ -0,0 +1,572 @@
 +Version 1.20
 +------------
@@ -1338,9 +1332,8 @@ diff -urN linux-2.4.29.old/fs/cifs/CHANGES linux-2.4.29/fs/cifs/CHANGES
 +-----------
 +Initial drop
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.c linux-2.4.29/fs/cifs/cifs_debug.c
---- linux-2.4.29.old/fs/cifs/cifs_debug.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_debug.c  2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_debug.c
 @@ -0,0 +1,797 @@
 +/*
 + *   fs/cifs_debug.c
@@ -2139,9 +2132,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.c linux-2.4.29/fs/cifs/cifs_debug.
 +
 +
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.h linux-2.4.29/fs/cifs/cifs_debug.h
---- linux-2.4.29.old/fs/cifs/cifs_debug.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_debug.h  2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_debug.h
 @@ -0,0 +1,66 @@
 +/*
 + *
@@ -2209,9 +2201,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.h linux-2.4.29/fs/cifs/cifs_debug.
 +#endif                /* _CIFS_DEBUG */
 +
 +#endif                                /* _H_CIFS_DEBUG */
-diff -urN linux-2.4.29.old/fs/cifs/cifsencrypt.c linux-2.4.29/fs/cifs/cifsencrypt.c
---- linux-2.4.29.old/fs/cifs/cifsencrypt.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsencrypt.c 2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifsencrypt.c
 @@ -0,0 +1,204 @@
 +/*
 + *   fs/cifs/cifsencrypt.c
@@ -2417,9 +2408,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsencrypt.c linux-2.4.29/fs/cifs/cifsencryp
 +
 +      hmac_md5_final(v2_session_response,&context);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/cifserr.c linux-2.4.29/fs/cifs/cifserr.c
---- linux-2.4.29.old/fs/cifs/cifserr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifserr.c     2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifserr.c
 @@ -0,0 +1,70 @@
 +/*
 + *   fs/cifserr.c
@@ -2491,9 +2481,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifserr.c linux-2.4.29/fs/cifs/cifserr.c
 +{
 +      return map_cifs_error(error_class, error_code, FALSE);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/cifsfs.c linux-2.4.29/fs/cifs/cifsfs.c
---- linux-2.4.29.old/fs/cifs/cifsfs.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsfs.c      2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifsfs.c
 @@ -0,0 +1,769 @@
 +/*
 + *   fs/cifs/cifsfs.c
@@ -3264,9 +3253,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsfs.c linux-2.4.29/fs/cifs/cifsfs.c
 +    ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows");
 +module_init(init_cifs)
 +module_exit(exit_cifs)
-diff -urN linux-2.4.29.old/fs/cifs/cifsfs.h linux-2.4.29/fs/cifs/cifsfs.h
---- linux-2.4.29.old/fs/cifs/cifsfs.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsfs.h      2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifsfs.h
 @@ -0,0 +1,97 @@
 +/*
 + *   fs/cifs/cifsfs.h
@@ -3365,9 +3353,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsfs.h linux-2.4.29/fs/cifs/cifsfs.h
 +extern ssize_t        cifs_listxattr(struct dentry *, char *, size_t);
 +#define CIFS_VERSION   "1.20"
 +#endif                                /* _CIFSFS_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifs_fs_sb.h linux-2.4.29/fs/cifs/cifs_fs_sb.h
---- linux-2.4.29.old/fs/cifs/cifs_fs_sb.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_fs_sb.h  2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_fs_sb.h
 @@ -0,0 +1,32 @@
 +/*
 + *   fs/cifs/cifs_fs_sb.h
@@ -3401,9 +3388,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_fs_sb.h linux-2.4.29/fs/cifs/cifs_fs_sb.
 +      mode_t  mnt_dir_mode;
 +};
 +#endif                                /* _CIFS_FS_SB_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifsglob.h linux-2.4.29/fs/cifs/cifsglob.h
---- linux-2.4.29.old/fs/cifs/cifsglob.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsglob.h    2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifsglob.h
 @@ -0,0 +1,413 @@
 +/*
 + *   fs/cifs/cifsglob.h
@@ -3818,9 +3804,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsglob.h linux-2.4.29/fs/cifs/cifsglob.h
 +GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */
 +GLOBAL_EXTERN unsigned int linuxExtEnabled;  /* enable Linux/Unix CIFS extensions */
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifspdu.h linux-2.4.29/fs/cifs/cifspdu.h
---- linux-2.4.29.old/fs/cifs/cifspdu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifspdu.h     2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifspdu.h
 @@ -0,0 +1,1793 @@
 +/*
 + *   fs/cifs/cifspdu.h
@@ -5615,9 +5600,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifspdu.h linux-2.4.29/fs/cifs/cifspdu.h
 +#pragma pack()                        /* resume default structure packing */
 +
 +#endif                                /* _CIFSPDU_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifsproto.h linux-2.4.29/fs/cifs/cifsproto.h
---- linux-2.4.29.old/fs/cifs/cifsproto.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsproto.h   2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifsproto.h
 @@ -0,0 +1,254 @@
 +/*
 + *   fs/cifs/cifsproto.h
@@ -5873,9 +5857,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsproto.h linux-2.4.29/fs/cifs/cifsproto.h
 +               char * EAData, size_t size,
 +               const struct nls_table *nls_codepage);
 +#endif                        /* _CIFSPROTO_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifssmb.c linux-2.4.29/fs/cifs/cifssmb.c
---- linux-2.4.29.old/fs/cifs/cifssmb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifssmb.c     2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifssmb.c
 @@ -0,0 +1,3016 @@
 +/*
 + *   fs/cifs/cifssmb.c
@@ -8893,9 +8876,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifssmb.c linux-2.4.29/fs/cifs/cifssmb.c
 +      return rc;
 +}
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.c linux-2.4.29/fs/cifs/cifs_unicode.c
---- linux-2.4.29.old/fs/cifs/cifs_unicode.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_unicode.c        2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_unicode.c
 @@ -0,0 +1,87 @@
 +/*
 + *   fs/cifs/cifs_unicode.c
@@ -8984,9 +8966,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.c linux-2.4.29/fs/cifs/cifs_unic
 +      return i;
 +}
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.h linux-2.4.29/fs/cifs/cifs_unicode.h
---- linux-2.4.29.old/fs/cifs/cifs_unicode.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_unicode.h        2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_unicode.h
 @@ -0,0 +1,353 @@
 +/*
 + * cifs_unicode:  Unicode kernel case support
@@ -9341,9 +9322,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.h linux-2.4.29/fs/cifs/cifs_unic
 +}
 +
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_uniupr.h linux-2.4.29/fs/cifs/cifs_uniupr.h
---- linux-2.4.29.old/fs/cifs/cifs_uniupr.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_uniupr.h 2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/cifs_uniupr.h
 @@ -0,0 +1,253 @@
 +/*
 + *   Copyright (c) International Business Machines  Corp., 2000,2002
@@ -9598,9 +9578,8 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_uniupr.h linux-2.4.29/fs/cifs/cifs_uniup
 +      0, 0, 0
 +};
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/connect.c linux-2.4.29/fs/cifs/connect.c
---- linux-2.4.29.old/fs/cifs/connect.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/connect.c     2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/connect.c
 @@ -0,0 +1,2924 @@
 +/*
 + *   fs/cifs/connect.c
@@ -12526,9 +12505,8 @@ diff -urN linux-2.4.29.old/fs/cifs/connect.c linux-2.4.29/fs/cifs/connect.c
 +      return rc;
 +}
 +
-diff -urN linux-2.4.29.old/fs/cifs/dir.c linux-2.4.29/fs/cifs/dir.c
---- linux-2.4.29.old/fs/cifs/dir.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/dir.c 2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/dir.c
 @@ -0,0 +1,425 @@
 +/*
 + *   fs/cifs/dir.c
@@ -12955,9 +12933,8 @@ diff -urN linux-2.4.29.old/fs/cifs/dir.c linux-2.4.29/fs/cifs/dir.c
 +/* d_delete:       cifs_d_delete,       *//* not needed except for debugging */
 +      /* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */
 +};
-diff -urN linux-2.4.29.old/fs/cifs/file.c linux-2.4.29/fs/cifs/file.c
---- linux-2.4.29.old/fs/cifs/file.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/file.c        2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/file.c
 @@ -0,0 +1,2185 @@
 +/*
 + *   fs/cifs/file.c
@@ -15144,9 +15121,8 @@ diff -urN linux-2.4.29.old/fs/cifs/file.c linux-2.4.29/fs/cifs/file.c
 +      .sync_page = cifs_sync_page,
 +      /*.direct_IO = */
 +};
-diff -urN linux-2.4.29.old/fs/cifs/inode.c linux-2.4.29/fs/cifs/inode.c
---- linux-2.4.29.old/fs/cifs/inode.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/inode.c       2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/inode.c
 @@ -0,0 +1,1079 @@
 +/*
 + *   fs/cifs/inode.c
@@ -16227,9 +16203,8 @@ diff -urN linux-2.4.29.old/fs/cifs/inode.c linux-2.4.29/fs/cifs/inode.c
 +      /* may have to add back in if and when safe distributed caching of
 +              directories added e.g. via FindNotify */
 +}
-diff -urN linux-2.4.29.old/fs/cifs/link.c linux-2.4.29/fs/cifs/link.c
---- linux-2.4.29.old/fs/cifs/link.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/link.c        2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/link.c
 @@ -0,0 +1,328 @@
 +/*
 + *   fs/cifs/link.c
@@ -16559,9 +16534,8 @@ diff -urN linux-2.4.29.old/fs/cifs/link.c linux-2.4.29/fs/cifs/link.c
 +      FreeXid(xid);
 +      return rc;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/Makefile linux-2.4.29/fs/cifs/Makefile
---- linux-2.4.29.old/fs/cifs/Makefile  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/Makefile      2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/Makefile
 @@ -0,0 +1,10 @@
 +#
 +# Makefile for Linux CIFS VFS client 
@@ -16573,9 +16547,8 @@ diff -urN linux-2.4.29.old/fs/cifs/Makefile linux-2.4.29/fs/cifs/Makefile
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-diff -urN linux-2.4.29.old/fs/cifs/md4.c linux-2.4.29/fs/cifs/md4.c
---- linux-2.4.29.old/fs/cifs/md4.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md4.c 2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/md4.c
 @@ -0,0 +1,203 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -16780,9 +16753,8 @@ diff -urN linux-2.4.29.old/fs/cifs/md4.c linux-2.4.29/fs/cifs/md4.c
 +
 +      A = B = C = D = 0;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/md5.c linux-2.4.29/fs/cifs/md5.c
---- linux-2.4.29.old/fs/cifs/md5.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md5.c 2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/md5.c
 @@ -0,0 +1,363 @@
 +/*
 + * This code implements the MD5 message-digest algorithm.
@@ -17147,9 +17119,8 @@ diff -urN linux-2.4.29.old/fs/cifs/md5.c linux-2.4.29/fs/cifs/md5.c
 +      }
 +      hmac_md5_final(digest, &ctx);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/md5.h linux-2.4.29/fs/cifs/md5.h
---- linux-2.4.29.old/fs/cifs/md5.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md5.h 2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/md5.h
 @@ -0,0 +1,38 @@
 +#ifndef MD5_H
 +#define MD5_H
@@ -17189,9 +17160,8 @@ diff -urN linux-2.4.29.old/fs/cifs/md5.h linux-2.4.29/fs/cifs/md5.h
 +void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
 +void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
 +                      unsigned char *digest);
-diff -urN linux-2.4.29.old/fs/cifs/misc.c linux-2.4.29/fs/cifs/misc.c
---- linux-2.4.29.old/fs/cifs/misc.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/misc.c        2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/misc.c
 @@ -0,0 +1,463 @@
 +/*
 + *   fs/cifs/misc.c
@@ -17656,9 +17626,8 @@ diff -urN linux-2.4.29.old/fs/cifs/misc.c linux-2.4.29/fs/cifs/misc.c
 +      printk( " | %s\n", debug_line);
 +      return;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/netmisc.c linux-2.4.29/fs/cifs/netmisc.c
---- linux-2.4.29.old/fs/cifs/netmisc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/netmisc.c     2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/netmisc.c
 @@ -0,0 +1,905 @@
 +/*
 + *   fs/cifs/netmisc.c
@@ -18565,9 +18534,8 @@ diff -urN linux-2.4.29.old/fs/cifs/netmisc.c linux-2.4.29/fs/cifs/netmisc.c
 +      dce_time += NTFS_TIME_OFFSET;
 +      return dce_time;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/nterr.c linux-2.4.29/fs/cifs/nterr.c
---- linux-2.4.29.old/fs/cifs/nterr.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/nterr.c       2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/nterr.c
 @@ -0,0 +1,687 @@
 +/* 
 + *  Unix SMB/Netbios implementation.
@@ -19256,9 +19224,8 @@ diff -urN linux-2.4.29.old/fs/cifs/nterr.c linux-2.4.29/fs/cifs/nterr.c
 +      {"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED},
 +      {NULL, 0}
 +};
-diff -urN linux-2.4.29.old/fs/cifs/nterr.h linux-2.4.29/fs/cifs/nterr.h
---- linux-2.4.29.old/fs/cifs/nterr.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/nterr.h       2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/nterr.h
 @@ -0,0 +1,556 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -19816,9 +19783,8 @@ diff -urN linux-2.4.29.old/fs/cifs/nterr.h linux-2.4.29/fs/cifs/nterr.h
 +#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE      /* scheduler */
 +
 +#endif                                /* _NTERR_H */
-diff -urN linux-2.4.29.old/fs/cifs/ntlmssp.h linux-2.4.29/fs/cifs/ntlmssp.h
---- linux-2.4.29.old/fs/cifs/ntlmssp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/ntlmssp.h     2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/ntlmssp.h
 @@ -0,0 +1,101 @@
 +/*
 + *   fs/cifs/ntlmssp.h
@@ -19921,9 +19887,8 @@ diff -urN linux-2.4.29.old/fs/cifs/ntlmssp.h linux-2.4.29/fs/cifs/ntlmssp.h
 +} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;
 +
 +#pragma pack()                        /* resume default structure packing */
-diff -urN linux-2.4.29.old/fs/cifs/README linux-2.4.29/fs/cifs/README
---- linux-2.4.29.old/fs/cifs/README    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/README        2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/README
 @@ -0,0 +1,356 @@
 +The CIFS VFS support for Linux supports many advanced network filesystem 
 +features such as heirarchical dfs like namespace, hardlinks, locking and more.  
@@ -20281,9 +20246,8 @@ diff -urN linux-2.4.29.old/fs/cifs/README linux-2.4.29/fs/cifs/README
 +Windows 2000 server or Samba since it does not usually send "raw NTLMSSP" 
 +(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not 
 +complete in the CIFS VFS yet).  
-diff -urN linux-2.4.29.old/fs/cifs/rfc1002pdu.h linux-2.4.29/fs/cifs/rfc1002pdu.h
---- linux-2.4.29.old/fs/cifs/rfc1002pdu.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/rfc1002pdu.h  2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/rfc1002pdu.h
 @@ -0,0 +1,79 @@
 +/*
 + *   fs/cifs/rfc1002pdu.h
@@ -20364,9 +20328,8 @@ diff -urN linux-2.4.29.old/fs/cifs/rfc1002pdu.h linux-2.4.29/fs/cifs/rfc1002pdu.
 +
 +#pragma pack()                /* resume default structure packing */
 +                                                             
-diff -urN linux-2.4.29.old/fs/cifs/smbdes.c linux-2.4.29/fs/cifs/smbdes.c
---- linux-2.4.29.old/fs/cifs/smbdes.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smbdes.c      2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/smbdes.c
 @@ -0,0 +1,408 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -20776,9 +20739,8 @@ diff -urN linux-2.4.29.old/fs/cifs/smbdes.c linux-2.4.29/fs/cifs/smbdes.c
 +      key2[0] = key[7];
 +      smbhash(out + 8, in + 8, key2, forw);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smbencrypt.c linux-2.4.29/fs/cifs/smbencrypt.c
---- linux-2.4.29.old/fs/cifs/smbencrypt.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smbencrypt.c  2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/smbencrypt.c
 @@ -0,0 +1,295 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21075,9 +21037,8 @@ diff -urN linux-2.4.29.old/fs/cifs/smbencrypt.c linux-2.4.29/fs/cifs/smbencrypt.
 +{
 +      mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smberr.c linux-2.4.29/fs/cifs/smberr.c
---- linux-2.4.29.old/fs/cifs/smberr.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smberr.c      2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/smberr.c
 @@ -0,0 +1,240 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21319,9 +21280,8 @@ diff -urN linux-2.4.29.old/fs/cifs/smberr.c linux-2.4.29/fs/cifs/smberr.c
 +      NTSTATUS status = map_nt_error_from_unix(error);
 +      return ntstatus_to_werror(status);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smberr.h linux-2.4.29/fs/cifs/smberr.h
---- linux-2.4.29.old/fs/cifs/smberr.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smberr.h      2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/smberr.h
 @@ -0,0 +1,113 @@
 +/*
 + *   fs/cifs/smberr.h
@@ -21436,9 +21396,8 @@ diff -urN linux-2.4.29.old/fs/cifs/smberr.h linux-2.4.29/fs/cifs/smberr.h
 +#define ERRpasswordExpired 2242
 +#define ERRnetlogonNotStarted 2455
 +#define ERRnosupport       0xFFFF
-diff -urN linux-2.4.29.old/fs/cifs/TODO linux-2.4.29/fs/cifs/TODO
---- linux-2.4.29.old/fs/cifs/TODO      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/TODO  2004-07-14 00:25:04.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/TODO
 @@ -0,0 +1,106 @@
 +version 1.16 May 27, 2004
 +
@@ -21546,9 +21505,8 @@ diff -urN linux-2.4.29.old/fs/cifs/TODO linux-2.4.29/fs/cifs/TODO
 +4) More exhaustively test the recently added NT4 support against various
 +NT4 service pack levels.
 +
-diff -urN linux-2.4.29.old/fs/cifs/transport.c linux-2.4.29/fs/cifs/transport.c
---- linux-2.4.29.old/fs/cifs/transport.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/transport.c   2004-07-14 00:25:05.000000000 +0200
+--- /dev/null
++++ b/fs/cifs/transport.c
 @@ -0,0 +1,434 @@
 +/*
 + *   fs/cifs/transport.c
@@ -21984,10 +21942,9 @@ diff -urN linux-2.4.29.old/fs/cifs/transport.c linux-2.4.29/fs/cifs/transport.c
 +
 +      return rc;
 +}
-diff -urN linux-2.4.29.old/fs/Config.in linux-2.4.29/fs/Config.in
---- linux-2.4.29.old/fs/Config.in      2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/fs/Config.in  2005-03-21 19:36:51.000000000 +0100
-@@ -146,6 +146,10 @@
+--- a/fs/Config.in
++++ b/fs/Config.in
+@@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then
       define_bool CONFIG_LOCKD_V4 y
     fi
  
@@ -21998,10 +21955,9 @@ diff -urN linux-2.4.29.old/fs/Config.in linux-2.4.29/fs/Config.in
     dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
     if [ "$CONFIG_SMB_FS" != "n" ]; then
        bool '  Use a default NLS' CONFIG_SMB_NLS_DEFAULT
-diff -urN linux-2.4.29.old/fs/Makefile linux-2.4.29/fs/Makefile
---- linux-2.4.29.old/fs/Makefile       2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/fs/Makefile   2005-03-21 19:36:51.000000000 +0100
-@@ -37,6 +37,7 @@
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS)    += msdos
  subdir-$(CONFIG_VFAT_FS)      += vfat
  subdir-$(CONFIG_BFS_FS)               += bfs
  subdir-$(CONFIG_ISO9660_FS)   += isofs
@@ -22009,10 +21965,9 @@ diff -urN linux-2.4.29.old/fs/Makefile linux-2.4.29/fs/Makefile
  subdir-$(CONFIG_DEVFS_FS)     += devfs
  subdir-$(CONFIG_HFSPLUS_FS)   += hfsplus # Before hfs to find wrapped HFS+
  subdir-$(CONFIG_HFS_FS)               += hfs
-diff -urN linux-2.4.29.old/fs/nls/Config.in linux-2.4.29/fs/nls/Config.in
---- linux-2.4.29.old/fs/nls/Config.in  2003-08-25 13:44:43.000000000 +0200
-+++ linux-2.4.29/fs/nls/Config.in      2005-03-21 19:36:51.000000000 +0100
-@@ -11,6 +11,7 @@
+--- a/fs/nls/Config.in
++++ b/fs/nls/Config.in
+@@ -11,6 +11,7 @@ fi
  
  # msdos and Joliet want NLS
  if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \