sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00
Code Activity

net: Move "net join" handling into a separate file.

Browse Source
This commit is contained in:
Kai Blin
2008-05-13 11:11:35 +02:00
parent efc863e375
commit d0237a7368
5 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile.in
View File

@@ -880,7 +880,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
$(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
utils/net_conf.o \
utils/net_conf.o utils/net_join.o\
utils/net_registry.o \
auth/token_util.o utils/net_dom.o

11
source/utils/net.c
View File

@@ -586,17 +586,6 @@ static int net_group(struct net_context *c, int argc, const char **argv)
return net_rap_group(c, argc, argv);
}
static int net_join(struct net_context *c, int argc, const char **argv)
{
if (net_ads_check_our_domain(c) == 0) {
if (net_ads_join(c, argc, argv) == 0)
return 0;
else
d_fprintf(stderr, "ADS join did not work, falling back to RPC...\n");
}
return net_rpc_join(c, argc, argv);
}
static int net_changetrustpw(struct net_context *c, int argc, const char **argv)
{
if (net_ads_check_our_domain(c) == 0)

13
source/utils/net_help.c
View File

@@ -77,17 +77,6 @@ int net_help_group(struct net_context *c, int argc, const char **argv)
return -1;
}
int net_help_join(struct net_context *c, int argc, const char **argv)
{
d_printf("\nnet [<method>] join [misc. options]\n"
"\tjoins this server to a domain\n");
d_printf("Valid methods: (auto-detected if not specified)\n");
d_printf("\tads\t\t\t\tActive Directory (LDAP/Kerberos)\n");
d_printf("\trpc\t\t\t\tDCE-RPC\n");
net_common_flags_usage(c, argc, argv);
return -1;
}
int net_help_share(struct net_context *c, int argc, const char **argv)
{
d_printf(
@@ -234,7 +223,7 @@ int net_help(struct net_context *c, int argc, const char **argv)
{"USER", net_help_user},
{"GROUP", net_help_group},
{"GROUPMAP", net_help_groupmap},
{"JOIN", net_help_join},
{"JOIN", net_join_usage},
{"DOM", net_help_dom},
{"VALIDATE", net_rap_validate_usage},
{"GROUPMEMBER", net_rap_groupmember_usage},

54
source/utils/net_join.c Normal file
View File

@@ -0,0 +1,54 @@
/*
Samba Unix/Linux SMB client library
net join commands
Copyright (C) 2002 Jim McDonough (jmcd@us.ibm.com)
Copyright (C) 2008 Kai Blin (kai@samba.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "utils/net.h"
int net_join_usage(struct net_context *c, int argc, const char **argv)
{
d_printf("\nnet [<method>] join [misc. options]\n"
"\tjoins this server to a domain\n");
d_printf("Valid methods: (auto-detected if not specified)\n");
d_printf("\tads\t\t\t\tActive Directory (LDAP/Kerberos)\n");
d_printf("\trpc\t\t\t\tDCE-RPC\n");
net_common_flags_usage(c, argc, argv);
return -1;
}
int net_join(struct net_context *c, int argc, const char **argv)
{
if (argc < 1)
return net_join_usage(c, argc, argv);
if (StrCaseCmp(argv[0], "HELP") == 0) {
net_join_usage(c, argc, argv);
return 0;
}
if (net_ads_check_our_domain(c) == 0) {
if (net_ads_join(c, argc, argv) == 0)
return 0;
else
d_fprintf(stderr, "ADS join did not work, falling back to RPC...\n");
}
return net_rpc_join(c, argc, argv);
}

6
source/utils/net_proto.h
View File

@@ -147,7 +147,6 @@ int net_groupmap(struct net_context *c, int argc, const char **argv);
int net_help_user(struct net_context *c, int argc, const char **argv);
int net_help_group(struct net_context *c, int argc, const char **argv);
int net_help_join(struct net_context *c, int argc, const char **argv);
int net_help_share(struct net_context *c, int argc, const char **argv);
int net_help_file(struct net_context *c, int argc, const char **argv);
int net_help_printer(struct net_context *c, int argc, const char **argv);
@@ -162,6 +161,11 @@ bool idmap_store_secret(const char *backend, bool alloc,
int net_help_idmap(struct net_context *c, int argc, const char **argv);
int net_idmap(struct net_context *c, int argc, const char **argv);
/* The following definitions come from utils/net_join.c */
int net_join_usage(struct net_context *c, int argc, const char **argv);
int net_join(struct net_context *c, int argc, const char **argv);
/* The following definitions come from utils/net_lookup.c */
int net_lookup_usage(struct net_context *c, int argc, const char **argv);