File dhcp-3.0.4-ldap-patch-strncat.diff of Package dhcp

Overview Repositories Revisions Requests Users Attributes Meta

File dhcp-3.0.4-ldap-patch-strncat.diff of Package dhcp (Revision 5bad4d395eab9785e77a86c0d0bf0ad1)

Currently displaying revision 5bad4d395eab9785e77a86c0d0bf0ad1 , Show latest

--- server/ldap.c
+++ server/ldap.c	2006/08/28 16:12:55
@@ -63,6 +63,13 @@ typedef struct ldap_dn_node {
 static ldap_dn_node *ldap_service_dn_head = NULL;
 static ldap_dn_node *ldap_service_dn_tail = NULL;
 
+
+static char *
+x_strncat(char *dst, const char *src, size_t dst_size)
+{
+	size_t len = strlen(dst);
+	return strncat(dst, src, dst_size > len ? dst_size - len - 1: 0);
+}
 
 static void
 ldap_parse_class (struct ldap_config_stack *item, struct parse *cfile)
@@ -78,9 +83,9 @@ ldap_parse_class (struct ldap_config_sta
       return;
     }
 
-  strncat (cfile->inbuf, "class \"", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, "\" {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "class \"", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "\" {\n", LDAP_BUFFER_SIZE);
 
   item->close_brace = 1;
   ldap_value_free (tempstr);
@@ -112,11 +117,11 @@ ldap_parse_subclass (struct ldap_config_
       return;
     }
 
-  strncat (cfile->inbuf, "subclass ", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, classdata[0], LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "subclass ", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, classdata[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE);
 
   item->close_brace = 1;
   ldap_value_free (tempstr);
@@ -140,14 +145,14 @@ ldap_parse_host (struct ldap_config_stac
 
   hwaddr = ldap_get_values (ld, item->ldent, "dhcpHWAddress");
 
-  strncat (cfile->inbuf, "host ", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "host ", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
 
   if (hwaddr != NULL && hwaddr[0] != NULL)
     {
-      strncat (cfile->inbuf, " {\nhardware ", LDAP_BUFFER_SIZE);
-      strncat (cfile->inbuf, hwaddr[0], LDAP_BUFFER_SIZE);
-      strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, " {\nhardware ", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, hwaddr[0], LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
       ldap_value_free (hwaddr);
     }
 
@@ -171,9 +176,9 @@ ldap_parse_shared_network (struct ldap_c
       return;
     }
 
-  strncat (cfile->inbuf, "shared-network \"", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, "\" {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "shared-network \"", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "\" {\n", LDAP_BUFFER_SIZE);
 
   item->close_brace = 1;
   ldap_value_free (tempstr);
@@ -224,14 +229,14 @@ ldap_parse_subnet (struct ldap_config_st
       return;
     }
 
-  strncat (cfile->inbuf, "subnet ", LDAP_BUFFER_SIZE);
-  strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "subnet ", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
 
-  strncat (cfile->inbuf, " netmask ", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, " netmask ", LDAP_BUFFER_SIZE);
   parse_netmask (strtol (netmaskstr[0], NULL, 10), netmaskbuf);
-  strncat (cfile->inbuf, netmaskbuf, LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, netmaskbuf, LDAP_BUFFER_SIZE);
 
-  strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE);
 
   ldap_value_free (tempstr);
   ldap_value_free (netmaskstr);
@@ -240,10 +245,10 @@ ldap_parse_subnet (struct ldap_config_st
     {
       for (i=0; tempstr[i] != NULL; i++)
         {
-          strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
-          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
-          strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
-          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
         }
       ldap_value_free (tempstr);
     }
@@ -258,17 +263,17 @@ ldap_parse_pool (struct ldap_config_stac
   char **tempstr;
   int i;
 
-  strncat (cfile->inbuf, "pool {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "pool {\n", LDAP_BUFFER_SIZE);
 
   if ((tempstr = ldap_get_values (ld, item->ldent, "dhcpRange")) != NULL)
     {
-      strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
       for (i=0; tempstr[i] != NULL; i++)
         {
-          strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
-          strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
         }
-      strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
       ldap_value_free (tempstr);
     }
 
@@ -276,8 +281,8 @@ ldap_parse_pool (struct ldap_config_stac
     {
       for (i=0; tempstr[i] != NULL; i++)
         {
-          strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
-          strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, tempstr[i], LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
         }
       ldap_value_free (tempstr);
     }
@@ -289,7 +294,7 @@ ldap_parse_pool (struct ldap_config_stac
 static void
 ldap_parse_group (struct ldap_config_stack *item, struct parse *cfile)
 {
-  strncat (cfile->inbuf, "group {\n", LDAP_BUFFER_SIZE);
+  x_strncat (cfile->inbuf, "group {\n", LDAP_BUFFER_SIZE);
   item->close_brace = 1;
 }
 
@@ -625,7 +630,7 @@ next_ldap_entry (struct parse *cfile)
 
   if (ldap_stack != NULL && ldap_stack->close_brace)
     {
-      strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
       ldap_stack->close_brace = 0;
     }
 
@@ -635,7 +640,7 @@ next_ldap_entry (struct parse *cfile)
     {
       if (ldap_stack->close_brace)
         {
-          strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
+          x_strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
           ldap_stack->close_brace = 0;
         }
 
@@ -646,7 +651,7 @@ next_ldap_entry (struct parse *cfile)
 
   if (ldap_stack != NULL && ldap_stack->close_brace)
     {
-      strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
+      x_strncat (cfile->inbuf, "}\n", LDAP_BUFFER_SIZE);
       ldap_stack->close_brace = 0;
     }
 }
@@ -722,16 +727,16 @@ ldap_parse_entry_options (LDAPMessage *e
               continue;
             }
 
-          strncat (buffer, tempstr[i], size);
+          x_strncat (buffer, tempstr[i], size);
 
           switch((int) check_statement_end (tempstr[i]))
             {
               case '}':
               case ';':
-                strncat (buffer, "\n", size);
+                x_strncat (buffer, "\n", size);
                 break;
               default:
-                strncat (buffer, ";\n", size);
+                x_strncat (buffer, ";\n", size);
                 break;
             }
         }
@@ -742,15 +747,15 @@ ldap_parse_entry_options (LDAPMessage *e
     {
       for (i=0; tempstr[i] != NULL; i++)
         {
-          strncat (buffer, "option ", size);
-          strncat (buffer, tempstr[i], size);
+          x_strncat (buffer, "option ", size);
+          x_strncat (buffer, tempstr[i], size);
           switch ((int) check_statement_end (tempstr[i]))
             {
               case ';':
-                strncat (buffer, "\n", size);
+                x_strncat (buffer, "\n", size);
                 break;
               default:
-                strncat (buffer, ";\n", size);
+                x_strncat (buffer, ";\n", size);
                 break;
             }
         }

Places

File dhcp-3.0.4-ldap-patch-strncat.diff of Package dhcp (Revision 5bad4d395eab9785e77a86c0d0bf0ad1)

Places