From 51e962331c2a40037e65f6a2b12ba7c6d43cc68f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 2 Sep 2008 13:24:51 +0200 Subject: netapi: move join related examples to one directory. Guenther (This used to be commit afdd14c26c27c9fa245165985a5d8e644855c4b5) --- source3/lib/netapi/examples/Makefile.in | 4 +- .../examples/getjoinableous/getjoinableous.c | 95 ------------------- source3/lib/netapi/examples/join/getjoinableous.c | 95 +++++++++++++++++++ source3/lib/netapi/examples/join/netdomjoin.c | 104 +++++++++++++++++++++ .../lib/netapi/examples/netdomjoin/netdomjoin.c | 104 --------------------- 5 files changed, 201 insertions(+), 201 deletions(-) delete mode 100644 source3/lib/netapi/examples/getjoinableous/getjoinableous.c create mode 100644 source3/lib/netapi/examples/join/getjoinableous.c create mode 100644 source3/lib/netapi/examples/join/netdomjoin.c delete mode 100644 source3/lib/netapi/examples/netdomjoin/netdomjoin.c (limited to 'source3') diff --git a/source3/lib/netapi/examples/Makefile.in b/source3/lib/netapi/examples/Makefile.in index 51fadb9a10..ee72a95062 100644 --- a/source3/lib/netapi/examples/Makefile.in +++ b/source3/lib/netapi/examples/Makefile.in @@ -85,9 +85,9 @@ bin/.dummy: CMDLINE_OBJ = common.o GETDC_OBJ = getdc/getdc.o $(CMDLINE_OBJ) DSGETDC_OBJ = dsgetdc/dsgetdc.o $(CMDLINE_OBJ) -NETDOMJOIN_OBJ = netdomjoin/netdomjoin.o $(CMDLINE_OBJ) +NETDOMJOIN_OBJ = join/netdomjoin.o $(CMDLINE_OBJ) NETDOMJOIN_GUI_OBJ = netdomjoin-gui/netdomjoin-gui.o -GETJOINABLEOUS_OBJ = getjoinableous/getjoinableous.o $(CMDLINE_OBJ) +GETJOINABLEOUS_OBJ = join/getjoinableous.o $(CMDLINE_OBJ) RENAMEMACHINE_OBJ = join/rename_machine.o $(CMDLINE_OBJ) USERADD_OBJ = user/user_add.o $(CMDLINE_OBJ) USERDEL_OBJ = user/user_del.o $(CMDLINE_OBJ) diff --git a/source3/lib/netapi/examples/getjoinableous/getjoinableous.c b/source3/lib/netapi/examples/getjoinableous/getjoinableous.c deleted file mode 100644 index 732f73dd57..0000000000 --- a/source3/lib/netapi/examples/getjoinableous/getjoinableous.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * Join Support (cmdline + netapi) - * Copyright (C) Guenther Deschner 2008 - * - * 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 -#include -#include -#include - -#include - -#include "common.h" - -int main(int argc, const char **argv) -{ - NET_API_STATUS status; - const char *host_name = NULL; - const char *domain_name = NULL; - const char **ous = NULL; - uint32_t num_ous = 0; - struct libnetapi_ctx *ctx = NULL; - int i; - - poptContext pc; - int opt; - - struct poptOption long_options[] = { - POPT_AUTOHELP - { "domain", 0, POPT_ARG_STRING, NULL, 'D', "Domain name", "DOMAIN" }, - POPT_COMMON_LIBNETAPI_EXAMPLES - POPT_TABLEEND - }; - - status = libnetapi_init(&ctx); - if (status != 0) { - return status; - } - - pc = poptGetContext("getjoinableous", argc, argv, long_options, 0); - - poptSetOtherOptionHelp(pc, "hostname domainname"); - while((opt = poptGetNextOpt(pc)) != -1) { - switch (opt) { - case 'D': - domain_name = poptGetOptArg(pc); - break; - } - } - - if (!poptPeekArg(pc)) { - poptPrintHelp(pc, stderr, 0); - goto out; - } - host_name = poptGetArg(pc); - - /* NetGetJoinableOUs */ - - status = NetGetJoinableOUs(host_name, - domain_name, - ctx->username, - ctx->password, - &num_ous, - &ous); - if (status != 0) { - printf("failed with: %s\n", - libnetapi_get_error_string(ctx, status)); - } else { - printf("Successfully queried joinable ous:\n"); - for (i=0; i. + */ + +#include +#include +#include +#include + +#include + +#include "common.h" + +int main(int argc, const char **argv) +{ + NET_API_STATUS status; + const char *host_name = NULL; + const char *domain_name = NULL; + const char **ous = NULL; + uint32_t num_ous = 0; + struct libnetapi_ctx *ctx = NULL; + int i; + + poptContext pc; + int opt; + + struct poptOption long_options[] = { + POPT_AUTOHELP + { "domain", 0, POPT_ARG_STRING, NULL, 'D', "Domain name", "DOMAIN" }, + POPT_COMMON_LIBNETAPI_EXAMPLES + POPT_TABLEEND + }; + + status = libnetapi_init(&ctx); + if (status != 0) { + return status; + } + + pc = poptGetContext("getjoinableous", argc, argv, long_options, 0); + + poptSetOtherOptionHelp(pc, "hostname domainname"); + while((opt = poptGetNextOpt(pc)) != -1) { + switch (opt) { + case 'D': + domain_name = poptGetOptArg(pc); + break; + } + } + + if (!poptPeekArg(pc)) { + poptPrintHelp(pc, stderr, 0); + goto out; + } + host_name = poptGetArg(pc); + + /* NetGetJoinableOUs */ + + status = NetGetJoinableOUs(host_name, + domain_name, + ctx->username, + ctx->password, + &num_ous, + &ous); + if (status != 0) { + printf("failed with: %s\n", + libnetapi_get_error_string(ctx, status)); + } else { + printf("Successfully queried joinable ous:\n"); + for (i=0; i. + */ + +#include +#include +#include +#include +#include + +#include + +#include "common.h" + +enum { + OPT_OU = 1000 +}; + +int main(int argc, const char **argv) +{ + NET_API_STATUS status; + const char *host_name = NULL; + const char *domain_name = NULL; + const char *account_ou = NULL; + const char *account = NULL; + const char *password = NULL; + uint32_t join_flags = NETSETUP_JOIN_DOMAIN | + NETSETUP_ACCT_CREATE | + NETSETUP_DOMAIN_JOIN_IF_JOINED; + struct libnetapi_ctx *ctx = NULL; + + poptContext pc; + int opt; + + struct poptOption long_options[] = { + POPT_AUTOHELP + { "ou", 0, POPT_ARG_STRING, &account_ou, 'U', "Account ou", "ACCOUNT_OU" }, + { "domain", 0, POPT_ARG_STRING, &domain_name, 'U', "Domain name (required)", "DOMAIN" }, + { "userd", 0, POPT_ARG_STRING, &account, 'U', "Domain admin account", "USERNAME" }, + { "passwordd", 0, POPT_ARG_STRING, &password, 'U', "Domain admin password", "PASSWORD" }, + POPT_COMMON_LIBNETAPI_EXAMPLES + POPT_TABLEEND + }; + + + status = libnetapi_init(&ctx); + if (status != 0) { + return status; + } + + pc = poptGetContext("netdomjoin", argc, argv, long_options, 0); + + poptSetOtherOptionHelp(pc, "hostname"); + while((opt = poptGetNextOpt(pc)) != -1) { + } + + if (!poptPeekArg(pc)) { + poptPrintHelp(pc, stderr, 0); + goto out; + } + host_name = poptGetArg(pc); + + if (!domain_name) { + poptPrintHelp(pc, stderr, 0); + goto out; + } + + /* NetJoinDomain */ + + status = NetJoinDomain(host_name, + domain_name, + account_ou, + account, + password, + join_flags); + if (status != 0) { + const char *errstr = NULL; + errstr = libnetapi_get_error_string(ctx, status); + printf("Join failed with: %s\n", errstr); + } else { + printf("Successfully joined\n"); + } + + out: + libnetapi_free(ctx); + poptFreeContext(pc); + + return status; +} diff --git a/source3/lib/netapi/examples/netdomjoin/netdomjoin.c b/source3/lib/netapi/examples/netdomjoin/netdomjoin.c deleted file mode 100644 index 08ce71b938..0000000000 --- a/source3/lib/netapi/examples/netdomjoin/netdomjoin.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * Join Support (cmdline + netapi) - * Copyright (C) Guenther Deschner 2007-2008 - * - * 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 -#include -#include -#include -#include - -#include - -#include "common.h" - -enum { - OPT_OU = 1000 -}; - -int main(int argc, const char **argv) -{ - NET_API_STATUS status; - const char *host_name = NULL; - const char *domain_name = NULL; - const char *account_ou = NULL; - const char *account = NULL; - const char *password = NULL; - uint32_t join_flags = NETSETUP_JOIN_DOMAIN | - NETSETUP_ACCT_CREATE | - NETSETUP_DOMAIN_JOIN_IF_JOINED; - struct libnetapi_ctx *ctx = NULL; - - poptContext pc; - int opt; - - struct poptOption long_options[] = { - POPT_AUTOHELP - { "ou", 0, POPT_ARG_STRING, &account_ou, 'U', "Account ou", "ACCOUNT_OU" }, - { "domain", 0, POPT_ARG_STRING, &domain_name, 'U', "Domain name (required)", "DOMAIN" }, - { "userd", 0, POPT_ARG_STRING, &account, 'U', "Domain admin account", "USERNAME" }, - { "passwordd", 0, POPT_ARG_STRING, &password, 'U', "Domain admin password", "PASSWORD" }, - POPT_COMMON_LIBNETAPI_EXAMPLES - POPT_TABLEEND - }; - - - status = libnetapi_init(&ctx); - if (status != 0) { - return status; - } - - pc = poptGetContext("netdomjoin", argc, argv, long_options, 0); - - poptSetOtherOptionHelp(pc, "hostname"); - while((opt = poptGetNextOpt(pc)) != -1) { - } - - if (!poptPeekArg(pc)) { - poptPrintHelp(pc, stderr, 0); - goto out; - } - host_name = poptGetArg(pc); - - if (!domain_name) { - poptPrintHelp(pc, stderr, 0); - goto out; - } - - /* NetJoinDomain */ - - status = NetJoinDomain(host_name, - domain_name, - account_ou, - account, - password, - join_flags); - if (status != 0) { - const char *errstr = NULL; - errstr = libnetapi_get_error_string(ctx, status); - printf("Join failed with: %s\n", errstr); - } else { - printf("Successfully joined\n"); - } - - out: - libnetapi_free(ctx); - poptFreeContext(pc); - - return status; -} -- cgit