Changeset 224 for branches/samba-3.3.x/source/utils

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

Location:

branches/samba-3.3.x/source/utils

Files:

• net.c (modified) (1 diff)
• net.h (modified) (1 diff)
• net_conf.c (modified) (12 diffs)
• net_rpc.c (modified) (9 diffs)
• net_rpc_join.c (modified) (1 diff)
• net_rpc_service.c (modified) (3 diffs)
• net_util.c (modified) (1 diff)
• smbpasswd.c (modified) (1 diff)

branches/samba-3.3.x/source/utils/net.c

@@ -636 +636 @@
                 {"stdin",       'i', POPT_ARG_NONE,   &c->opt_stdin},
                 {"timeout",     't', POPT_ARG_INT,    &c->opt_timeout},
+                {"request-timeout",0,POPT_ARG_INT,    &c->opt_request_timeout},
                 {"machine-pass",'P', POPT_ARG_NONE,   &c->opt_machine_pass},
                 {"kerberos",    'k', POPT_ARG_NONE,   &c->opt_kerberos},

branches/samba-3.3.x/source/utils/net.h

@@ -44 +44 @@
         int opt_flags;
         int opt_timeout;
+        int opt_request_timeout;
         const char *opt_target_workgroup;
         int opt_machine_pass;

branches/samba-3.3.x/source/utils/net_conf.c

@@ -301 +301 @@
                         goto done;
                 case 2:
-                        servicename = talloc_strdup_lower(mem_ctx, argv[1]);
+                        servicename = talloc_strdup(mem_ctx, argv[1]);
                         if (servicename == NULL) {
                                 d_printf("error: out of memory!\n");
@@ -341 +341 @@
                         goto cancel;
                 }
+
+                werr = smbconf_transaction_start(conf_ctx);
+                if (!W_ERROR_IS_OK(werr)) {
+                        d_printf("error starting transaction: %s\n",
+                                 dos_errstr(werr));
+                        goto done;
+                }
+
                 werr = import_process_service(c, conf_ctx, service);
                 if (!W_ERROR_IS_OK(werr)) {
@@ -502 +510 @@
         }
 
-        sharename = talloc_strdup_lower(mem_ctx, argv[0]);
+        sharename = talloc_strdup(mem_ctx, argv[0]);
         if (sharename == NULL) {
                 d_printf("error: out of memory!\n");
@@ -515 +523 @@
         }
 
-        d_printf("[%s]\n", sharename);
+        d_printf("[%s]\n", service->name);
 
         for (count = 0; count < service->num_params; count++) {
@@ -601 +609 @@
                 case 2:
                         path = argv[1];
-                        sharename = talloc_strdup_lower(mem_ctx, argv[0]);
+                        sharename = talloc_strdup(mem_ctx, argv[0]);
                         if (sharename == NULL) {
                                 d_printf("error: out of memory!\n");
@@ -729 +737 @@
                 goto done;
         }
-        sharename = talloc_strdup_lower(mem_ctx, argv[0]);
+        sharename = talloc_strdup(mem_ctx, argv[0]);
         if (sharename == NULL) {
                 d_printf("error: out of memory!\n");
@@ -762 +770 @@
                 goto done;
         }
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");
@@ -814 +822 @@
                 goto done;
         }
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");
@@ -864 +872 @@
                 goto done;
         }
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");
@@ -917 +925 @@
         }
 
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");
@@ -957 +965 @@
         }
 
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");
@@ -997 +1005 @@
         }
 
-        service = talloc_strdup_lower(mem_ctx, argv[0]);
+        service = talloc_strdup(mem_ctx, argv[0]);
         if (service == NULL) {
                 d_printf("error: out of memory!\n");

branches/samba-3.3.x/source/utils/net_rpc.c

@@ -121 +121 @@
         DOM_SID *domain_sid;
         const char *domain_name;
+        int ret = -1;
 
         /* make use of cli_state handed over as an argument, if possible */
@@ -142 +143 @@
         if (!(mem_ctx = talloc_init("run_rpc_command"))) {
                 DEBUG(0, ("talloc_init() failed\n"));
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
 
@@ -149 +149 @@
                                               &domain_name);
         if (!NT_STATUS_IS_OK(nt_status)) {
-                cli_shutdown(cli);
-                return -1;
+                goto fail;
         }
 
@@ -165 +164 @@
                                 DEBUG(0, ("Could not initialise schannel netlogon pipe. Error was %s\n",
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 } else {
@@ -185 +183 @@
                                                 debug_ctx(), cli, interface),
                                         nt_errstr(nt_status) ));
-                                cli_shutdown(cli);
-                                return -1;
+                                goto fail;
                         }
                 }
@@ -196 +193 @@
                 DEBUG(1, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
         } else {
+                ret = 0;
                 DEBUG(5, ("rpc command function succedded\n"));
         }
@@ -205 +203 @@
         }
 
+fail:
         /* close the connection only if it was opened here */
         if (!cli_arg) {
@@ -211 +210 @@
 
         talloc_destroy(mem_ctx);
-        return (!NT_STATUS_IS_OK(nt_status));
+        return ret;
 }
 
@@ -6128 +6127 @@
         nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                          pipe_hnd->desthost,
-                                         SAMR_ACCESS_OPEN_DOMAIN,
+                                         SAMR_ACCESS_LOOKUP_DOMAIN,
                                          &connect_hnd);
         if (!NT_STATUS_IS_OK(nt_status)) {

branches/samba-3.3.x/source/utils/net_rpc_join.c

@@ -245 +245 @@
                                            pipe_hnd->desthost,
                                            SAMR_ACCESS_ENUM_DOMAINS
-                                           | SAMR_ACCESS_OPEN_DOMAIN,
+                                           | SAMR_ACCESS_LOOKUP_DOMAIN,
                                            &sam_pol),
                       "could not connect to SAM database");

branches/samba-3.3.x/source/utils/net_rpc_service.c

@@ -583 +583 @@
 ********************************************************************/
 
+static NTSTATUS rpc_service_delete_internal(struct net_context *c,
+                                            const DOM_SID *domain_sid,
+                                            const char *domain_name,
+                                            struct cli_state *cli,
+                                            struct rpc_pipe_client *pipe_hnd,
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc,
+                                            const char **argv)
+{
+        struct policy_handle hSCM, hService;
+        WERROR result = WERR_GENERAL_FAILURE;
+        NTSTATUS status;
+
+        if (argc != 1 ) {
+                d_printf("Usage: net rpc service delete <service>\n");
+                return NT_STATUS_OK;
+        }
+
+        /* Open the Service Control Manager */
+        status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
+                                              pipe_hnd->srv_name_slash,
+                                              NULL,
+                                              SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                                              &hSCM,
+                                              &result);
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+                d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n",
+                        win_errstr(result));
+                return werror_to_ntstatus(result);
+        }
+
+        /* Open the Service */
+
+        status = rpccli_svcctl_OpenServiceW(pipe_hnd, mem_ctx,
+                                            &hSCM,
+                                            argv[0],
+                                            SERVICE_ALL_ACCESS,
+                                            &hService,
+                                            &result);
+
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
+                d_fprintf(stderr, "Failed to open service.  [%s]\n",
+                        win_errstr(result));
+                goto done;
+        }
+
+        /* Delete the Service */
+
+        status = rpccli_svcctl_DeleteService(pipe_hnd, mem_ctx,
+                                             &hService,
+                                             &result);
+
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
+                d_fprintf(stderr, "Delete service request failed.  [%s]\n",
+                        win_errstr(result));
+                goto done;
+        }
+
+        d_printf("Successfully deleted Service: %s\n", argv[0]);
+
+ done:
+        if (is_valid_policy_hnd(&hService)) {
+                rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+        }
+        if (is_valid_policy_hnd(&hSCM)) {
+                rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+        }
+
+        return werror_to_ntstatus(result);
+}
+
+/********************************************************************
+********************************************************************/
+
+static NTSTATUS rpc_service_create_internal(struct net_context *c,
+                                            const DOM_SID *domain_sid,
+                                            const char *domain_name,
+                                            struct cli_state *cli,
+                                            struct rpc_pipe_client *pipe_hnd,
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc,
+                                            const char **argv)
+{
+        struct policy_handle hSCM, hService;
+        WERROR result = WERR_GENERAL_FAILURE;
+        NTSTATUS status;
+        const char *ServiceName;
+        const char *DisplayName;
+        const char *binary_path;
+
+        if (argc != 3) {
+                d_printf("Usage: net rpc service create <service> <displayname> <binarypath>\n");
+                return NT_STATUS_OK;
+        }
+
+        /* Open the Service Control Manager */
+        status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
+                                              pipe_hnd->srv_name_slash,
+                                              NULL,
+                                              SC_RIGHT_MGR_CREATE_SERVICE,
+                                              &hSCM,
+                                              &result);
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+                d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n",
+                        win_errstr(result));
+                return werror_to_ntstatus(result);
+        }
+
+        /* Create the service */
+
+        ServiceName = argv[0];
+        DisplayName = argv[1];
+        binary_path = argv[2];
+
+        status = rpccli_svcctl_CreateServiceW(pipe_hnd, mem_ctx,
+                                              &hSCM,
+                                              ServiceName,
+                                              DisplayName,
+                                              SERVICE_ALL_ACCESS,
+                                              SERVICE_TYPE_WIN32_OWN_PROCESS,
+                                              SVCCTL_DEMAND_START,
+                                              SVCCTL_SVC_ERROR_NORMAL,
+                                              binary_path,
+                                              NULL, /* LoadOrderGroupKey */
+                                              NULL, /* TagId */
+                                              NULL, /* dependencies */
+                                              0, /* dependencies_size */
+                                              NULL, /* service_start_name */
+                                              NULL, /* password */
+                                              0, /* password_size */
+                                              &hService,
+                                              &result);
+
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
+                d_fprintf(stderr, "Create service request failed.  [%s]\n",
+                        win_errstr(result));
+                goto done;
+        }
+
+        d_printf("Successfully created Service: %s\n", argv[0]);
+
+ done:
+        if (is_valid_policy_hnd(&hService)) {
+                rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+        }
+        if (is_valid_policy_hnd(&hSCM)) {
+                rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+        }
+
+        return werror_to_ntstatus(result);
+}
+
+/********************************************************************
+********************************************************************/
+
 static int rpc_service_list(struct net_context *c, int argc, const char **argv )
 {
@@ -674 +829 @@
         return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0,
                 rpc_service_status_internal, argc, argv );
+}
+
+/********************************************************************
+********************************************************************/
+
+static int rpc_service_delete(struct net_context *c, int argc, const char **argv)
+{
+        if (c->display_usage) {
+                d_printf("Usage:\n"
+                         "net rpc service delete <service>\n"
+                         "    Delete a Win32 service\n");
+                return 0;
+        }
+
+        return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0,
+                rpc_service_delete_internal, argc, argv);
+}
+
+/********************************************************************
+********************************************************************/
+
+static int rpc_service_create(struct net_context *c, int argc, const char **argv)
+{
+        if (c->display_usage) {
+                d_printf("Usage:\n"
+                         "net rpc service create <service>\n"
+                         "    Create a Win32 service\n");
+                return 0;
+        }
+
+        return run_rpc_command(c, NULL, &ndr_table_svcctl.syntax_id, 0,
+                rpc_service_create_internal, argc, argv);
 }
 
@@ -730 +917 @@
                         "    View current status of a service"
                 },
+                {
+                        "delete",
+                        rpc_service_delete,
+                        NET_TRANSPORT_RPC,
+                        "Delete a service",
+                        "net rpc service delete\n"
+                        "    Deletes a service"
+                },
+                {
+                        "create",
+                        rpc_service_create,
+                        NET_TRANSPORT_RPC,
+                        "Create a service",
+                        "net rpc service create\n"
+                        "    Creates a service"
+                },
+
                 {NULL, NULL, 0, NULL, NULL}
         };

branches/samba-3.3.x/source/utils/net_util.c

@@ -522 +522 @@
                           nt_errstr(nt_status));
                 cli = NULL;
+        } else if (c->opt_request_timeout) {
+                cli_set_timeout(cli, c->opt_request_timeout * 1000);
         }
 

branches/samba-3.3.x/source/utils/smbpasswd.c

@@ -431 +431 @@
                 
                 if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
-                        struct passwd *passwd = getpwnam_alloc(NULL, user_name);
-
-                        if (!passwd) {
-                                fprintf(stderr, "Cannot locate Unix account for "
-                                        "'%s'!\n", user_name);
-                                exit(1);
+                        struct passwd *passwd;
+
+                        if (remote_machine == NULL) {
+                                passwd = getpwnam_alloc(NULL, user_name);
+
+                                if (!passwd) {
+                                        fprintf(stderr, "Cannot locate Unix account for "
+                                                "'%s'!\n", user_name);
+                                        exit(1);
+                                }
+                                TALLOC_FREE(passwd);
                         }
-                        TALLOC_FREE(passwd);
 
                         new_passwd = prompt_for_new_password(stdin_passwd_get);