summaryrefslogtreecommitdiff
path: root/packaging/Debian/debian/patches/loadparm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/Debian/debian/patches/loadparm.patch')
-rw-r--r--packaging/Debian/debian/patches/loadparm.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch
index ccca48793fc..d8b7ab00c2f 100644
--- a/packaging/Debian/debian/patches/loadparm.patch
+++ b/packaging/Debian/debian/patches/loadparm.patch
@@ -1,7 +1,6 @@
-diff -uNr samba-2.2.5pre1.orig/source/param/loadparm.c samba-2.2.5pre1/source/param/loadparm.c
---- samba-2.2.5pre1.orig/source/param/loadparm.c Wed Jun 12 15:42:59 2002
-+++ samba-2.2.5pre1/source/param/loadparm.c Wed Jun 12 15:43:10 2002
-@@ -1128,26 +1128,26 @@
+--- samba-2.2.5/source/param/loadparm.c.orig Tue Jun 18 23:15:07 2002
++++ samba-2.2.5/source/param/loadparm.c Tue Jun 18 23:15:07 2002
+@@ -1149,26 +1149,26 @@
case PRINT_AIX:
case PRINT_LPRNT:
case PRINT_LPROS2:
@@ -38,7 +37,7 @@ diff -uNr samba-2.2.5pre1.orig/source/param/loadparm.c samba-2.2.5pre1/source/pa
break;
case PRINT_CUPS:
-@@ -1163,19 +1163,19 @@
+@@ -1184,19 +1184,19 @@
string_set(&Globals.szPrintcapname, "cups");
#else
string_set(&sDefault.szLpqcommand,
@@ -65,7 +64,7 @@ diff -uNr samba-2.2.5pre1.orig/source/param/loadparm.c samba-2.2.5pre1/source/pa
string_set(&Globals.szPrintcapname, "lpstat");
#endif /* HAVE_CUPS */
break;
-@@ -1492,7 +1492,10 @@
+@@ -1515,7 +1515,10 @@
else
StrnCpy(ret, s, len);
@@ -75,5 +74,5 @@ diff -uNr samba-2.2.5pre1.orig/source/param/loadparm.c samba-2.2.5pre1/source/pa
+ StrnCpy(ret, s, len);
+ }
- standard_sub_basic(ret);
+ standard_sub_basic(ret, len + 100);
return (ret);