diff options
| -rw-r--r-- | source4/libnet/config.mk | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_samdump_keytab.c | 131 | ||||
| -rw-r--r-- | source4/libnet/wscript_build | 2 | ||||
| -rw-r--r-- | source4/utils/net/net_vampire.c | 52 |
4 files changed, 2 insertions, 185 deletions
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk index b99887889e..3e9cfbc836 100644 --- a/source4/libnet/config.mk +++ b/source4/libnet/config.mk @@ -4,7 +4,7 @@ PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetsrcdir)/, \ libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \ libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \ - libnet_vampire.o libnet_samdump.o libnet_samdump_keytab.o \ + libnet_vampire.o libnet_samdump.o \ libnet_samsync_ldb.o libnet_user.o libnet_group.o libnet_share.o \ libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \ groupman.o prereq_domain.o libnet_samsync.o libnet_export_keytab.o) diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c deleted file mode 100644 index 7749aa996c..0000000000 --- a/source4/libnet/libnet_samdump_keytab.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Extract kerberos keys from a remote SamSync server - - Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-2005 - - 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 "libnet/libnet.h" -#include "system/kerberos.h" -#include "auth/credentials/credentials.h" -#include "auth/credentials/credentials_krb5.h" -#include "param/param.h" -#include "lib/events/events.h" - -static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx, - struct tevent_context *event_ctx, - struct loadparm_context *lp_ctx, - const char *keytab_name, - struct netr_DELTA_ENUM *delta) -{ - struct netr_DELTA_USER *user = delta->delta_union.user; - const char *username = user->account_name.string; - struct cli_credentials *credentials; - int ret; - - if (!user->nt_password_present) { - /* We can't do anything here */ - return NT_STATUS_OK; - } - - credentials = cli_credentials_init(mem_ctx); - if (!credentials) { - return NT_STATUS_NO_MEMORY; - } - cli_credentials_set_conf(credentials, lp_ctx); - cli_credentials_set_username(credentials, username, CRED_SPECIFIED); - - /* We really should consult ldap in the main SamSync code, and - * pass a value in here */ - cli_credentials_set_kvno(credentials, 0); - cli_credentials_set_nt_hash(credentials, &user->ntpassword, CRED_SPECIFIED); - ret = cli_credentials_set_keytab_name(credentials, event_ctx, lp_ctx, keytab_name, CRED_SPECIFIED); - if (ret) { - return NT_STATUS_UNSUCCESSFUL; - } - - ret = cli_credentials_update_keytab(credentials, event_ctx, lp_ctx); - if (ret) { - return NT_STATUS_UNSUCCESSFUL; - } - - return NT_STATUS_OK; -} - -struct libnet_samdump_keytab_data { - const char *keytab_name; - struct tevent_context *ev_ctx; - struct loadparm_context *lp_ctx; -}; - -static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx, - void *private_data, - enum netr_SamDatabaseID database, - struct netr_DELTA_ENUM *delta, - char **error_string) -{ - NTSTATUS nt_status = NT_STATUS_OK; - struct libnet_samdump_keytab_data *data = private_data; - *error_string = NULL; - switch (delta->delta_type) { - case NETR_DELTA_USER: - { - /* not interested in builtin users */ - if (database == SAM_DATABASE_DOMAIN) { - nt_status = samdump_keytab_handle_user(mem_ctx, - data->ev_ctx, - data->lp_ctx, - data->keytab_name, - delta); - break; - } - } - default: - /* Can't dump them all right now */ - break; - } - return nt_status; -} - -NTSTATUS libnet_SamDump_keytab(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_SamDump_keytab *r) -{ - NTSTATUS nt_status; - struct libnet_samdump_keytab_data data; - struct libnet_SamSync r2; - - data.keytab_name = r->in.keytab_name; - data.ev_ctx = ctx->event_ctx; - data.lp_ctx = ctx->lp_ctx; - - r2.out.error_string = NULL; - r2.in.binding_string = r->in.binding_string; - r2.in.init_fn = NULL; - r2.in.delta_fn = libnet_samdump_keytab_fn; - r2.in.fn_ctx = &data; - r2.in.machine_account = r->in.machine_account; - nt_status = libnet_SamSync_netlogon(ctx, mem_ctx, &r2); - r->out.error_string = r2.out.error_string; - talloc_steal(mem_ctx, r->out.error_string); - - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } - - return nt_status; -} diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 0296bef917..c9c76e9cc1 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python bld.SAMBA_SUBSYSTEM('LIBSAMBA-NET', - source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samdump_keytab.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c', + source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c', autoproto='libnet_proto.h', public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET' ) diff --git a/source4/utils/net/net_vampire.c b/source4/utils/net/net_vampire.c index f1f0f9db65..c113ad7001 100644 --- a/source4/utils/net/net_vampire.c +++ b/source4/utils/net/net_vampire.c @@ -28,59 +28,8 @@ #include "param/param.h" #include "lib/events/events.h" -static int net_samdump_keytab_usage(struct net_context *ctx, int argc, const char **argv) -{ - d_printf("net samdump keytab <keytab>\n"); - return 0; -} - -static int net_samdump_keytab_help(struct net_context *ctx, int argc, const char **argv) -{ - d_printf("Dumps kerberos keys of a domain into a keytab.\n"); - return 0; -} - -static int net_samdump_keytab(struct net_context *ctx, int argc, const char **argv) -{ - NTSTATUS status; - struct libnet_context *libnetctx; - struct libnet_SamDump_keytab r; - - switch (argc) { - case 0: - return net_samdump_keytab_usage(ctx, argc, argv); - break; - case 1: - r.in.keytab_name = argv[0]; - break; - } - - libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx); - if (!libnetctx) { - return -1; - } - libnetctx->cred = ctx->credentials; - - r.out.error_string = NULL; - r.in.machine_account = NULL; - r.in.binding_string = NULL; - - status = libnet_SamDump_keytab(libnetctx, ctx, &r); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0,("libnet_SamDump returned %s: %s\n", - nt_errstr(status), - r.out.error_string)); - return -1; - } - - talloc_free(libnetctx); - - return 0; -} - /* main function table */ static const struct net_functable net_samdump_functable[] = { - {"keytab", "dump keys into a keytab\n", net_samdump_keytab, net_samdump_keytab_usage}, {NULL, NULL, NULL, NULL} }; @@ -127,7 +76,6 @@ int net_samdump(struct net_context *ctx, int argc, const char **argv) int net_samdump_usage(struct net_context *ctx, int argc, const char **argv) { d_printf("net samdump\n"); - d_printf("net samdump keytab <keytab>\n"); return 0; } |