summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-05-14 14:29:52 +0200
committerKai Blin <kai@samba.org>2008-05-20 14:28:03 +0200
commit1634bd92eac7dcb2c6056c862a7a8c18f6bc8d1b (patch)
tree034386308b36c488a622e5aefd7892aa980e8bcb /source3
parentf9a6d1f2645eef2654a8ff1fc59e83ee762d4014 (diff)
downloadsamba-1634bd92eac7dcb2c6056c862a7a8c18f6bc8d1b.tar.gz
samba-1634bd92eac7dcb2c6056c862a7a8c18f6bc8d1b.tar.bz2
samba-1634bd92eac7dcb2c6056c862a7a8c18f6bc8d1b.zip
net: Move printer help to net_rpc where it's used.
(This used to be commit 2ee3d1aefab8dada5bd05a92b72776554617b7f9)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/net_help.c32
-rw-r--r--source3/utils/net_proto.h1
-rw-r--r--source3/utils/net_rpc.c28
3 files changed, 27 insertions, 34 deletions
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 9648f2f8f7..51dc1a0c51 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -33,38 +33,6 @@ static int help_usage(struct net_context *c, int argc, const char **argv)
return -1;
}
-int net_help_printer(struct net_context *c, int argc, const char **argv)
-{
- d_printf("net rpc printer LIST [printer] [misc. options] [targets]\n"\
- "\tlists all printers on print-server\n\n");
- d_printf("net rpc printer DRIVER [printer] [misc. options] [targets]\n"\
- "\tlists all printer-drivers on print-server\n\n");
- d_printf("net rpc printer PUBLISH action [printer] [misc. options] [targets]\n"\
- "\tpublishes printer settings in Active Directory\n"
- "\taction can be one of PUBLISH, UPDATE, UNPUBLISH or LIST\n\n");
- d_printf("net rpc printer MIGRATE PRINTERS [printer] [misc. options] [targets]"\
- "\n\tmigrates printers from remote to local server\n\n");
- d_printf("net rpc printer MIGRATE SETTINGS [printer] [misc. options] [targets]"\
- "\n\tmigrates printer-settings from remote to local server\n\n");
- d_printf("net rpc printer MIGRATE DRIVERS [printer] [misc. options] [targets]"\
- "\n\tmigrates printer-drivers from remote to local server\n\n");
- d_printf("net rpc printer MIGRATE FORMS [printer] [misc. options] [targets]"\
- "\n\tmigrates printer-forms from remote to local server\n\n");
- d_printf("net rpc printer MIGRATE SECURITY [printer] [misc. options] [targets]"\
- "\n\tmigrates printer-ACLs from remote to local server\n\n");
- d_printf("net rpc printer MIGRATE ALL [printer] [misc. options] [targets]"\
- "\n\tmigrates drivers, forms, queues, settings and acls from\n"\
- "\tremote to local print-server\n\n");
- net_common_methods_usage(c, argc, argv);
- net_common_flags_usage(c, argc, argv);
- d_printf(
- "\t-v or --verbose\t\t\tgive verbose output\n"
- "\t --destination\t\tmigration target server (default: localhost)\n");
-
- return -1;
-}
-
-
int net_help_status(struct net_context *c, int argc, const char **argv)
{
d_printf(" net status sessions [parseable] "
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 1472e8feb8..d429aa7ee2 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -117,7 +117,6 @@ int net_groupmap(struct net_context *c, int argc, const char **argv);
/* The following definitions come from utils/net_help.c */
-int net_help_printer(struct net_context *c, int argc, const char **argv);
int net_help_status(struct net_context *c, int argc, const char **argv);
int net_help(struct net_context *c, int argc, const char **argv);
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index fc22ca9daf..a7ff9bf0a8 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -6925,7 +6925,33 @@ static int rpc_printer_publish(struct net_context *c, int argc,
**/
int rpc_printer_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_printer(c, argc, argv);
+ d_printf("net rpc printer LIST [printer] [misc. options] [targets]\n"\
+ "\tlists all printers on print-server\n\n");
+ d_printf("net rpc printer DRIVER [printer] [misc. options] [targets]\n"\
+ "\tlists all printer-drivers on print-server\n\n");
+ d_printf("net rpc printer PUBLISH action [printer] [misc. options] [targets]\n"\
+ "\tpublishes printer settings in Active Directory\n"
+ "\taction can be one of PUBLISH, UPDATE, UNPUBLISH or LIST\n\n");
+ d_printf("net rpc printer MIGRATE PRINTERS [printer] [misc. options] [targets]"\
+ "\n\tmigrates printers from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE SETTINGS [printer] [misc. options] [targets]"\
+ "\n\tmigrates printer-settings from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE DRIVERS [printer] [misc. options] [targets]"\
+ "\n\tmigrates printer-drivers from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE FORMS [printer] [misc. options] [targets]"\
+ "\n\tmigrates printer-forms from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE SECURITY [printer] [misc. options] [targets]"\
+ "\n\tmigrates printer-ACLs from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE ALL [printer] [misc. options] [targets]"\
+ "\n\tmigrates drivers, forms, queues, settings and acls from\n"\
+ "\tremote to local print-server\n\n");
+ net_common_methods_usage(c, argc, argv);
+ net_common_flags_usage(c, argc, argv);
+ d_printf(
+ "\t-v or --verbose\t\t\tgive verbose output\n"
+ "\t --destination\t\tmigration target server (default: localhost)\n");
+
+ return -1;
}
/**