svn commit: samba r21640 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_25/source/libsmb

[jra at samba.org]

Author: jra
Date: 2007-03-01 21:36:05 +0000 (Thu, 01 Mar 2007)
New Revision: 21640

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21640

Log:
Fix the build for broken platoforms without O_DIRECT or O_DIRECTORY.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifile.c
   branches/SAMBA_3_0_25/source/libsmb/clifile.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifile.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clifile.c	2007-03-01 21:05:29 UTC (rev 21639)
+++ branches/SAMBA_3_0/source/libsmb/clifile.c	2007-03-01 21:36:05 UTC (rev 21640)
@@ -1804,12 +1804,16 @@
 	if (flags & O_APPEND) {
 		ret |= SMB_O_APPEND;
 	}
+#if defined(O_DIRECT)
 	if (flags & O_DIRECT) {
 		ret |= SMB_O_DIRECT;
 	}
+#endif
+#if defined(O_DIRECTORY)
 	if (flags & O_DIRECTORY) {
 		ret |= SMB_O_DIRECTORY;
 	}
+#endif
 	return ret;
 }
 
@@ -1875,7 +1879,12 @@
 
 int cli_posix_mkdir(struct cli_state *cli, const char *fname, mode_t mode)
 {
+#if defined(O_DIRECTORY)
 	return (cli_posix_open(cli, fname, O_CREAT|O_DIRECTORY, mode) == -1) ? -1 : 0;
+#else
+	cli_set_nt_error(cli, NT_STATUS_NOT_IMPLEMENTED);
+	return -1;
+#endif
 }
 
 /****************************************************************************

Modified: branches/SAMBA_3_0_25/source/libsmb/clifile.c
===================================================================
--- branches/SAMBA_3_0_25/source/libsmb/clifile.c	2007-03-01 21:05:29 UTC (rev 21639)
+++ branches/SAMBA_3_0_25/source/libsmb/clifile.c	2007-03-01 21:36:05 UTC (rev 21640)
@@ -1813,12 +1813,16 @@
 	if (flags & O_APPEND) {
 		ret |= SMB_O_APPEND;
 	}
+#if defined(O_DIRECT)
 	if (flags & O_DIRECT) {
 		ret |= SMB_O_DIRECT;
 	}
+#endif
+#if defined(O_DIRECTORY)
 	if (flags & O_DIRECTORY) {
 		ret |= SMB_O_DIRECTORY;
 	}
+#endif
 	return ret;
 }
 
@@ -1884,7 +1888,12 @@
 
 int cli_posix_mkdir(struct cli_state *cli, const char *fname, mode_t mode)
 {
+#if defined(O_DIRECTORY)
 	return (cli_posix_open(cli, fname, O_CREAT|O_DIRECTORY, mode) == -1) ? -1 : 0;
+#else
+	cli_set_nt_error(cli, NT_STATUS_NOT_IMPLEMENTED);
+	return -1;
+#endif
 }
 
 /****************************************************************************