Changeset 454 for trunk/server/source3/passdb/pdb_smbpasswd.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/passdb/pdb_smbpasswd.c (modified) (6 diffs)

trunk/server/source3/passdb/pdb_smbpasswd.c

@@ -277 +277 @@
                          */
 
+#ifndef __OS2__
                         if (sys_stat(pfile, &sbuf1, false) != 0) {
                                 DEBUG(0, ("startsmbfilepwent_internal: unable to stat file %s. \
@@ -294 +295 @@
 
                         if( sbuf1.st_ex_ino == sbuf2.st_ex_ino) {
+#else
                                 /* No race. */
+                        {
+#endif
                                 break;
                         }
@@ -315 +319 @@
         setvbuf(fp, (char *)NULL, _IOFBF, 1024);
 
+#ifndef __OS2__
         /* Make sure it is only rw by the owner */
 #ifdef HAVE_FCHMOD
@@ -327 +332 @@
                 return NULL;
         }
+#endif
 
         /* We have a lock on the file. */
@@ -1168 +1174 @@
          * Do an atomic rename - then release the locks.
          */
+#ifdef __OS2__
+        endsmbfilepwent(fp, &smbpasswd_state->pw_file_lock_depth);
+        endsmbfilepwent(fp_write,&pfile2_lockdepth);
+#endif
 
         if(rename(pfile2,pfile) != 0) {
@@ -1173 +1183 @@
         }
 
+#ifndef __OS2__
         endsmbfilepwent(fp, &smbpasswd_state->pw_file_lock_depth);
         endsmbfilepwent(fp_write,&pfile2_lockdepth);
+#endif
         return True;
 }