Changeset 989 for vendor/current/lib

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/lib

Files:

• async_req/async_sock.c (modified) (1 diff)
• ldb-samba/ldb_matching_rules.c (modified) (1 diff)
• ldb-samba/ldif_handlers.c (modified) (1 diff)
• param/loadparm.c (modified) (1 diff)
• replace/replace.h (modified) (2 diffs)
• replace/snprintf.c (modified) (2 diffs)
• tevent/tevent.h (modified) (1 diff)
• torture/torture.h (modified) (1 diff)
• util/attr.h (modified) (7 diffs)
• util/become_daemon.c (modified) (5 diffs)
• util/debug.c (modified) (3 diffs)
• util/wscript_build (modified) (2 diffs)

vendor/current/lib/async_req/async_sock.c

@@ -129 +129 @@
 
         /*
-         * The only errno indicating that the connect is still in
-         * flight is EINPROGRESS, everything else is an error
+         * The only errno indicating that an initial connect is still
+         * in flight is EINPROGRESS.
+         *
+         * We get EALREADY when someone calls us a second time for a
+         * given fd and the connect is still in flight (and returned
+         * EINPROGRESS the first time).
+         *
+         * This allows callers like open_socket_out_send() to reuse
+         * fds and call us with an fd for which the connect is still
+         * in flight. The proper thing to do for callers would be
+         * closing the fd and starting from scratch with a fresh
+         * socket.
          */
 
-        if (errno != EINPROGRESS) {
+        if (errno != EINPROGRESS && errno != EALREADY) {
                 tevent_req_error(req, errno);
                 return tevent_req_post(req, ev);

vendor/current/lib/ldb-samba/ldb_matching_rules.c

@@ -207 +207 @@
         const char *dn_oid;
         unsigned int count;
-        struct dsdb_dn **visited;
+        struct dsdb_dn **visited = NULL;
 
         schema = dsdb_get_schema(ldb, mem_ctx);

vendor/current/lib/ldb-samba/ldif_handlers.c

@@ -1652 +1652 @@
 }
 
-static const char *secret_attributes[] = {DSDB_SECRET_ATTRIBUTES, NULL};
+static const char *secret_attributes[] = {DSDB_SECRET_ATTRIBUTES, "secret", NULL};
 
 /*

vendor/current/lib/param/loadparm.c

@@ -2570 +2570 @@
         lpcfg_do_global_parameter(lp_ctx, "max connections", "0");
 
-        lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver");
+        lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver");
         lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbindd ntp_signd kcc dnsupdate dns");
         lpcfg_do_global_parameter(lp_ctx, "kccsrv:samba_kcc", "false");

vendor/current/lib/replace/replace.h

@@ -426 +426 @@
 
 #ifndef PRINTF_ATTRIBUTE
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
  * the parameter containing the format, and a2 the index of the first
@@ -438 +438 @@
 
 #ifndef _DEPRECATED_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _DEPRECATED_ __attribute__ ((deprecated))
 #else

vendor/current/lib/replace/snprintf.c

@@ -805 +805 @@
         int signvalue = 0;
         unsigned LLONG uvalue;
-        char convert[20];
+        char convert[22+1]; /* 64-bit value in octal: 22 digits + \0 */
         int place = 0;
         int spadlen = 0; /* amount to space pad */
@@ -835 +835 @@
                         [uvalue % (unsigned)base  ];
                 uvalue = (uvalue / (unsigned)base );
-        } while(uvalue && (place < 20));
-        if (place == 20) place--;
+        } while(uvalue && (place < sizeof(convert)));
+        if (place == sizeof(convert)) place--;
         convert[place] = 0;
 

vendor/current/lib/tevent/tevent.h

@@ -1753 +1753 @@
 #ifdef TEVENT_DEPRECATED
 #ifndef _DEPRECATED_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _DEPRECATED_ __attribute__ ((deprecated))
 #else

vendor/current/lib/torture/torture.h

@@ -480 +480 @@
         } while(0)
 
+#define torture_assert_u64_not_equal_goto(torture_ctx,got,not_expected,ret,label,cmt)\
+        do { uint64_t __got = (got), __not_expected = (not_expected); \
+        if (__got == __not_expected) { \
+                torture_result(torture_ctx, TORTURE_FAIL, \
+                        __location__": "#got" was %llu (0x%llX), expected a different number: %s", \
+                        (unsigned long long)__got, (unsigned long long)__got, \
+                        cmt); \
+                ret = false; \
+                goto label; \
+        } \
+        } while(0)
+
 #define torture_assert_errno_equal(torture_ctx,expected,cmt)\
         do { int __expected = (expected); \

vendor/current/lib/util/attr.h

@@ -36 +36 @@
 
 #ifndef _DEPRECATED_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _DEPRECATED_ __attribute__ ((deprecated))
 #else
@@ -44 +44 @@
 
 #ifndef _WARN_UNUSED_RESULT_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _WARN_UNUSED_RESULT_ __attribute__ ((warn_unused_result))
 #else
@@ -52 +52 @@
 
 #ifndef _NORETURN_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _NORETURN_ __attribute__ ((noreturn))
 #else
@@ -60 +60 @@
 
 #ifndef _PURE_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1)
+#ifdef HAVE___ATTRIBUTE__
 #define _PURE_ __attribute__((pure))
 #else
@@ -68 +68 @@
 
 #ifndef NONNULL
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1)
+#ifdef HAVE___ATTRIBUTE__
 #define NONNULL(param) param __attribute__((nonnull))
 #else
@@ -76 +76 @@
 
 #ifndef PRINTF_ATTRIBUTE
-#if __GNUC__ >= 3
+#ifdef HAVE___ATTRIBUTE__
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
  * the parameter containing the format, and a2 the index of the first
@@ -88 +88 @@
 
 #ifndef FORMAT_ATTRIBUTE
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#ifdef HAVE___ATTRIBUTE__
 /** Use gcc attribute to check printf fns.  a1 is argument to format()
  * in the above macro.  This is needed to support Heimdal's printf
  * decorations. Note that some gcc 2.x versions don't handle this
- * properly, and as such I've used the same minimum from heimdal: GCC 3.1 **/
+ * properly. **/
 #define FORMAT_ATTRIBUTE(a) __attribute__ ((format a))
 #else

vendor/current/lib/util/become_daemon.c

@@ -25 +25 @@
 #include "system/filesys.h"
 #include "system/locale.h"
-#if HAVE_LIBSYSTEMD_DAEMON
+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
 #include <systemd/sd-daemon.h>
 #endif
@@ -70 +70 @@
                 newpid = fork();
                 if (newpid) {
-#if HAVE_LIBSYSTEMD_DAEMON
+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
                         sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid);
 #endif /* HAVE_LIBSYSTEMD_DAEMON */
@@ -99 +99 @@
 _PUBLIC_ void exit_daemon(const char *msg, int error)
 {
-#ifdef HAVE_LIBSYSTEMD_DAEMON
+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
         if (msg == NULL) {
                 msg = strerror(error);
@@ -118 +118 @@
                 name = "Samba";
         }
-#ifdef HAVE_LIBSYSTEMD_DAEMON
+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
         sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name);
 #endif
@@ -130 +130 @@
                 name = "Samba";
         }
-#ifdef HAVE_LIBSYSTEMD_DAEMON
+#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD)
         sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
 #endif

vendor/current/lib/util/debug.c

@@ -103 +103 @@
 };
 
-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL)
+#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD)
 static int debug_level_to_priority(int level)
 {
@@ -180 +180 @@
 #endif /* WITH_SYSLOG */
 
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
+#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD)
 #include <systemd/sd-journal.h>
 static void debug_systemd_log(int msg_level,
@@ -252 +252 @@
 #endif
 
-#ifdef HAVE_LIBSYSTEMD_JOURNAL
+#if defined(HAVE_LIBSYSTEMD_JOURNAL) || defined(HAVE_LIBSYSTEMD)
         {
                 .name = "systemd",

vendor/current/lib/util/wscript_build

@@ -70 +70 @@
                     local_include=False)
 
-bld.SAMBA_LIBRARY('tevent-unix-util',
-                  source='tevent_unix.c',
-                  local_include=False,
-                  deps='tevent',
-                  public_headers='tevent_unix.h',
-                  header_path=[ ('*', 'util') ],
-                  pc_files=[],
-                  vnum='0.0.1')
+if bld.env.SAMBA_UTIL_CORE_ONLY:
 
-if not bld.env.SAMBA_UTIL_CORE_ONLY:
+    bld.SAMBA_LIBRARY('tevent-util',
+                      source='tevent_unix.c',
+                      local_include=False,
+                      deps='tevent',
+                      private_library=True)
+
+else:
 
     bld.env.public_headers_skip.append('charset_compat.h')
@@ -142 +141 @@
 
     bld.SAMBA_LIBRARY('tevent-util',
-                      source='tevent_ntstatus.c tevent_werror.c',
+                      source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
                       local_include=False,
-                      public_deps='tevent samba-errors tevent-unix-util',
-                      public_headers='tevent_ntstatus.h tevent_werror.h',
+                      public_deps='tevent samba-errors',
+                      public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
                       header_path=[ ('*', 'util') ],
                       pc_files=[],