diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 13:37:11 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 13:37:11 +0000 |
commit | 789d51b42ceb2d99658c72bf55904083d451fcab (patch) | |
tree | c965fd3d8f658760a9573f095bd5c213e61a9304 /source3/utils/net_rpc.c | |
parent | 94d6c0e8952ce220d2ca3ef4f97e10517595fcbf (diff) | |
download | samba-789d51b42ceb2d99658c72bf55904083d451fcab.tar.gz samba-789d51b42ceb2d99658c72bf55904083d451fcab.tar.bz2 samba-789d51b42ceb2d99658c72bf55904083d451fcab.zip |
This is the 'easy' parts of the trusted domains patch n+3 patch from
Rafal Szczesniak <mimir@diament.ists.pwr.wroc.pl>
It includes a conversion of make_user_info*() to NTSTATUS and some minor
changes to other files.
It also picks up on a nasty segfault that can occour in some security=domain
cases.
Andrew Bartlett
(This used to be commit d1e1fc3e4bf72717b3593685f0ea5750d676952a)
Diffstat (limited to 'source3/utils/net_rpc.c')
-rw-r--r-- | source3/utils/net_rpc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 25ed337c1f..4067ce344d 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1972,6 +1972,12 @@ static int rpc_trustdom_list(int argc, const char **argv) d_printf("%s%s%s\n", trusted_dom_names[i], padding, ascii_sid); }; + + /* + * in case of no trusted domains say something rather + * than just display blank line + */ + if (!num_domains) d_printf("none\n"); } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES)); @@ -2076,6 +2082,8 @@ static int rpc_trustdom_list(int argc, const char **argv) }; }; + if (!num_domains) d_printf("none\n"); + } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES)); /* close opened samr and domain policy handles */ |