From 8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 30 Jan 2012 10:53:18 +0100 Subject: s3-lib: Fix util_cmdline which doesn't use popt. This creates its own header file for util_cmdline so it doesn't need to link against popt. This should fix linking on FreeBSD. --- source3/include/auth_info.h | 67 +++++++++++++++++++++++++++++++++++++++++++ source3/include/popt_common.h | 14 +-------- source3/include/proto.h | 33 --------------------- 3 files changed, 68 insertions(+), 46 deletions(-) create mode 100644 source3/include/auth_info.h (limited to 'source3/include') diff --git a/source3/include/auth_info.h b/source3/include/auth_info.h new file mode 100644 index 0000000000..6b5105d51f --- /dev/null +++ b/source3/include/auth_info.h @@ -0,0 +1,67 @@ +/* + * Unix SMB/CIFS implementation. + * + * Copyright (c) 2012 Andreas Schneider + * + * 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 _AUTH_INFO_H +#define _AUTH_INFO_H + +struct user_auth_info { + char *username; + char *domain; + char *password; + bool got_pass; + bool use_kerberos; + int signing_state; + bool smb_encrypt; + bool use_machine_account; + bool fallback_after_kerberos; + bool use_ccache; +}; + +struct user_auth_info *user_auth_info_init(TALLOC_CTX *mem_ctx); +const char *get_cmdline_auth_info_username(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_username(struct user_auth_info *auth_info, + const char *username); +const char *get_cmdline_auth_info_domain(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_domain(struct user_auth_info *auth_info, + const char *domain); +void set_cmdline_auth_info_password(struct user_auth_info *auth_info, + const char *password); +const char *get_cmdline_auth_info_password(const struct user_auth_info *auth_info); +bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info, + const char *arg); +int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_use_ccache(struct user_auth_info *auth_info, + bool b); +bool get_cmdline_auth_info_use_ccache(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info, + bool b); +bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_fallback_after_kerberos(struct user_auth_info *auth_info, + bool b); +bool get_cmdline_auth_info_fallback_after_kerberos(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_use_krb5_ticket(struct user_auth_info *auth_info); +void set_cmdline_auth_info_smb_encrypt(struct user_auth_info *auth_info); +void set_cmdline_auth_info_use_machine_account(struct user_auth_info *auth_info); +bool get_cmdline_auth_info_got_pass(const struct user_auth_info *auth_info); +bool get_cmdline_auth_info_smb_encrypt(const struct user_auth_info *auth_info); +bool get_cmdline_auth_info_use_machine_account(const struct user_auth_info *auth_info); +bool set_cmdline_auth_info_machine_account_creds(struct user_auth_info *auth_info); +void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info); + +#endif /* _AUTH_INFO_H */ diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h index 10dd2f4ebe..2125ed6f83 100644 --- a/source3/include/popt_common.h +++ b/source3/include/popt_common.h @@ -21,6 +21,7 @@ #define _POPT_COMMON_H #include +#include "auth_info.h" /* Common popt structures */ extern struct poptOption popt_common_samba[]; @@ -47,19 +48,6 @@ extern const struct poptOption popt_common_dynconfig[]; #define POPT_COMMON_DEBUGLEVEL { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debuglevel, 0, "Common samba debugging:", NULL }, #define POPT_COMMON_OPTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_option, 0, "Common samba commandline config:", NULL }, -struct user_auth_info { - char *username; - char *domain; - char *password; - bool got_pass; - bool use_kerberos; - int signing_state; - bool smb_encrypt; - bool use_machine_account; - bool fallback_after_kerberos; - bool use_ccache; -}; - void popt_common_set_auth_info(struct user_auth_info *auth_info); #endif /* _POPT_COMMON_H */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 2bccaa6406..4efa3b6028 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -597,39 +597,6 @@ bool map_open_params_to_ntcreate(const char *smb_base_fname, uint32_t *pprivate_flags); void init_modules(void); -/* The following definitions come from lib/util_cmdline.c */ - -struct user_auth_info *user_auth_info_init(TALLOC_CTX *mem_ctx); -const char *get_cmdline_auth_info_username(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_username(struct user_auth_info *auth_info, - const char *username); -const char *get_cmdline_auth_info_domain(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_domain(struct user_auth_info *auth_info, - const char *domain); -void set_cmdline_auth_info_password(struct user_auth_info *auth_info, - const char *password); -const char *get_cmdline_auth_info_password(const struct user_auth_info *auth_info); -bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info, - const char *arg); -int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_use_ccache(struct user_auth_info *auth_info, - bool b); -bool get_cmdline_auth_info_use_ccache(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info, - bool b); -bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_fallback_after_kerberos(struct user_auth_info *auth_info, - bool b); -bool get_cmdline_auth_info_fallback_after_kerberos(const struct user_auth_info *auth_info); -void set_cmdline_auth_info_use_krb5_ticket(struct user_auth_info *auth_info); -void set_cmdline_auth_info_smb_encrypt(struct user_auth_info *auth_info); -void set_cmdline_auth_info_use_machine_account(struct user_auth_info *auth_info); -bool get_cmdline_auth_info_got_pass(const struct user_auth_info *auth_info); -bool get_cmdline_auth_info_smb_encrypt(const struct user_auth_info *auth_info); -bool get_cmdline_auth_info_use_machine_account(const struct user_auth_info *auth_info); -bool set_cmdline_auth_info_machine_account_creds(struct user_auth_info *auth_info); -void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info); - /* The following definitions come from lib/util_builtin.c */ bool lookup_builtin_rid(TALLOC_CTX *mem_ctx, uint32 rid, const char **name); -- cgit