Changeset 989 for vendor/current/ctdb/common

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/ctdb/common

Files:

• pidfile.c (added)
• pidfile.h (added)
• rb_tree.c (modified) (3 diffs)
• system_linux.c (modified) (4 diffs)

vendor/current/ctdb/common/rb_tree.c

@@ -217 +217 @@
 static inline void trbt_set_color(trbt_node_t *node, int color)
 {
-        if ( (node==NULL) && (color==TRBT_BLACK) ) {
+        if (node == NULL) {
                 return;
         }
@@ -224 +224 @@
 static inline void trbt_set_color_left(trbt_node_t *node, int color)
 {
-        if ( ((node==NULL)||(node->left==NULL)) && (color==TRBT_BLACK) ) {
+        if (node == NULL || node->left == NULL) {
                 return;
         }
@@ -231 +231 @@
 static inline void trbt_set_color_right(trbt_node_t *node, int color)
 {
-        if ( ((node==NULL)||(node->right==NULL)) && (color==TRBT_BLACK) ) {
+        if (node == NULL || node->right == NULL) {
                 return;
         }

vendor/current/ctdb/common/system_linux.c

@@ -116 +116 @@
 
                 /* get the mac address */
-                strncpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name)-1);
+                strlcpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name));
                 ret = ioctl(s, SIOCGIFHWADDR, &if_hwaddr);
                 if ( ret < 0 ) {
@@ -202 +202 @@
 
                 DEBUG(DEBUG_DEBUG, (__location__ " Created SOCKET FD:%d for sending arp\n", s));
-                strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
+                strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
                 if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
                         DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));
@@ -210 +210 @@
 
                 /* get the mac address */
-                strncpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name)-1);
+                strlcpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name));
                 ret = ioctl(s, SIOCGIFHWADDR, &if_hwaddr);
                 if ( ret < 0 ) {
@@ -589 +589 @@
         }
 
-        strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
+        strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
         if (ioctl(s, SIOCGIFINDEX, &ifr) < 0 && errno == ENODEV) {
                 DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));