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

jra at samba.org jra at samba.org
Thu Mar 1 22:15:32 GMT 2007


Author: jra
Date: 2007-03-01 22:15:30 +0000 (Thu, 01 Mar 2007)
New Revision: 21643

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

Log:
Put the correct bits on the wire for posix_mkdir.
We're not yet deleting open files on unlink. Investigating...
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 22:12:49 UTC (rev 21642)
+++ branches/SAMBA_3_0/source/libsmb/clifile.c	2007-03-01 22:15:30 UTC (rev 21643)
@@ -1783,8 +1783,8 @@
 		case O_RDWR:
 			ret |= SMB_O_RDWR;
 			break;
+		default:
 		case O_RDONLY:
-		default:
 			ret |= SMB_O_RDONLY;
 			break;
 	}
@@ -1811,6 +1811,7 @@
 #endif
 #if defined(O_DIRECTORY)
 	if (flags & O_DIRECTORY) {
+		ret &= ~(SMB_O_RDONLY|SMB_O_RDWR|SMB_O_WRONLY);
 		ret |= SMB_O_DIRECTORY;
 	}
 #endif

Modified: branches/SAMBA_3_0_25/source/libsmb/clifile.c
===================================================================
--- branches/SAMBA_3_0_25/source/libsmb/clifile.c	2007-03-01 22:12:49 UTC (rev 21642)
+++ branches/SAMBA_3_0_25/source/libsmb/clifile.c	2007-03-01 22:15:30 UTC (rev 21643)
@@ -1792,8 +1792,8 @@
 		case O_RDWR:
 			ret |= SMB_O_RDWR;
 			break;
+		default:
 		case O_RDONLY:
-		default:
 			ret |= SMB_O_RDONLY;
 			break;
 	}
@@ -1820,6 +1820,7 @@
 #endif
 #if defined(O_DIRECTORY)
 	if (flags & O_DIRECTORY) {
+		ret &= ~(SMB_O_RDONLY|SMB_O_RDWR|SMB_O_WRONLY);
 		ret |= SMB_O_DIRECTORY;
 	}
 #endif



More information about the samba-cvs mailing list