diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-08-27 19:46:22 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-08-27 19:46:22 +0000 |
| commit | b031af348c7dcc8c74bf49945211c466b8eca079 (patch) | |
| tree | c6a20abba3c8432ad2980beeab9e1d2a8528f3a4 /source3/utils | |
| parent | 1d726fe0e054be9017309186c24b24d032e85636 (diff) | |
| download | samba-b031af348c7dcc8c74bf49945211c466b8eca079.tar.gz samba-b031af348c7dcc8c74bf49945211c466b8eca079.tar.bz2 samba-b031af348c7dcc8c74bf49945211c466b8eca079.zip | |
converted another bunch of stuff to NTSTATUS
(This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/smbcacls.c | 6 | ||||
| -rw-r--r-- | source3/utils/smbpasswd.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 9e8cbb1ddd..53f9db1a6c 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -94,7 +94,7 @@ static BOOL cacls_open_policy_hnd(void) if (cli_lsa_open_policy(&lsa_cli, lsa_cli.mem_ctx, True, GENERIC_EXECUTE_ACCESS, &pol) - != NT_STATUS_NOPROBLEMO) { + != NT_STATUS_OK) { return False; } @@ -119,7 +119,7 @@ static void SidToString(fstring str, DOM_SID *sid) if (!cacls_open_policy_hnd() || cli_lsa_lookup_sids(&lsa_cli, lsa_cli.mem_ctx, &pol, 1, sid, &names, &types, - &num_names) != NT_STATUS_NOPROBLEMO || + &num_names) != NT_STATUS_OK || !names || !names[0]) { return; } @@ -143,7 +143,7 @@ static BOOL StringToSid(DOM_SID *sid, char *str) if (!cacls_open_policy_hnd() || cli_lsa_lookup_names(&lsa_cli, lsa_cli.mem_ctx, &pol, 1, &str, &sids, &types, - &num_sids) != NT_STATUS_NOPROBLEMO) { + &num_sids) != NT_STATUS_OK) { result = False; goto done; } diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 5cfe1152c8..3911987991 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -162,13 +162,13 @@ Join a domain using the administrator username and password /* Macro for checking RPC error codes to make things more readable */ #define CHECK_RPC_ERR(rpc, msg) \ - if ((result = rpc) != NT_STATUS_NOPROBLEMO) { \ + if ((result = rpc) != NT_STATUS_OK) { \ DEBUG(0, (msg ": %s\n", get_nt_error_msg(result))); \ goto done; \ } #define CHECK_RPC_ERR_DEBUG(rpc, debug_args) \ - if ((result = rpc) != NT_STATUS_NOPROBLEMO) { \ + if ((result = rpc) != NT_STATUS_OK) { \ DEBUG(0, debug_args); \ goto done; \ } @@ -330,7 +330,7 @@ static int join_domain_byuser(char *domain, char *remote_machine, ("could not re-open existing user %s: %s\n", acct_name, get_nt_error_msg(result))); - } else if (result != NT_STATUS_NOPROBLEMO) { + } else if (result != NT_STATUS_OK) { DEBUG(0, ("error creating domain user: %s\n", get_nt_error_msg(result))); goto done; |