summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-08-22 00:51:00 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-08-22 00:51:00 +0000
commit2749f5e998a672e03ac7bbb932b1fd54b7f4a997 (patch)
tree0ed4355ff85fccaddfd1977bf39b7595559a3743 /source3
parentbad6e2dbe2096c13049fbb8936ee6df74a1bb9a8 (diff)
downloadsamba-2749f5e998a672e03ac7bbb932b1fd54b7f4a997.tar.gz
samba-2749f5e998a672e03ac7bbb932b1fd54b7f4a997.tar.bz2
samba-2749f5e998a672e03ac7bbb932b1fd54b7f4a997.zip
A few fixes towards libsmbclient and rpcclient - get pointer types right and
try to keep to functions inside libsmbclient. Andrew Bartlett (This used to be commit 340bc31fdb031d79fa87de27c2c46215dd8113a3)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/libsmbclient.c8
-rw-r--r--source3/rpcclient/samsync.c14
2 files changed, 10 insertions, 12 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 0ffc1c1378..fa27f54340 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -180,14 +180,13 @@ smbc_parse_path(SMBCCTX *context, const char *fname, char *server, char *share,
static int smbc_errno(SMBCCTX *context, struct cli_state *c)
{
- int ret;
-
+ int ret = cli_errno(c);
+
if (cli_is_dos_error(c)) {
uint8 eclass;
uint32 ecode;
cli_dos_error(c, &eclass, &ecode);
- ret = cli_errno_from_dos(eclass, ecode);
DEBUG(3,("smbc_error %d %d (0x%x) -> %d\n",
(int)eclass, (int)ecode, (int)ecode, ret));
@@ -195,10 +194,9 @@ static int smbc_errno(SMBCCTX *context, struct cli_state *c)
NTSTATUS status;
status = cli_nt_error(c);
- ret = cli_errno_from_nt(status);
DEBUG(3,("smbc errno %s -> %d\n",
- get_nt_error_msg(status), ret));
+ nt_errstr(status), ret));
}
return ret;
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
index aaef889278..be3d4211e0 100644
--- a/source3/rpcclient/samsync.c
+++ b/source3/rpcclient/samsync.c
@@ -324,15 +324,15 @@ static void sam_account_from_delta(SAM_ACCOUNT *account,
static void apply_account_info(SAM_ACCOUNT_INFO *sam_acct_delta)
{
- SAM_ACCOUNT sam_acct;
+ SAM_ACCOUNT *sam_acct;
BOOL result;
- ZERO_STRUCT(sam_acct);
-
- pdb_init_sam(&sam_acct);
+ if (!NT_STATUS_IS_OK(pdb_init_sam(&sam_acct))) {
+ return;
+ }
- sam_account_from_delta(&sam_acct, sam_acct_delta);
- result = pdb_add_sam_account(&sam_acct);
+ sam_account_from_delta(sam_acct, sam_acct_delta);
+ result = pdb_add_sam_account(sam_acct);
}
/* Apply an array of deltas to the SAM database */
@@ -544,7 +544,7 @@ static void user_callback(poptContext con,
const struct poptOption *opt,
const char *arg, const void *data)
{
- char *p, *ch;
+ const char *p, *ch;
if (!arg)
return;