Changeset 235 for branches/samba-3.2.x/source/utils

Timestamp:

May 27, 2009, 12:08:58 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.11

Location:

branches/samba-3.2.x/source/utils

Files:

• net_rpc.c (modified) (1 diff)
• smbpasswd.c (modified) (1 diff)

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

@@ -6281 +6281 @@
         nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                          pipe_hnd->cli->desthost,
-                                         SA_RIGHT_SAM_OPEN_DOMAIN,
+                                         SA_RIGHT_SAM_LOOKUP_DOMAIN,
                                          &connect_hnd);
         if (!NT_STATUS_IS_OK(nt_status)) {

branches/samba-3.2.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);