Changeset 740 for vendor/current/source4/smb_server/smb_samba3.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/smb_server/smb_samba3.c (modified) (9 diffs)

vendor/current/source4/smb_server/smb_samba3.c ¶

@@ -40 +40 @@
         char *argv[2];
         char *reason;
-        extern char **environ;
 
         close(0);
@@ -51 +50 @@
         }
 
-        prog = lp_parm_string(conn->lp_ctx, NULL, "samba3", "smbd");
+        prog = lpcfg_parm_string(conn->lp_ctx, NULL, "samba3", "smbd");
 
         if (prog == NULL) {
@@ -66 +65 @@
         argv[1] = NULL;
 
-        execve(argv[0], argv, environ);
+        execv(argv[0], argv);
 
         /*
@@ -88 +87 @@
   setup a listening socket on all the SMB ports for a particular address
 */
-static NTSTATUS samba3_add_socket(struct tevent_context *event_context,
+static NTSTATUS samba3_add_socket(struct task_server *task,
+                                  struct tevent_context *event_context,
                                   struct loadparm_context *lp_ctx,
                                   const struct model_ops *model_ops,
                                   const char *address)
 {
-        const char **ports = lp_smb_ports(lp_ctx);
+        const char **ports = lpcfg_smb_ports(lp_ctx);
         int i;
         NTSTATUS status;
@@ -100 +100 @@
                 uint16_t port = atoi(ports[i]);
                 if (port == 0) continue;
-                status = stream_setup_socket(event_context, lp_ctx,
+                status = stream_setup_socket(task, event_context, lp_ctx,
                                              model_ops, &samba3_smb_stream_ops,
                                              "ip", address, &port,
-                                             lp_socket_options(lp_ctx),
+                                             lpcfg_socket_options(lp_ctx),
                                              NULL);
                 NT_STATUS_NOT_OK_RETURN(status);
@@ -120 +120 @@
         const struct model_ops *model_ops;
 
-        model_ops = process_model_startup(task->event_ctx, "standard");
+        model_ops = process_model_startup("standard");
 
         if (model_ops == NULL) {
@@ -128 +128 @@
         task_server_set_title(task, "task[samba3_smb]");
 
-        if (lp_interfaces(task->lp_ctx)
-            && lp_bind_interfaces_only(task->lp_ctx)) {
+        if (lpcfg_interfaces(task->lp_ctx)
+            && lpcfg_bind_interfaces_only(task->lp_ctx)) {
                 int num_interfaces;
                 int i;
                 struct interface *ifaces;
 
-                load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
+                load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
 
                 num_interfaces = iface_count(ifaces);
@@ -144 +144 @@
                 for(i = 0; i < num_interfaces; i++) {
                         const char *address = iface_n_ip(ifaces, i);
-                        status = samba3_add_socket(task->event_ctx,
+                        status = samba3_add_socket(task,
+                                                   task->event_ctx,
                                                    task->lp_ctx,
                                                    model_ops, address);
@@ -150 +151 @@
                 }
         } else {
-                /* Just bind to lp_socket_address() (usually 0.0.0.0) */
-                status = samba3_add_socket(task->event_ctx, task->lp_ctx,
+                /* Just bind to lpcfg_socket_address() (usually 0.0.0.0) */
+                status = samba3_add_socket(task,
+                                           task->event_ctx, task->lp_ctx,
                                            model_ops,
-                                           lp_socket_address(task->lp_ctx));
+                                           lpcfg_socket_address(task->lp_ctx));
                 if (!NT_STATUS_IS_OK(status)) goto failed;
         }