Changeset 988 for vendor/current/tests

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/tests

Files:

• crypttest.c (deleted)
• fcntl_lock.c (modified) (2 diffs)
• fcntl_lock64.c (deleted)
• oldquotas.c (added)
• summary.c (modified) (1 diff)
• sysquotas.c (added)

vendor/current/tests/fcntl_lock.c

@@ -63 +63 @@
                 lock.l_type = F_WRLCK;
                 lock.l_whence = SEEK_SET;
-                lock.l_start = 0;
+                lock.l_start = 0x100000000LL;
                 lock.l_len = 4;
                 lock.l_pid = getpid();
@@ -93 +93 @@
         lock.l_whence = SEEK_SET;
         lock.l_start = 0;
-        lock.l_len = 4;
+        lock.l_len = 0x100000004LL;
         lock.l_pid = getpid();
 
-        /* set a 4 byte write lock */
-        fcntl(fd,F_SETLK,&lock);
+        /* set a 100000004 byte write lock, should conflict with the above */
+        ret = fcntl(fd,F_SETLK,&lock);
 
         sys_waitpid(pid, &status, 0);
 
         unlink(DATA);
+
+        if (ret != 0) {
+                fprintf(stderr,"ERROR: failed to lock %s (errno=%d)\n", 
+                        DATA, (int)errno);
+                exit(1);
+        }
+
+        if (lock.l_len < 0x100000004LL) {
+                fprintf(stderr,"ERROR: settign lock overflowed\n");
+                exit(1);
+        }
 
 #if defined(WIFEXITED) && defined(WEXITSTATUS)

vendor/current/tests/summary.c

@@ -3 +3 @@
 void exit(int);
 
-main()
+int main()
 {
-    exit (0);
-#if !(defined(HAVE_FCNTL_LOCK) || defined(HAVE_STRUCT_FLOCK64))
-        printf("ERROR: No locking available. Running Samba would be unsafe\n");
-        exit(1);
+#if !defined(HAVE_FCNTL_LOCK)
+#error "ERROR: No locking available. Running Samba would be unsafe"
 #endif
 
-#if !(defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
-        printf("WARNING: No automated network interface determination\n");
+#if !(defined(HAVE_IFACE_GETIFADDRS) || defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
+#warning "WARNING: No automated network interface determination"
 #endif
 
-#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX))
-        printf("ERROR: no seteuid method available\n");
-        exit(1);
+#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(USE_LINUX_THREAD_CREDENTIALS))
+#error "ERROR: no seteuid method available"
 #endif
 
-#if !(defined(STAT_STATVFS) || defined(STAT_STATVFS64) || defined(STAT_STATFS3_OSF1) || defined(STAT_STATFS2_BSIZE) || defined(STAT_STATFS4) || defined(STAT_STATFS2_FSIZE) || defined(STAT_STATFS2_FS_DATA))
-        printf("ERROR: No disk free routine!\n");
-        exit(1);
+#if !(defined(STAT_STATVFS) || defined(STAT_STATFS3_OSF1) || defined(STAT_STATFS2_BSIZE) || defined(STAT_STATFS4) || defined(STAT_STATFS2_FSIZE) || defined(STAT_STATFS2_FS_DATA))
+#error "ERROR: No disk free routine!"
 #endif
 
 #if !((defined(HAVE_RANDOM) || defined(HAVE_RAND)) && (defined(HAVE_SRANDOM) || defined(HAVE_SRAND)))
-    printf("ERROR: No random or srandom routine!\n");
-    exit(1);
+#error "ERROR: No random or srandom routine!"
 #endif