Changeset 1037 for trunk/server

Timestamp:

Aug 18, 2017, 4:41:48 PM (8 years ago)

Author:

Silvan Scherrer

Message:

samba server: prevent extra LF in case of printing

Location:

trunk/server/source3/printing

Files:

• printing.c (modified) (1 diff)
• printspoolss.c (modified) (2 diffs)

trunk/server/source3/printing/printing.c

@@ -2955 +2955 @@
         pjob->fd = mkstemp(pjob->filename);
 
+#ifdef __OS2__
+        if (pjob->fd >= 0)
+                setmode(pjob->fd, O_BINARY);
+#endif
         if (pjob->fd == -1) {
                 werr = map_werror_from_unix(errno);

trunk/server/source3/printing/printspoolss.c

@@ -25 +25 @@
 #include "smbd/globals.h"
 #include "../libcli/security/security.h"
-
+#ifdef __OS2__
+#include <sys/fcntl.h>
+#endif
 void print_spool_terminate(struct connection_struct *conn,
                            struct print_file_data *print_file);
@@ -109 +111 @@
         errno = 0;
         fd = mkstemp(pf->filename);
+#ifdef __OS2__
+        if (fd >= 0)
+                setmode(fd, O_BINARY);
+#endif
         if (fd == -1) {
                 if (errno == EACCES) {