Changeset 140 for branches/samba-3.0/source/utils

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

Location:

branches/samba-3.0/source/utils

Files:

• net.c (modified) (4 diffs)
• net_domain.c (modified) (2 diffs)
• net_help.c (modified) (2 diffs)
• net_idmap.c (modified) (1 diff)
• net_rpc.c (modified) (1 diff)
• net_rpc_join.c (modified) (2 diffs)

branches/samba-3.0/source/utils/net.c

@@ -182 +182 @@
                                         opt_password, 0, Undefined, NULL);
 
-        if (NT_STATUS_IS_OK(nt_status)) {
+        if (NT_STATUS_IS_OK(nt_status) ||
+            NT_STATUS_EQUAL(nt_status, NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT) ||
+            NT_STATUS_EQUAL(nt_status, NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT) ||
+            NT_STATUS_EQUAL(nt_status, NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT)) {
                 return nt_status;
-        } else {
-                d_fprintf(stderr, "Could not connect to server %s\n", server_name);
-
-                /* Display a nicer message depending on the result */
-
-                if (NT_STATUS_V(nt_status) == 
-                    NT_STATUS_V(NT_STATUS_LOGON_FAILURE))
-                        d_fprintf(stderr, "The username or password was not correct.\n");
-
-                if (NT_STATUS_V(nt_status) == 
-                    NT_STATUS_V(NT_STATUS_ACCOUNT_LOCKED_OUT))
-                        d_fprintf(stderr, "The account was locked out.\n");
-
-                if (NT_STATUS_V(nt_status) == 
-                    NT_STATUS_V(NT_STATUS_ACCOUNT_DISABLED))
-                        d_fprintf(stderr, "The account was disabled.\n");
-
-                return nt_status;
-        }
+        }
+
+        d_fprintf(stderr, "Could not connect to server %s\n", server_name);
+
+        /* Display a nicer message depending on the result */
+
+        if (NT_STATUS_V(nt_status) ==
+            NT_STATUS_V(NT_STATUS_LOGON_FAILURE))
+                d_fprintf(stderr, "The username or password was not correct.\n");
+
+        if (NT_STATUS_V(nt_status) ==
+            NT_STATUS_V(NT_STATUS_ACCOUNT_LOCKED_OUT))
+                d_fprintf(stderr, "The account was locked out.\n");
+
+        if (NT_STATUS_V(nt_status) ==
+            NT_STATUS_V(NT_STATUS_ACCOUNT_DISABLED))
+                d_fprintf(stderr, "The account was disabled.\n");
+
+        return nt_status;
 }
 
@@ -482 +485 @@
         struct in_addr server_ip;
         struct cli_state *cli = NULL;
-        NTSTATUS nt_status;
+        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
         if ( !server || !ip ) {
@@ -494 +497 @@
         }
 
+        if (opt_user_name && opt_password) {
+                nt_status = connect_to_ipc(&cli, &server_ip, server_name);
+                if (NT_STATUS_IS_OK(nt_status)) {
+                        goto connected;
+                }
+        }
         if (flags & NET_FLAGS_ANONYMOUS) {
                 nt_status = connect_to_ipc_anonymous(&cli, &server_ip, server_name);
-        } else {
-                nt_status = connect_to_ipc(&cli, &server_ip, server_name);
-        }
-
+                if (NT_STATUS_IS_OK(nt_status)) {
+                        goto connected;
+                }
+        }
+
+        SAFE_FREE(server_name);
+        d_fprintf(stderr, "Connection failed: %s\n",
+                  nt_errstr(nt_status));
+        return NULL;
+
+ connected:
         /* store the server in the affinity cache if it was a PDC */
 
@@ -505 +521 @@
                 saf_store( cli->server_domain, cli->desthost );
 
-        SAFE_FREE(server_name);
-        if (NT_STATUS_IS_OK(nt_status)) {
-                return cli;
-        } else {
-                d_fprintf(stderr, "Connection failed: %s\n",
-                          nt_errstr(nt_status));
-                return NULL;
-        }
+        return cli;
 }
 

branches/samba-3.0/source/utils/net_domain.c

@@ -214 +214 @@
         uchar pwbuf[532];
         SAM_USERINFO_CTR ctr;
+        SAM_USER_INFO_24 p24;
         SAM_USER_INFO_25 p25;
         const int infolevel = 25;
@@ -338 +339 @@
                                            infolevel, &cli->user_session_key, &ctr);
 
+        if (NT_STATUS_EQUAL(status, NT_STATUS(DCERPC_FAULT_INVALID_TAG))) {
+
+                uchar pwbuf2[516];
+
+                ZERO_STRUCT(p24);
+
+                encode_pw_buffer(pwbuf2, clear_pw, STR_UNICODE);
+
+                /* retry with level 24 */
+                init_sam_user_info24(&p24, (char *)pwbuf2, 24);
+
+                ctr.switch_value = 24;
+                ctr.info.id24    = &p24;
+
+                status = rpccli_samr_set_userinfo(pipe_hnd, mem_ctx,
+                                                  &user_pol,
+                                                  24,
+                                                  &cli->user_session_key,
+                                                  &ctr);
+        }
+
         if ( !NT_STATUS_IS_OK(status) ) {
                 d_fprintf( stderr, "Failed to set password for machine account (%s)\n", 

branches/samba-3.0/source/utils/net_help.c

@@ -62 +62 @@
 "  RPC RAP ADS FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP VALIDATE\n"\
 "  GROUPMEMBER ADMIN SERVICE PASSWORD TIME LOOKUP GETLOCALSID SETLOCALSID\n"\
-"  SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
+"  GETDOMAINSID SETDOMAINSID CHANGESCRETPW LOOKUP SAM\n");
         return -1;
 }
@@ -229 +229 @@
                  "  net join\t\tto join a domain\n"\
                  "  net cache\t\tto operate on cache tdb file\n"\
-                 "  net getlocalsid [NAME]\tto get the SID for local name\n"\
+                 "  net getlocalsid [NAME]\tto get the SID for local machine name\n"\
                  "  net setlocalsid SID\tto set the local domain SID\n"\
+                 "  net getdomainsid the machine SID and the domain SID on the local server\n"\
                  "  net setdomainsid SID\tto set the domain SID on member servers\n"\
                  "  net changesecretpw\tto change the machine password in the local secrets database only\n"\
                  "                    \tthis requires the -f flag as a safety barrier\n"\
                  "  net status\t\tShow server status\n"\
-                "  net usersidlist\tto get a list of all users with their SIDs\n"
-                "  net usershare\t\tto add, delete and list locally user-modifiable shares\n"
+                 "  net usersidlist\tto get a list of all users with their SIDs\n"
+                 "  net usershare\t\tto add, delete and list locally user-modifiable shares\n"
                  "\n"\
                  "  net ads <command>\tto run ADS commands\n"\

branches/samba-3.0/source/utils/net_idmap.c

@@ -271 +271 @@
 int net_help_idmap(int argc, const char **argv)
 {
-        d_printf("net idmap dump <outputfile>\n"\
+        d_printf("net idmap dump <inputfile>\n"\
                  "    Dump current id mapping\n");
 

branches/samba-3.0/source/utils/net_rpc.c

@@ -5447 +5447 @@
                                        argc, argv);
         } else {
-                d_printf("Usage: net rpc trustdom add <domain>\n");
+                d_printf("Usage: net rpc trustdom add <domain> <trust password>\n");
                 return -1;
         }

branches/samba-3.0/source/utils/net_rpc_join.c

@@ -46 +46 @@
         uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
         enum security_types sec;
-        unsigned int conn_flags = NET_FLAGS_PDC;
+        unsigned int conn_flags = NET_FLAGS_PDC | NET_FLAGS_ANONYMOUS;
         struct cli_state *cli = NULL;
         struct rpc_pipe_client *pipe_hnd = NULL;
@@ -59 +59 @@
                 net_use_machine_account();
 
-        } else {
-                /* some servers (e.g. WinNT) don't accept machine-authenticated
-                   smb connections */
-                conn_flags |= NET_FLAGS_ANONYMOUS;
         }