Changeset 140 for branches/samba-3.0/source/utils/net.c

Timestamp:

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

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

File:

• branches/samba-3.0/source/utils/net.c (modified) (4 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;
 }