Changeset 739 for branches/samba-3.5.x/source3/smbd/server.c

Timestamp:

Nov 12, 2012, 7:37:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.19

File:

• branches/samba-3.5.x/source3/smbd/server.c (modified) (6 diffs)

branches/samba-3.5.x/source3/smbd/server.c

@@ -561 +561 @@
         int i;
         char *ports;
+        char *tok;
+        const char *ptr;
         unsigned dns_port = 0;
 
@@ -582 +584 @@
         }
 
+        for (ptr = ports;
+             next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
+                unsigned port = atoi(tok);
+
+                if (port == 0 || port > 0xffff) {
+                        exit_server_cleanly("Invalid port in the config or on "
+                                            "the commandline specified!");
+                }
+        }
+
         if (lp_interfaces() && lp_bind_interfaces_only()) {
                 /* We have been given an interfaces line, and been
@@ -593 +605 @@
                         const struct sockaddr_storage *ifss =
                                         iface_n_sockaddr_storage(i);
-                        char *tok;
-                        const char *ptr;
 
                         if (ifss == NULL) {
@@ -606 +616 @@
                              next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
                                 unsigned port = atoi(tok);
-                                if (port == 0 || port > 0xffff) {
-                                        continue;
-                                }
 
                                 /* Keep the first port for mDNS service
@@ -626 +633 @@
                    from anywhere. */
 
-                char *tok;
-                const char *ptr;
                 const char *sock_addr = lp_socket_address();
                 char *sock_tok;
@@ -645 +650 @@
                         for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, &tok, " \t,"); ) {
                                 struct sockaddr_storage ss;
-
                                 unsigned port = atoi(tok);
-                                if (port == 0 || port > 0xffff) {
-                                        continue;
-                                }
 
                                 /* Keep the first port for mDNS service