[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Tue Jan 25 12:07:48 MST 2011
The branch, v3-6-test has been updated
via 4d36084 s3-smbclient: Fix cli_errstr() usage (part of bug #7864)
via dd4f80a s3-masktest: Fix cli_errstr() usage (part of bug #7864)
via 33f14a7 s3-smbclient: Fix cli_errstr() usage (part of bug #7864)
via df6c3b2 s3-torture: Fix cli_errstr() usage (part of bug #7864)
via 26bc25e s3-docs: fix deldriver option
via c5c4f87 s3-docs: add some long opts to smbclient(1) man
from 7ad77c2 idl: add file_id idl.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 4d36084e05ca8a87e775b570215efd41eef7fc10
Author: Björn Baumbach <bb at sernet.de>
Date: Thu Jan 20 14:38:30 2011 +0100
s3-smbclient: Fix cli_errstr() usage (part of bug #7864)
Convert cli_errstr() to nt_errstr()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Tue Jan 25 11:41:53 CET 2011 on sn-devel-104
(cherry picked from commit 07ccc2905dc5d0d74dc688ff830f504ea9665029)
commit dd4f80a6dc99f3f811a909f0c37940774e03ef15
Author: Björn Baumbach <bb at sernet.de>
Date: Thu Jan 20 14:08:42 2011 +0100
s3-masktest: Fix cli_errstr() usage (part of bug #7864)
Convert cli_errstr() to nt_errstr()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5d8ada549e629cfe53ed973d66f5fcf0a3bd0a8c)
commit 33f14a75ceaacc179c406f2689198946054c0396
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Jan 17 12:02:39 2011 +0100
s3-smbclient: Fix cli_errstr() usage (part of bug #7864)
Convert cli_errstr() to nt_errstr()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 09c612f377749b79b850ee6c52ae49699e256359)
commit df6c3b20dc7d059ffb50b09aac2112499990aaa0
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Jan 17 13:03:05 2011 +0100
s3-torture: Fix cli_errstr() usage (part of bug #7864)
Convert cli_errstr() to nt_errstr()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 99f8f5e5945c5cd694dbb37fa947c04a24e25957)
commit 26bc25ef442869c627f5fa6d5c0d3954098b8b68
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Jan 17 09:51:45 2011 +0100
s3-docs: fix deldriver option
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 3bb212a3a96164121d345a8c8f81294b0f988261)
commit c5c4f872f7b2e02a68855824c28693e61d24b373
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Jan 14 12:35:55 2011 +0100
s3-docs: add some long opts to smbclient(1) man
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit b8d5ee9de3bb8c24efd2a7fab89d7d814b98aa2d)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/rpcclient.1.xml | 2 +-
docs-xml/manpages-3/smbclient.1.xml | 4 ++--
source3/client/client.c | 28 ++++++++++++++++------------
source3/torture/locktest.c | 13 ++++++-------
source3/torture/masktest.c | 11 ++++++-----
5 files changed, 31 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 8d517ae..f660b89 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -267,7 +267,7 @@ Comma Separated list of Files
</listitem></varlistentry>
- <varlistentry><term>deldriver</term><listitem><para>Delete the
+ <varlistentry><term>deldriver <driver></term><listitem><para>Delete the
specified printer driver for all architectures. This
does not delete the actual driver files from the server,
only the entry from the server's list of drivers.
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 9efca50..ae11e8a 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -261,7 +261,7 @@
</varlistentry>
<varlistentry>
- <term>-P</term>
+ <term>-P|--machine-pass</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
@@ -317,7 +317,7 @@
</varlistentry>
<varlistentry>
- <term>-e</term>
+ <term>-e|--encrypt</term>
<listitem><para>This command line parameter requires the remote
server support the UNIX extensions. Request that the connection be
encrypted. This is new for Samba 3.2 and will only work with Samba
diff --git a/source3/client/client.c b/source3/client/client.c
index 33c1a24..3e48b01 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1108,13 +1108,15 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
}
- if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
- targetcli, fnum, &attr, &size, NULL, NULL,
- NULL, NULL, NULL)) &&
- !NT_STATUS_IS_OK(cli_getattrE(targetcli, fnum,
- &attr, &size, NULL, NULL, NULL))) {
- d_printf("getattrib: %s\n",cli_errstr(targetcli));
- return 1;
+ status = cli_qfileinfo_basic(targetcli, fnum, &attr, &size, NULL, NULL,
+ NULL, NULL, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ status = cli_getattrE(targetcli, fnum, &attr, &size, NULL, NULL,
+ NULL);
+ if(!NT_STATUS_IS_OK(status)) {
+ d_printf("getattrib: %s\n", nt_errstr(status));
+ return 1;
+ }
}
DEBUG(1,("getting file %s of size %.0f as %s ",
@@ -4110,6 +4112,7 @@ static int cmd_logon(void)
{
TALLOC_CTX *ctx = talloc_tos();
char *l_username, *l_password;
+ NTSTATUS nt_status;
if (!next_token_talloc(ctx, &cmd_ptr,&l_username,NULL)) {
d_printf("logon <username> [<password>]\n");
@@ -4126,11 +4129,12 @@ static int cmd_logon(void)
return 1;
}
- if (!NT_STATUS_IS_OK(cli_session_setup(cli, l_username,
- l_password, strlen(l_password),
- l_password, strlen(l_password),
- lp_workgroup()))) {
- d_printf("session setup failed: %s\n", cli_errstr(cli));
+ nt_status = cli_session_setup(cli, l_username,
+ l_password, strlen(l_password),
+ l_password, strlen(l_password),
+ lp_workgroup());
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ d_printf("session setup failed: %s\n", nt_errstr(nt_status));
return -1;
}
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 9c8c696..9a47f99 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -233,13 +233,12 @@ static struct cli_state *connect_one(char *share, int snum)
fstrcpy(username[1], username[0]);
}
- if (!NT_STATUS_IS_OK(cli_session_setup(c, username[snum],
- password[snum],
- strlen(password[snum]),
- password[snum],
- strlen(password[snum]),
- lp_workgroup()))) {
- DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+ status = cli_session_setup(c, username[snum],
+ password[snum], strlen(password[snum]),
+ password[snum], strlen(password[snum]),
+ lp_workgroup());
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("session setup failed: %s\n", nt_errstr(status)));
return NULL;
}
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 1fc46b9..8879102 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -226,11 +226,12 @@ static struct cli_state *connect_one(char *share)
}
}
- if (!NT_STATUS_IS_OK(cli_session_setup(c, username,
- password, strlen(password),
- password, strlen(password),
- lp_workgroup()))) {
- DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+ status = cli_session_setup(c, username,
+ password, strlen(password),
+ password, strlen(password),
+ lp_workgroup());
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("session setup failed: %s\n", nt_errstr(status)));
return NULL;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list