diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 14:45:04 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 14:45:04 +0000 |
| commit | f0255b38bc17f4da9a63b2be4c3ce505688e933e (patch) | |
| tree | 02704f36832ac0c59a0d70c32203abcbdf18fec6 /source3/utils/net.c | |
| parent | fcbb06414d2c8385ce4e68f23905a528c8fbd4e8 (diff) | |
| download | samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.tar.gz samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.tar.bz2 samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.zip | |
sync 3.0 branch with HEAD
(This used to be commit 1b83b78e332b9d28914eff155530e81cf2073a58)
Diffstat (limited to 'source3/utils/net.c')
| -rw-r--r-- | source3/utils/net.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c index d34ac21f39..fc7094bcf7 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -234,7 +234,7 @@ BOOL net_find_server(unsigned flags, struct in_addr *server_ip, char **server_na } -BOOL net_find_dc(struct in_addr *server_ip, fstring server_name, char *domain_name) +BOOL net_find_dc(struct in_addr *server_ip, fstring server_name, const char *domain_name) { struct in_addr *ip_list; int addr_count; @@ -381,8 +381,6 @@ static struct functable net_func[] = { {"port", 'p', POPT_ARG_INT, &opt_port}, {"myname", 'n', POPT_ARG_STRING, &opt_requester_name}, {"conf", 's', POPT_ARG_STRING, &servicesf}, - {"debug", 'd', POPT_ARG_STRING, &debuglevel}, - {"debuglevel", 'd', POPT_ARG_STRING, &debuglevel}, {"server", 'S', POPT_ARG_STRING, &opt_host}, {"comment", 'C', POPT_ARG_STRING, &opt_comment}, {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers}, @@ -393,6 +391,7 @@ static struct functable net_func[] = { {"force", 'f', POPT_ARG_NONE, &opt_force}, {"timeout", 't', POPT_ARG_INT, &opt_timeout}, {"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass}, + { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, { 0, 0, 0, 0} }; |