From 45653bd1b1a59435dbb2f3d8f19e485f4c20e2fb Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Mon, 12 May 2008 14:38:21 +0200 Subject: net: Split out common help functions. (This used to be commit efc863e3758501a4c62dc9762eb0aded2dad01ff) --- source3/Makefile.in | 2 +- source3/utils/net.h | 1 + source3/utils/net_help.c | 32 ------------------------ source3/utils/net_help_common.c | 54 +++++++++++++++++++++++++++++++++++++++++ source3/utils/net_help_common.h | 49 +++++++++++++++++++++++++++++++++++++ source3/utils/net_proto.h | 2 -- 6 files changed, 105 insertions(+), 35 deletions(-) create mode 100644 source3/utils/net_help_common.c create mode 100644 source3/utils/net_help_common.h diff --git a/source3/Makefile.in b/source3/Makefile.in index e22f9657f8..817cd1f0d2 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -885,7 +885,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \ auth/token_util.o utils/net_dom.o # these are not processed by make proto -NET_OBJ2 = utils/net_registry_util.o +NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o NET_OBJ = $(NET_OBJ1) \ $(NET_OBJ2) \ diff --git a/source3/utils/net.h b/source3/utils/net.h index 15b1dd402b..f40222ed71 100644 --- a/source3/utils/net.h +++ b/source3/utils/net.h @@ -113,6 +113,7 @@ struct net_context { /* INCLUDE FILES */ #include "utils/net_proto.h" +#include "utils/net_help_common.h" /* MACROS & DEFINES */ diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c index bf110c4ce5..4bc5c15207 100644 --- a/source3/utils/net_help.c +++ b/source3/utils/net_help.c @@ -20,38 +20,6 @@ #include "includes.h" #include "utils/net.h" -int net_common_methods_usage(struct net_context *c, int argc, const char**argv) -{ - 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"); - d_printf("\trap\t\t\t\tRAP (older systems)\n"); - d_printf("\n"); - return 0; -} - -int net_common_flags_usage(struct net_context *c, int argc, const char **argv) -{ - d_printf("Valid targets: choose one (none defaults to localhost)\n"); - d_printf("\t-S or --server=\t\tserver name\n"); - d_printf("\t-I or --ipaddress=\taddress of target server\n"); - d_printf("\t-w or --workgroup=\t\ttarget workgroup or domain\n"); - - d_printf("\n"); - d_printf("Valid miscellaneous options are:\n"); /* misc options */ - d_printf("\t-p or --port=\t\tconnection port on target\n"); - d_printf("\t-W or --myworkgroup=\tclient workgroup\n"); - d_printf("\t-d or --debuglevel=\tdebug level (0-10)\n"); - d_printf("\t-n or --myname=\t\tclient name\n"); - d_printf("\t-U or --user=\t\tuser name\n"); - d_printf("\t-s or --configfile=\tpathname of smb.conf file\n"); - d_printf("\t-l or --long\t\t\tDisplay full information\n"); - d_printf("\t-V or --version\t\t\tPrint samba version information\n"); - d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n"); - d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n"); - return -1; -} - static int help_usage(struct net_context *c, int argc, const char **argv) { d_printf( diff --git a/source3/utils/net_help_common.c b/source3/utils/net_help_common.c new file mode 100644 index 0000000000..be06caa37e --- /dev/null +++ b/source3/utils/net_help_common.c @@ -0,0 +1,54 @@ +/* + Samba Unix/Linux SMB client library + net help commands + Copyright (C) 2002 Jim McDonough (jmcd@us.ibm.com) + + 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 . +*/ + +#include "includes.h" +#include "utils/net.h" + +int net_common_methods_usage(struct net_context *c, int argc, const char**argv) +{ + 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"); + d_printf("\trap\t\t\t\tRAP (older systems)\n"); + d_printf("\n"); + return 0; +} + +int net_common_flags_usage(struct net_context *c, int argc, const char **argv) +{ + d_printf("Valid targets: choose one (none defaults to localhost)\n"); + d_printf("\t-S or --server=\t\tserver name\n"); + d_printf("\t-I or --ipaddress=\taddress of target server\n"); + d_printf("\t-w or --workgroup=\t\ttarget workgroup or domain\n"); + + d_printf("\n"); + d_printf("Valid miscellaneous options are:\n"); /* misc options */ + d_printf("\t-p or --port=\t\tconnection port on target\n"); + d_printf("\t-W or --myworkgroup=\tclient workgroup\n"); + d_printf("\t-d or --debuglevel=\tdebug level (0-10)\n"); + d_printf("\t-n or --myname=\t\tclient name\n"); + d_printf("\t-U or --user=\t\tuser name\n"); + d_printf("\t-s or --configfile=\tpathname of smb.conf file\n"); + d_printf("\t-l or --long\t\t\tDisplay full information\n"); + d_printf("\t-V or --version\t\t\tPrint samba version information\n"); + d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n"); + d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n"); + return -1; +} + diff --git a/source3/utils/net_help_common.h b/source3/utils/net_help_common.h new file mode 100644 index 0000000000..ed859936e4 --- /dev/null +++ b/source3/utils/net_help_common.h @@ -0,0 +1,49 @@ +/* + Samba Unix/Linux SMB client library + net help commands + 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 . +*/ + +#ifndef _NET_HELP_COMMON_H_ +#define _NET_HELP_COMMON_H_ + +/** + * Get help for common methods. + * + * This will output some help for using the ADS/RPC/RAP transports. + * + * @param c A net_context structure + * @param argc Normal argc with previous parameters removed + * @param argv Normal argv with previous parameters removed + * @return 0 on success, nonzero on failure. + */ +int net_common_methods_usage(struct net_context *c, int argc, const char**argv); + +/** + * Get help for common flags. + * + * This will output some help for using common flags. + * + * @param c A net_context structure + * @param argc Normal argc with previous parameters removed + * @param argv Normal argv with previous parameters removed + * @return 0 on success, nonzero on failure. + */ +int net_common_flags_usage(struct net_context *c, int argc, const char **argv); + + +#endif /* _NET_HELP_COMMON_H_*/ + diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index dc2f5e0731..d5ca40c9df 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -145,8 +145,6 @@ int net_groupmap(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_help.c */ -int net_common_methods_usage(struct net_context *c, int argc, const char**argv); -int net_common_flags_usage(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); -- cgit